diff options
| author | Ted Gould <ted@canonical.com> | 2009-05-12 11:07:00 -0500 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2009-05-12 11:07:00 -0500 |
| commit | 53b4a13ca4541bcdf85ca3ee28cb6ffc81e6f5b0 (patch) | |
| tree | 5ec06325d34b0fdab498045aa911fb534eb2ca48 | |
| parent | f50b255c3993dd990606c1d17721788c4f4e1ef4 (diff) | |
| download | libdbusmenu-53b4a13ca4541bcdf85ca3ee28cb6ffc81e6f5b0.tar.gz libdbusmenu-53b4a13ca4541bcdf85ca3ee28cb6ffc81e6f5b0.tar.bz2 libdbusmenu-53b4a13ca4541bcdf85ca3ee28cb6ffc81e6f5b0.zip | |
Checking parameters on MI functions.
| -rw-r--r-- | libdbusmenu-glib/menuitem.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c index 6360079..0894d2c 100644 --- a/libdbusmenu-glib/menuitem.c +++ b/libdbusmenu-glib/menuitem.c @@ -196,6 +196,8 @@ dbusmenu_menuitem_new_with_id (guint id) guint dbusmenu_menuitem_get_id (DbusmenuMenuitem * mi) { + g_return_val_if_fail(DBUSMENU_IS_MENUITEM(mi), 0); + GValue retval = {0}; g_value_init(&retval, G_TYPE_UINT); g_object_get_property(G_OBJECT(mi), "id", &retval); @@ -287,6 +289,9 @@ dbusmenu_menuitem_get_position (DbusmenuMenuitem * mi, DbusmenuMenuitem * parent gboolean dbusmenu_menuitem_child_append (DbusmenuMenuitem * mi, DbusmenuMenuitem * child) { + g_return_val_if_fail(DBUSMENU_IS_MENUITEM(mi), FALSE); + g_return_val_if_fail(DBUSMENU_IS_MENUITEM(child), FALSE); + DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi); priv->children = g_list_append(priv->children, child); return TRUE; @@ -306,6 +311,9 @@ dbusmenu_menuitem_child_append (DbusmenuMenuitem * mi, DbusmenuMenuitem * child) gboolean dbusmenu_menuitem_child_delete (DbusmenuMenuitem * mi, DbusmenuMenuitem * child) { + g_return_val_if_fail(DBUSMENU_IS_MENUITEM(mi), FALSE); + g_return_val_if_fail(DBUSMENU_IS_MENUITEM(child), FALSE); + DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi); priv->children = g_list_remove(priv->children, child); return TRUE; @@ -326,6 +334,9 @@ dbusmenu_menuitem_child_delete (DbusmenuMenuitem * mi, DbusmenuMenuitem * child) gboolean dbusmenu_menuitem_child_add_position (DbusmenuMenuitem * mi, DbusmenuMenuitem * child, guint position) { + g_return_val_if_fail(DBUSMENU_IS_MENUITEM(mi), FALSE); + g_return_val_if_fail(DBUSMENU_IS_MENUITEM(child), FALSE); + DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi); priv->children = g_list_insert(priv->children, child, position); return TRUE; @@ -345,6 +356,8 @@ dbusmenu_menuitem_child_add_position (DbusmenuMenuitem * mi, DbusmenuMenuitem * DbusmenuMenuitem * dbusmenu_menuitem_child_find (DbusmenuMenuitem * mi, guint id) { + g_return_val_if_fail(DBUSMENU_IS_MENUITEM(mi), NULL); + GList * childs = dbusmenu_menuitem_get_children(mi); if (childs == NULL) return NULL; |