Merge lp:~agateau/libdbusmenu/fix-gtk3-warnings into lp:libdbusmenu/0.6

[Aurélien Gâteau]

Building the gtk3 version of dbusmenu fails by default because gtk3 deprecated warnings are turned into errors with -Werror.

[Mikkel Kamstrup Erlandsen (kamstrup)]

I was here first! https://code.launchpad.net/~kamstrup/dbusmenu/build-fix-gtk3/+merge/88669

;-)

[Aurélien Gâteau (agateau)]

Oups, cancelling then :)

Unmerged revisions

347. By Aurélien Gâteau on 2012-01-23

Fix build of the gtk3 version

gtk_hbox_new() is deprecated => building fails because of -Werror

=== modified file 'libdbusmenu-gtk/genericmenuitem.c'
--- libdbusmenu-gtk/genericmenuitem.c	2011-10-05 18:59:21 +0000
+++ libdbusmenu-gtk/genericmenuitem.c	2012-01-23 13:47:29 +0000
@@ -241,7 +241,11 @@
 			/* We need to put the child into a new box and
 			   make the box the child of the menu item.  Basically
 			   we're inserting a box in the middle. */
+#if GTK_CHECK_VERSION(3, 0, 0)
+			GtkWidget * hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, get_toggle_space(GTK_WIDGET(menu_item)));
+#else
 			GtkWidget * hbox = gtk_hbox_new(FALSE, get_toggle_space(GTK_WIDGET(menu_item)));
+#endif
 			g_object_ref(child);
 			gtk_container_remove(GTK_CONTAINER(menu_item), child);
 			gtk_box_pack_start(GTK_BOX(hbox), child, FALSE, FALSE, 0);
@@ -457,7 +461,11 @@
 			/* We need to put the child into a new box and
 			   make the box the child of the menu item.  Basically
 			   we're inserting a box in the middle. */
+#if GTK_CHECK_VERSION(3, 0, 0)
+			GtkWidget * hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, get_toggle_space(GTK_WIDGET(menu_item)));
+#else
 			GtkWidget * hbox = gtk_hbox_new(FALSE, get_toggle_space(GTK_WIDGET(menu_item)));
+#endif
 			g_object_ref(child);
 			gtk_container_remove(GTK_CONTAINER(menu_item), child);
 			gtk_box_pack_end(GTK_BOX(hbox), child, TRUE, TRUE, 0);