Mercurial > geeqie
diff src/layout.c @ 88:2099ee3f9a8d
Fri Oct 27 19:45:32 2006 John Ellis <johne@verizon.net>
* layout.c, ui_menu.c, ui_misc.c: Use g_object_ref_sink when
gtk_object_sink is not available as it is deprecated.
| author | gqview |
|---|---|
| date | Sat, 28 Oct 2006 00:03:15 +0000 |
| parents | 0ef72a64930b |
| children | d063f97503b7 |
line wrap: on
line diff
--- a/src/layout.c Wed Oct 25 19:23:46 2006 +0000 +++ b/src/layout.c Sat Oct 28 00:03:15 2006 +0000 @@ -257,9 +257,15 @@ menu = submenu_add_sort(NULL, G_CALLBACK(layout_sort_menu_cb), lw, FALSE, FALSE, TRUE, lw->sort_method); - /* apparently the menu is never sunk, even on a popup */ + /* take ownership of menu */ +#ifdef GTK_OBJECT_FLOATING + /* GTK+ < 2.10 */ g_object_ref(G_OBJECT(menu)); gtk_object_sink(GTK_OBJECT(menu)); +#else + /* GTK+ >= 2.10 */ + g_object_ref_sink(G_OBJECT(menu)); +#endif /* ascending option */ menu_item_add_divider(menu);