diff options
| author | Ted Gould <ted@gould.cx> | 2011-03-21 09:03:18 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-03-21 09:03:18 -0500 |
| commit | 7b77e877fb34e5d1e72404c0933b2aec07469ad9 (patch) | |
| tree | fb07c17a99e29a796f63a7d6cbb6f6605440de6b | |
| parent | d50e6ca1431918aa821bb7eec9a6e3c8e2fc9150 (diff) | |
| parent | 746a792ef912c5160fed15bf817df5124f6610b0 (diff) | |
| download | libdbusmenu-7b77e877fb34e5d1e72404c0933b2aec07469ad9.tar.gz libdbusmenu-7b77e877fb34e5d1e72404c0933b2aec07469ad9.tar.bz2 libdbusmenu-7b77e877fb34e5d1e72404c0933b2aec07469ad9.zip | |
* Upstream Merge
* Enter and exit the GDK threads before calling GTK (LP: #717162)
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | libdbusmenu-gtk/parser.c | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index e153912..e8d9d7d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libdbusmenu (0.3.102-0ubuntu2~ppa1) UNRELEASED; urgency=low + + * Upstream Merge + * Enter and exit the GDK threads before calling GTK (LP: #717162) + + -- Ted Gould <ted@ubuntu.com> Mon, 21 Mar 2011 09:02:41 -0500 + libdbusmenu (0.3.102-0ubuntu1) natty; urgency=low * New upstream release. diff --git a/libdbusmenu-gtk/parser.c b/libdbusmenu-gtk/parser.c index 9d93a1e..a7f90a2 100644 --- a/libdbusmenu-gtk/parser.c +++ b/libdbusmenu-gtk/parser.c @@ -845,7 +845,9 @@ item_activated (DbusmenuMenuitem *item, guint timestamp, gpointer user_data) if (GTK_IS_MENU_ITEM (child)) { + gdk_threads_enter (); gtk_menu_item_activate (GTK_MENU_ITEM (child)); + gdk_threads_leave (); } } } |