diff options
| author | Ted Gould <ted@canonical.com> | 2009-04-16 15:39:11 -0500 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2009-04-16 15:39:11 -0500 |
| commit | 4cf3e30cfa9bace377649683d7c4e76c634b02e8 (patch) | |
| tree | af0a43d3acda79ecf1f116045f773badaa3a0278 | |
| parent | 00eafa4bed235caacd87bc119433577c0e1fa7a9 (diff) | |
| download | libdbusmenu-4cf3e30cfa9bace377649683d7c4e76c634b02e8.tar.gz libdbusmenu-4cf3e30cfa9bace377649683d7c4e76c634b02e8.tar.bz2 libdbusmenu-4cf3e30cfa9bace377649683d7c4e76c634b02e8.zip | |
No warnings, put them in now I had to fix them
| -rw-r--r-- | libdbusmenu-glib/Makefile.am | 2 | ||||
| -rw-r--r-- | libdbusmenu-glib/menuitem.c | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/libdbusmenu-glib/Makefile.am b/libdbusmenu-glib/Makefile.am index 2bc23ec..b273555 100644 --- a/libdbusmenu-glib/Makefile.am +++ b/libdbusmenu-glib/Makefile.am @@ -31,7 +31,7 @@ libdbusmenu_glib_la_LDFLAGS = \ -export-symbols-regex "^[^_].*" libdbusmenu_glib_la_CFLAGS = \ - $(DBUSMENUGLIB_CFLAGS) + $(DBUSMENUGLIB_CFLAGS) -Wall -Werror libdbusmenu_glib_la_LIBADD = \ $(DBUSMENUGLIB_LIBS) diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c index 3aa39c6..4187adc 100644 --- a/libdbusmenu-glib/menuitem.c +++ b/libdbusmenu-glib/menuitem.c @@ -32,6 +32,8 @@ dbusmenu_menuitem_class_init (DbusmenuMenuitemClass *klass) object_class->dispose = dbusmenu_menuitem_dispose; object_class->finalize = dbusmenu_menuitem_finalize; + + return; } static guint menuitem_next_id = 1; @@ -64,6 +66,13 @@ dbusmenu_menuitem_finalize (GObject *object) } /* Public interface */ +guint +dbusmenu_menuitem_get_id (DbusmenuMenuitem * mi) +{ + DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi); + return priv->id; +} + GList * dbusmenu_menuitem_get_children (DbusmenuMenuitem * mi) { @@ -145,7 +154,7 @@ dbusmenu_menuitem_buildxml (DbusmenuMenuitem * mi, GPtrArray * array) } else { g_ptr_array_add(array, g_strdup_printf("<menu id=\"%d\">", dbusmenu_menuitem_get_id(mi))); for ( ; children != NULL; children = children->next) { - dbus_menuitem_buildxml(DBUSMENU_MENUITEM(children->data), array); + dbusmenu_menuitem_buildxml(DBUSMENU_MENUITEM(children->data), array); } g_ptr_array_add(array, g_strdup("</menu>")); } |