diff options
| author | Dan Williams <dcbw@redhat.com> | 2016-02-22 15:07:09 -0600 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2016-02-22 15:07:09 -0600 |
| commit | 29040c205f8391734ddb3af2f3e93d5419a5f060 (patch) | |
| tree | c19b00b3ad3e91b733270d67a4983d2fac731bb8 /libdbusmenu-gtk/client.c | |
| parent | 1398225fea8d3d4143a5b167ad17e1dddfaf3916 (diff) | |
| download | libdbusmenu-29040c205f8391734ddb3af2f3e93d5419a5f060.tar.gz libdbusmenu-29040c205f8391734ddb3af2f3e93d5419a5f060.tar.bz2 libdbusmenu-29040c205f8391734ddb3af2f3e93d5419a5f060.zip | |
gtk: fix some GTKv3 deprecations and get rid of HAVE_GTK3
Diffstat (limited to 'libdbusmenu-gtk/client.c')
| -rw-r--r-- | libdbusmenu-gtk/client.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c index d345313..08d3223 100644 --- a/libdbusmenu-gtk/client.c +++ b/libdbusmenu-gtk/client.c @@ -842,7 +842,7 @@ activate_helper (GtkMenuShell * shell) doesn't expose the right variables. We need to figure this out as menus won't get grabs properly. TODO FIXME HELP ARGHHHHHHHH */ -#if (HAVE_GTK3 == 0) +#if !GTK_CHECK_VERSION(3,0,0) if (!GTK_MENU_SHELL (parent)->active) { gtk_grab_add (parent); GTK_MENU_SHELL (parent)->have_grab = TRUE; @@ -1278,7 +1278,11 @@ image_property_handle (DbusmenuMenuitem * item, const gchar * property, GVariant gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &width, &height); gtk_widget_set_size_request(GTK_WIDGET(gtkimage), width, height); +#if GTK_CHECK_VERSION(3,0,0) + gtk_widget_set_valign(GTK_WIDGET(gtkimage), GTK_ALIGN_CENTER); +#else gtk_misc_set_alignment(GTK_MISC(gtkimage), 0.0, 0.5); +#endif } genericmenuitem_set_image(GENERICMENUITEM(gimi), gtkimage); |