isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shell-global: Remove grab notifier

Browse Source 
With the window menus gone, it is no longer possible to have a GTK+ grab
in-process, so remove our code that was tracking GTK+ grabs.
This commit is contained in:
Jasper St. Pierre 2014-08-13 18:04:48 -04:00
parent 8c32cff6fc
commit 5ce8980db3
1 changed files with 1 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/shell-global.c
View File

@ -46,8 +46,6 @@
static ShellGlobal *the_object = NULL; static ShellGlobal *the_object = NULL;
static void grab_notify (GtkWidget *widget, gboolean is_grab, gpointer user_data);
struct _ShellGlobal { struct _ShellGlobal {
GObject parent; GObject parent;
@ -63,15 +61,6 @@ struct _ShellGlobal {
char *session_mode; char *session_mode;
/* We use this window to get a notification from GTK+ when
* a widget in our process does a GTK+ grab. See
* http://bugzilla.gnome.org/show_bug.cgi?id=570641
*
* This window is never mapped or shown.
*/
GtkWindow *grab_notifier;
gboolean gtk_grab_active;
XserverRegion input_region; XserverRegion input_region;
GjsContext *js_context; GjsContext *js_context;
@ -285,10 +274,6 @@ shell_global_init (ShellGlobal *global)
global->runtime_state_path = g_file_new_for_path (path); global->runtime_state_path = g_file_new_for_path (path);
global->settings = g_settings_new ("org.gnome.shell"); global->settings = g_settings_new ("org.gnome.shell");
global->grab_notifier = GTK_WINDOW (gtk_window_new (GTK_WINDOW_TOPLEVEL));
g_signal_connect (global->grab_notifier, "grab-notify", G_CALLBACK (grab_notify), global);
global->gtk_grab_active = FALSE;
global->sound_context = ca_gtk_context_get (); global->sound_context = ca_gtk_context_get ();
ca_context_change_props (global->sound_context, ca_context_change_props (global->sound_context,
@ -348,7 +333,6 @@ shell_global_finalize (GObject *object)
ShellGlobal *global = SHELL_GLOBAL (object); ShellGlobal *global = SHELL_GLOBAL (object);
g_object_unref (global->js_context); g_object_unref (global->js_context);
gtk_widget_destroy (GTK_WIDGET (global->grab_notifier));
g_object_unref (global->settings); g_object_unref (global->settings);
the_object = NULL; the_object = NULL;
@ -654,9 +638,7 @@ sync_input_region (ShellGlobal *global)
{ {
MetaScreen *screen = global->meta_screen; MetaScreen *screen = global->meta_screen;
if (global->gtk_grab_active) if (global->has_modal)
meta_empty_stage_input_region (screen);
else if (global->has_modal)
meta_set_stage_input_region (screen, None); meta_set_stage_input_region (screen, None);
else else
meta_set_stage_input_region (screen, global->input_region); meta_set_stage_input_region (screen, global->input_region);
@ -1336,17 +1318,6 @@ shell_global_notify_error (ShellGlobal *global,
g_signal_emit_by_name (global, "notify-error", msg, details); g_signal_emit_by_name (global, "notify-error", msg, details);
} }
static void
grab_notify (GtkWidget *widget, gboolean was_grabbed, gpointer user_data)
{
ShellGlobal *global = SHELL_GLOBAL (user_data);
global->gtk_grab_active = !was_grabbed;
/* Update for the new setting of gtk_grab_active */
sync_input_region (global);
}
/** /**
* shell_global_init_xdnd: * shell_global_init_xdnd:
* @global: the #ShellGlobal * @global: the #ShellGlobal