brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

keybindings: Remove #if 0'd code

Browse Source 
There's no reason to keep this ~15 year old piece of code around as
well as the preference handling that would only make sense if this
hunk was actually enabled.

https://bugzilla.gnome.org/show_bug.cgi?id=746642
This commit is contained in:
Rui Matos 2016-11-21 16:41:35 +01:00
parent d9a9844005
commit 0249993377
2 changed files with 1 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/core/display.c
View File

@ -2719,22 +2719,7 @@ prefs_changed_callback (MetaPreference pref,
{ {
MetaDisplay *display = data; MetaDisplay *display = data;
if (pref == META_PREF_FOCUS_MODE) if (pref == META_PREF_AUDIBLE_BELL)
{
GSList *windows, *l;
windows = meta_display_list_windows (display, META_LIST_DEFAULT);
for (l = windows; l; l = l->next)
{
MetaWindow *w = l->data;
meta_display_ungrab_focus_window_button (display, w);
if (w->type != META_WINDOW_DOCK)
meta_display_grab_focus_window_button (display, w);
}
g_slist_free (windows);
}
else if (pref == META_PREF_AUDIBLE_BELL)
{ {
meta_bell_set_audible (display, meta_prefs_bell_is_audible ()); meta_bell_set_audible (display, meta_prefs_bell_is_audible ());
} }

16
src/core/keybindings.c
View File

@ -1041,7 +1041,6 @@ update_window_grab_modifiers (MetaKeyBindingManager *keys)
keys->window_grab_modifiers = mods; keys->window_grab_modifiers = mods;
} }
/* Grab buttons we only grab while unfocused in click-to-focus mode */
void void
meta_display_grab_focus_window_button (MetaDisplay *display, meta_display_grab_focus_window_button (MetaDisplay *display,
MetaWindow *window) MetaWindow *window)
@ -1051,21 +1050,6 @@ meta_display_grab_focus_window_button (MetaDisplay *display,
/* Grab button 1 for activating unfocused windows */ /* Grab button 1 for activating unfocused windows */
meta_verbose ("Grabbing unfocused window buttons for %s\n", window->desc); meta_verbose ("Grabbing unfocused window buttons for %s\n", window->desc);
#if 0
/* FIXME:115072 */
/* Don't grab at all unless in click to focus mode. In click to
* focus, we may sometimes be clever about intercepting and eating
* the focus click. But in mouse focus, we never do that since the
* focus window may not be raised, and who wants to think about
* mouse focus anyway.
*/
if (meta_prefs_get_focus_mode () != G_DESKTOP_FOCUS_MODE_CLICK)
{
meta_verbose (" (well, not grabbing since not in click to focus mode)\n");
return;
}
#endif
if (window->have_focus_click_grab) if (window->have_focus_click_grab)
{ {
meta_verbose (" (well, not grabbing since we already have the grab)\n"); meta_verbose (" (well, not grabbing since we already have the grab)\n");