Merge lp:~mardy/libdbusmenu/lp937829 into lp:libdbusmenu/0.6

[Alberto Mardegan]

Do not read the label text from the label widget

The label text stored in the widget might have been modified with markup.
Instead of reading it back from the widget, return the text as set by the
client, unmodified.

Alter the test-gtk-submenu so that the correct behaviour is checked for.

Do not read the label text from the label widget

The label text stored in the widget might have been modified with markup.
Instead of reading it back from the widget, return the text as set by the
client, unmodified.

Alter the test-gtk-submenu so that the correct behaviour is checked for.

[lp:~mardy/libdbusmenu/lp937829]

376. By Alberto Mardegan on 2012-02-22

Do not leak the label text

Also, fix the indentation from the previous commit.

[Ted Gould (ted)]

Works for me!

review: Approve

=== modified file 'libdbusmenu-gtk/genericmenuitem.c'
--- libdbusmenu-gtk/genericmenuitem.c	2012-01-16 11:57:11 +0000
+++ libdbusmenu-gtk/genericmenuitem.c	2012-02-22 10:22:17 +0000
@@ -43,6 +43,7 @@
 	GenericmenuitemCheckType   check_type;
 	GenericmenuitemState       state;
 	GenericmenuitemDisposition disposition;
+	gchar * label_text;
 };
 
 /* Private macro */
@@ -106,6 +107,7 @@
 	self->priv->check_type = GENERICMENUITEM_CHECK_TYPE_NONE;
 	self->priv->state = GENERICMENUITEM_STATE_UNCHECKED;
 	self->priv->disposition = GENERICMENUITEM_DISPOSITION_NORMAL;
+	self->priv->label_text = NULL;
 
 	return;
 }
@@ -123,6 +125,8 @@
 static void
 genericmenuitem_finalize (GObject *object)
 {
+	Genericmenuitem * self = GENERICMENUITEM(object);
+	g_free(self->priv->label_text);
 
 	G_OBJECT_CLASS (genericmenuitem_parent_class)->finalize (object);
 	return;
@@ -205,6 +209,12 @@
 {
 	if (in_label == NULL) return;
 
+	Genericmenuitem * item = GENERICMENUITEM(menu_item);
+	if (in_label != item->priv->label_text) {
+		g_free(item->priv->label_text);
+		item->priv->label_text = g_strdup(in_label);
+	}
+
 	/* Build a label that might include the colors of the disposition
 	   so that it gets rendered in the menuitem. */
 	gchar * local_label = NULL;
@@ -308,25 +318,9 @@
 static const gchar *
 get_label (GtkMenuItem * menu_item)
 {
-	GtkWidget * child = gtk_bin_get_child(GTK_BIN(menu_item));
-	GtkLabel * labelw = NULL;
-
-	/* Try to find if we have a label already */
-	if (child != NULL) {
-		if (GTK_IS_LABEL(child)) {
-			/* We've got a label, let's update it. */
-			labelw = GTK_LABEL(child);
-		} else if (GTK_IS_BOX(child)) {
-			/* Look for the label in the box */
-			gtk_container_foreach(GTK_CONTAINER(child), set_label_helper, &labelw);
-		}
-	}
-
-	if (labelw != NULL) {
-		return gtk_label_get_label(labelw);
-	}
-
-	return NULL;
+	Genericmenuitem * item = GENERICMENUITEM(menu_item);
+
+	return item->priv->label_text;
 }
 
 /* Make sure we don't toggle when there is an

=== modified file 'tests/test-gtk-submenu-server.c'
--- tests/test-gtk-submenu-server.c	2010-11-17 04:04:47 +0000
+++ tests/test-gtk-submenu-server.c	2012-02-22 10:22:17 +0000
@@ -64,6 +64,7 @@
 
 	DbusmenuMenuitem * item;
 	item = add_item(root, "Folder 1");
+	dbusmenu_menuitem_property_set(item, "disposition", "alert");
 	add_item(item, "1.1");
 	add_item(item, "1.2");
 	add_item(item, "1.3");