Merge lp:~desrt/appmenu-gtk/gdkthreads-fix into lp:appmenu-gtk/0.4

[Allison Karlitskaya]

Use gdkthreads when scheduling a timeout for compatibility with apps using gdkthreads.

[lp:~desrt/appmenu-gtk/gdkthreads-fix]

149. By Michael Terry on 2012-04-02

blacklist glade

[Charles Kerr (charlesk)]

Nice catch.

review: Approve

[lp:~desrt/appmenu-gtk/gdkthreads-fix]

150. By Charles Kerr on 2012-04-02

merge lp:~desrt/appmenu-gtk/gdkthreads-fix to use gdkthreads when scheduling a timeout for compatibility with apps using gdkthreads.

=== modified file 'src/bridge.c'
--- src/bridge.c	2012-03-05 22:45:27 +0000
+++ src/bridge.c	2012-03-31 14:32:20 +0000
@@ -552,9 +552,7 @@
   data->bridge = bridge;
   data->widget = toplevel;
 
-  id = g_timeout_add (100,
-                      (GSourceFunc)do_rebuild,
-                      data);
+  id = gdk_threads_add_timeout (100, (GSourceFunc)do_rebuild, data);
 
   g_object_add_weak_pointer (G_OBJECT (data->widget), (gpointer*)&data->widget);