Merge lp:~bregma/libgrip/lp-830640 into lp:libgrip

[Stephen M. Webb]

Removed the GIO channel from the main lop on shutdown to prevent stray events from being posted.

[Chase Douglas (chasedouglas)]

Looks right to me

review: Approve

=== modified file 'src/gripgesturemanager.c'
--- src/gripgesturemanager.c	2011-09-19 13:45:46 +0000
+++ src/gripgesturemanager.c	2011-09-22 20:00:29 +0000
@@ -87,6 +87,7 @@
   GPtrArray         *gesture_list;
   GeisInstance       instance;
   GIOChannel        *iochannel;
+  int                iochannel_id;
 };
 
 struct _GripRegistrationRequest
@@ -966,9 +967,13 @@
     }
 
   g_list_free (reg->bindings);
+
   g_io_channel_shutdown (reg->iochannel, FALSE, NULL);
+  g_source_remove (reg->iochannel_id);
+  g_io_channel_unref (reg->iochannel);
+
   geis_finish (reg->instance);
-  g_io_channel_unref(reg->iochannel);
+
   reg->instance = NULL;
   reg->iochannel = NULL;
 }
@@ -1052,7 +1057,6 @@
 {
   GripGestureRegistration *reg;
   GeisInstance  instance;
-  GIOChannel   *iochannel;
   gint fd = -1;
   GeisXcbWinInfo xcb_win_info = {
     .display_name = NULL,
@@ -1095,14 +1099,11 @@
                     G_CALLBACK (window_destroyed_cb),
                     manager);
 
-  iochannel = g_io_channel_unix_new (fd);
-  g_io_add_watch (iochannel,
-                  G_IO_IN,
-                  io_callback,
-                  reg);
-
-  reg->iochannel = iochannel;
-
+  reg->iochannel = g_io_channel_unix_new (fd);
+  reg->iochannel_id = g_io_add_watch (reg->iochannel,
+                                      G_IO_IN,
+                                      io_callback,
+                                      reg);
   reg->gesture_list = g_ptr_array_new ();
 
   return reg;