diff options
| author | Denis Gorodnichev <[email protected]> | 2014-07-24 10:37:41 +0400 |
|---|---|---|
| committer | infirit <[email protected]> | 2014-11-25 18:06:24 +0100 |
| commit | b25395fab6fe9ee38bc0cd359941d0a825d88451 (patch) | |
| tree | e7b6720a543a00495fae1dd1423d652056bedb03 /src/tools/marco-mag.c | |
| parent | b8d8e52f0effbf76ff909f88932098d4daf4336e (diff) | |
| download | marco-b25395fab6fe9ee38bc0cd359941d0a825d88451.tar.bz2 marco-b25395fab6fe9ee38bc0cd359941d0a825d88451.tar.xz | |
merge metacity(gtk3) changes
merge metacity(gtk3) changes
fix warnings
clean up unused variables
replace UNUSED_VARIABLE by G_GNUC_UNUSED
Diffstat (limited to 'src/tools/marco-mag.c')
| -rw-r--r-- | src/tools/marco-mag.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/marco-mag.c b/src/tools/marco-mag.c index a87c9e3a..4b9f16c3 100644 --- a/src/tools/marco-mag.c +++ b/src/tools/marco-mag.c @@ -163,8 +163,8 @@ shutdown_grab (void) #else gdk_keyboard_ungrab (gtk_get_current_event_time ()); gdk_pointer_ungrab (gtk_get_current_event_time ()); - gtk_grab_remove (grab_widget); #endif + gtk_grab_remove (grab_widget); } static void @@ -245,6 +245,7 @@ begin_area_grab (void) GdkDeviceManager *manager; GdkDevice *device; #endif + if (grab_widget == NULL) { grab_widget = gtk_invisible_new (); @@ -267,7 +268,6 @@ begin_area_grab (void) GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK | GDK_POINTER_MOTION_MASK, NULL, gtk_get_current_event_time ()) != GDK_GRAB_SUCCESS) - { g_warning ("Failed to grab pointer to do eyedropper"); return; |