Merge lp:~ted/libdbusmenu/lp730925 into lp:libdbusmenu/0.5

[Ted Gould]

Making sure that properties that are getting updated don't recieved a removed signal before the update.

[lp:~ted/libdbusmenu/lp730925]

281. By Ted Gould on 2011-03-22

Protect against NULL properties

[Conor Curran (cjcurran)]

review: Approve

=== modified file 'libdbusmenu-glib/client.c'
--- libdbusmenu-glib/client.c	2011-03-14 19:30:23 +0000
+++ libdbusmenu-glib/client.c	2011-03-22 21:23:30 +0000
@@ -1368,9 +1368,30 @@
 		have_error = TRUE;
 	}
 
+	/* Get the list of the current properties */
 	GList * current_props = dbusmenu_menuitem_properties_list(DBUSMENU_MENUITEM(data));
 	GList * tmp = NULL;
 
+	if (properties != NULL) {
+		GVariantIter iter;
+		g_variant_iter_init(&iter, properties);
+		gchar * name; GVariant * value;
+
+		/* Remove the entries from the current list that we have new
+		   values for.  This way we don't create signals of them being
+		   removed with the duplication of the value being changed. */
+		while (g_variant_iter_loop(&iter, "{sv}", &name, &value) && have_error == FALSE) {
+			for (tmp = current_props; tmp != NULL; tmp = g_list_next(tmp)) {
+				if (g_strcmp0((gchar *)tmp->data, name) == 0) {
+					current_props = g_list_delete_link(current_props, tmp);
+					break;
+				}
+			}
+		}
+	}
+
+	/* Remove all entries that we're not getting values for, we can
+	   assume that they no longer exist */
 	for (tmp = current_props; tmp != NULL && have_error == FALSE; tmp = g_list_next(tmp)) {
 		dbusmenu_menuitem_property_remove(DBUSMENU_MENUITEM(data), (const gchar *)tmp->data);
 	}