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

Proposed by Allison Karlitskaya
Status: Merged
Approved by: Charles Kerr
Approved revision: no longer in the source branch.
Merge reported by: Charles Kerr
Merged at revision: not available
Proposed branch: lp:~desrt/appmenu-gtk/gdkthreads-fix
Merge into: lp:appmenu-gtk/0.4
Diff against target: 13 lines (+1/-3)
1 file modified
src/bridge.c (+1/-3)
To merge this branch: bzr merge lp:~desrt/appmenu-gtk/gdkthreads-fix
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
Review via email: mp+100288@code.launchpad.net

Description of the change

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

To post a comment you must log in.
lp:~desrt/appmenu-gtk/gdkthreads-fix updated
149. By Michael Terry

blacklist glade

Revision history for this message
Charles Kerr (charlesk) wrote :

Nice catch.

review: Approve
lp:~desrt/appmenu-gtk/gdkthreads-fix updated
150. By Charles Kerr

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/bridge.c'
2--- src/bridge.c 2012-03-05 22:45:27 +0000
3+++ src/bridge.c 2012-03-31 14:32:20 +0000
4@@ -552,9 +552,7 @@
5 data->bridge = bridge;
6 data->widget = toplevel;
7
8- id = g_timeout_add (100,
9- (GSourceFunc)do_rebuild,
10- data);
11+ id = gdk_threads_add_timeout (100, (GSourceFunc)do_rebuild, data);
12
13 g_object_add_weak_pointer (G_OBJECT (data->widget), (gpointer*)&data->widget);
14

Subscribers

People subscribed via source and target branches