aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog7
-rw-r--r--libdbusmenu-glib/menuitem.c6
2 files changed, 10 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 2e03a36..3d6a402 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering4) UNRELEASED; urgency=low
+
+ * Upstream Merge
+ * I really don't want to talk about it.
+
+ -- Ted Gould <ted@ubuntu.com> Wed, 14 Apr 2010 17:18:48 -0500
+
libdbusmenu (0.2.9-0ubuntu1~ppa2~ordering3) lucid; urgency=low
* Upstream Merge
diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index e519473..515fd36 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -534,7 +534,7 @@ dbusmenu_menuitem_child_append (DbusmenuMenuitem * mi, DbusmenuMenuitem * child)
g_return_val_if_fail(DBUSMENU_IS_MENUITEM(child), FALSE);
DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
- g_return_val_if_fail(g_list_find(priv->children, child) != NULL, FALSE);
+ g_return_val_if_fail(g_list_find(priv->children, child) == NULL, FALSE);
priv->children = g_list_append(priv->children, child);
#ifdef MASSIVEDEBUGGING
@@ -562,7 +562,7 @@ dbusmenu_menuitem_child_prepend (DbusmenuMenuitem * mi, DbusmenuMenuitem * child
g_return_val_if_fail(DBUSMENU_IS_MENUITEM(child), FALSE);
DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
- g_return_val_if_fail(g_list_find(priv->children, child) != NULL, FALSE);
+ g_return_val_if_fail(g_list_find(priv->children, child) == NULL, FALSE);
priv->children = g_list_prepend(priv->children, child);
#ifdef MASSIVEDEBUGGING
@@ -619,7 +619,7 @@ dbusmenu_menuitem_child_add_position (DbusmenuMenuitem * mi, DbusmenuMenuitem *
g_return_val_if_fail(DBUSMENU_IS_MENUITEM(child), FALSE);
DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
- g_return_val_if_fail(g_list_find(priv->children, child) != NULL, FALSE);
+ g_return_val_if_fail(g_list_find(priv->children, child) == NULL, FALSE);
priv->children = g_list_insert(priv->children, child, position);
#ifdef MASSIVEDEBUGGING