diff options
author | Dan Williams <dcbw@redhat.com> | 2016-02-23 14:08:34 -0600 |
---|---|---|
committer | Dan Williams <dcbw@redhat.com> | 2016-02-23 14:08:34 -0600 |
commit | 05624ad69ee10fd7310479a8776333b85ee68147 (patch) | |
tree | 72325993db3da78e723341b996c3ac5630189133 /libdbusmenu-gtk/client.c | |
parent | 1398225fea8d3d4143a5b167ad17e1dddfaf3916 (diff) | |
parent | ea7b8b5b3bb2b46388153ae48dcd2e162f6512b7 (diff) | |
download | libdbusmenu-05624ad69ee10fd7310479a8776333b85ee68147.tar.gz libdbusmenu-05624ad69ee10fd7310479a8776333b85ee68147.tar.bz2 libdbusmenu-05624ad69ee10fd7310479a8776333b85ee68147.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 | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c index d345313..7e1ea36 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,12 @@ 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_halign(GTK_WIDGET(gtkimage), GTK_ALIGN_START); + 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); |