From 700e01d8b92d2d11e4d7ce13ec4861a4b744d10b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 9 Dec 2009 20:11:36 -0600 Subject: Ignoring the bustle files. --- .bzrignore | 1 + 1 file changed, 1 insertion(+) (limited to '.bzrignore') diff --git a/.bzrignore b/.bzrignore index 398d2da..591b750 100644 --- a/.bzrignore +++ b/.bzrignore @@ -52,3 +52,4 @@ tools/dbusmenu-dumper libdbusmenu-[0-9].[0-9].[0-9].tar.gz libdbusmenu-[0-9].[0-9].[0-9].tar.gz.asc tests/test-mago +tests/*.bustle -- cgit v1.2.3 From f70759b6c1a61e34660a3bc2dddfb3f2cbf18fe7 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 15 Dec 2009 16:04:29 -0600 Subject: Building the basic generic menu item. --- .bzrignore | 1 + libdbusmenu-gtk/Makefile.am | 2 ++ libdbusmenu-gtk/genericmenuitem.c | 49 +++++++++++++++++++++++++++++++++++++++ libdbusmenu-gtk/genericmenuitem.h | 34 +++++++++++++++++++++++++++ 4 files changed, 86 insertions(+) create mode 100644 libdbusmenu-gtk/genericmenuitem.c create mode 100644 libdbusmenu-gtk/genericmenuitem.h (limited to '.bzrignore') diff --git a/.bzrignore b/.bzrignore index 591b750..d7b28a6 100644 --- a/.bzrignore +++ b/.bzrignore @@ -53,3 +53,4 @@ libdbusmenu-[0-9].[0-9].[0-9].tar.gz libdbusmenu-[0-9].[0-9].[0-9].tar.gz.asc tests/test-mago tests/*.bustle +libdbusmenu-gtk/libdbusmenu_gtk_la-genericmenuitem.lo diff --git a/libdbusmenu-gtk/Makefile.am b/libdbusmenu-gtk/Makefile.am index 87a82a6..97d8563 100644 --- a/libdbusmenu-gtk/Makefile.am +++ b/libdbusmenu-gtk/Makefile.am @@ -15,6 +15,8 @@ libdbusmenu_gtkinclude_HEADERS = \ libdbusmenu_gtk_la_SOURCES = \ client.h \ client.c \ + genericmenuitem.h \ + genericmenuitem.c \ menu.h \ menu.c \ menuitem.h \ diff --git a/libdbusmenu-gtk/genericmenuitem.c b/libdbusmenu-gtk/genericmenuitem.c new file mode 100644 index 0000000..3dd3969 --- /dev/null +++ b/libdbusmenu-gtk/genericmenuitem.c @@ -0,0 +1,49 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "genericmenuitem.h" + +typedef struct _GenericmenuitemPrivate GenericmenuitemPrivate; + +struct _GenericmenuitemPrivate +{ +}; + +#define GENERICMENUITEM_GET_PRIVATE(o) \ +(G_TYPE_INSTANCE_GET_PRIVATE ((o), GENERICMENUITEM_TYPE, GenericmenuitemPrivate)) + +static void genericmenuitem_class_init (GenericmenuitemClass *klass); +static void genericmenuitem_init (Genericmenuitem *self); +static void genericmenuitem_dispose (GObject *object); +static void genericmenuitem_finalize (GObject *object); + +G_DEFINE_TYPE (Genericmenuitem, genericmenuitem, GTK_TYPE_CHECK_MENU_ITEM); + +static void +genericmenuitem_class_init (GenericmenuitemClass *klass) +{ +GObjectClass *object_class = G_OBJECT_CLASS (klass); + +g_type_class_add_private (klass, sizeof (GenericmenuitemPrivate)); + +object_class->dispose = genericmenuitem_dispose; +object_class->finalize = genericmenuitem_finalize; +} + +static void +genericmenuitem_init (Genericmenuitem *self) +{ +} + +static void +genericmenuitem_dispose (GObject *object) +{ +G_OBJECT_CLASS (genericmenuitem_parent_class)->dispose (object); +} + +static void +genericmenuitem_finalize (GObject *object) +{ +G_OBJECT_CLASS (genericmenuitem_parent_class)->finalize (object); +} diff --git a/libdbusmenu-gtk/genericmenuitem.h b/libdbusmenu-gtk/genericmenuitem.h new file mode 100644 index 0000000..fdfbee1 --- /dev/null +++ b/libdbusmenu-gtk/genericmenuitem.h @@ -0,0 +1,34 @@ +#ifndef __GENERICMENUITEM_H__ +#define __GENERICMENUITEM_H__ + +#include +#include +#include + +G_BEGIN_DECLS + +#define GENERICMENUITEM_TYPE (genericmenuitem_get_type ()) +#define GENERICMENUITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GENERICMENUITEM_TYPE, Genericmenuitem)) +#define GENERICMENUITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GENERICMENUITEM_TYPE, GenericmenuitemClass)) +#define IS_GENERICMENUITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GENERICMENUITEM_TYPE)) +#define IS_GENERICMENUITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GENERICMENUITEM_TYPE)) +#define GENERICMENUITEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GENERICMENUITEM_TYPE, GenericmenuitemClass)) + +typedef struct _Genericmenuitem Genericmenuitem; +typedef struct _GenericmenuitemClass GenericmenuitemClass; + +struct _GenericmenuitemClass +{ +GtkCheckMenuItemClass parent_class; +}; + +struct _Genericmenuitem +{ +GtkCheckMenuItem parent; +}; + +GType genericmenuitem_get_type (void); + +G_END_DECLS + +#endif -- cgit v1.2.3 From 7f05a7e84a3bf4bf936bc9e81465e7feac1f7487 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 21 Dec 2009 14:41:50 -0600 Subject: Adding the object tests into the build. --- .bzrignore | 2 ++ tests/Makefile.am | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+) (limited to '.bzrignore') diff --git a/.bzrignore b/.bzrignore index d7b28a6..66f815e 100644 --- a/.bzrignore +++ b/.bzrignore @@ -54,3 +54,5 @@ libdbusmenu-[0-9].[0-9].[0-9].tar.gz.asc tests/test-mago tests/*.bustle libdbusmenu-gtk/libdbusmenu_gtk_la-genericmenuitem.lo +tests/test-glib-objects +tests/test-glib-objects-test diff --git a/tests/Makefile.am b/tests/Makefile.am index 1d58700..0c2ab57 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -2,6 +2,7 @@ DBUS_RUNNER=dbus-test-runner TESTS = \ + test-glib-objects-test \ test-glib-layout \ test-glib-properties \ test-glib-simple-items \ @@ -10,6 +11,7 @@ TESTS = \ check_PROGRAMS = \ glib-server-nomenu \ + test-glib-objects \ test-glib-layout-client \ test-glib-layout-server \ test-glib-properties-client \ @@ -70,6 +72,26 @@ test_glib_layout_client_LDADD = \ $(DBUSMENUGLIB_LIBS) +###################### +# Test Glib Object +###################### + +test-glib-objects-test: test-glib-objects Makefile.am + @echo "#!/bin/bash" > $@ + @echo $(DBUS_RUNNER) -b $@.bustle --task gtester --parameter ./test-glib-objects >> $@ + @chmod +x $@ + +test_glib_objects_SOURCES = \ + test-glib-objects.c + +test_glib_objects_CFLAGS = \ + -I $(srcdir)/.. \ + $(DBUSMENUGLIB_CFLAGS) -Wall -Werror + +test_glib_objects_LDADD = \ + ../libdbusmenu-glib/libdbusmenu-glib.la \ + $(DBUSMENUGLIB_LIBS) + ###################### # Test Glib Properties ###################### @@ -239,6 +261,7 @@ distclean-local: DISTCLEANFILES = \ $(TESTS) \ + test-glib-objects-test.bustle \ test-glib-layout.bustle \ test-glib-properties.bustle \ test-glib-simple-items.bustle \ -- cgit v1.2.3 From d7480ea88bc34ac80c468e28ce8b6a0704cb3c8c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 21 Dec 2009 15:08:03 -0600 Subject: Ignoring the generated test description. --- .bzrignore | 1 + 1 file changed, 1 insertion(+) (limited to '.bzrignore') diff --git a/.bzrignore b/.bzrignore index 66f815e..06863df 100644 --- a/.bzrignore +++ b/.bzrignore @@ -56,3 +56,4 @@ tests/*.bustle libdbusmenu-gtk/libdbusmenu_gtk_la-genericmenuitem.lo tests/test-glib-objects tests/test-glib-objects-test +tests/test-glib-objects.xml -- cgit v1.2.3