aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@canonical.com>2009-05-19 05:04:04 +0200
committerTed Gould <ted@canonical.com>2009-05-19 05:04:04 +0200
commite84ef2f86d5005d6b7c298be37fd25c527d1a6fe (patch)
tree1bbfb46e10b1cc5dde87e2e1cdb612a97a8cd64d
parent4a9246ce21cd54b686e6885c1423de83e3240f6d (diff)
downloadlibdbusmenu-e84ef2f86d5005d6b7c298be37fd25c527d1a6fe.tar.gz
libdbusmenu-e84ef2f86d5005d6b7c298be37fd25c527d1a6fe.tar.bz2
libdbusmenu-e84ef2f86d5005d6b7c298be37fd25c527d1a6fe.zip
Switching over to some autogenerated menu files instead of our test ones.
-rw-r--r--libdbusmenu-gtk/Makefile.am4
-rw-r--r--libdbusmenu-gtk/menu.c49
-rw-r--r--libdbusmenu-gtk/menu.h33
-rw-r--r--libdbusmenu-gtk/test.c4
-rw-r--r--libdbusmenu-gtk/test.h2
5 files changed, 84 insertions, 8 deletions
diff --git a/libdbusmenu-gtk/Makefile.am b/libdbusmenu-gtk/Makefile.am
index 1e36228..364da62 100644
--- a/libdbusmenu-gtk/Makefile.am
+++ b/libdbusmenu-gtk/Makefile.am
@@ -8,10 +8,10 @@ lib_LTLIBRARIES = \
libdbusmenu_gtkincludedir=$(includedir)/libdbusmenu-0.1/libdbusmenu-gtk/
libdbusmenu_gtkinclude_HEADERS = \
- test.h
+ menu.h
libdbusmenu_gtk_la_SOURCES = \
- test.c
+ menu.c
libdbusmenu_gtk_la_LDFLAGS = \
-version-info $(LIBDBUSMENU_CURRENT):$(LIBDBUSMENU_REVISION):$(LIBDBUSMENU_AGE) \
diff --git a/libdbusmenu-gtk/menu.c b/libdbusmenu-gtk/menu.c
new file mode 100644
index 0000000..3e0a006
--- /dev/null
+++ b/libdbusmenu-gtk/menu.c
@@ -0,0 +1,49 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gtk/gtk.h>
+
+typedef struct _MenuPrivate MenuPrivate;
+
+struct _MenuPrivate
+{
+};
+
+#define MENU_GET_PRIVATE(o) \
+(G_TYPE_INSTANCE_GET_PRIVATE ((o), MENU_TYPE, MenuPrivate))
+
+static void menu_class_init (MenuClass *klass);
+static void menu_init (Menu *self);
+static void menu_dispose (GObject *object);
+static void menu_finalize (GObject *object);
+
+G_DEFINE_TYPE (Menu, menu, GTK_TYPE_MENU);
+
+static void
+menu_class_init (MenuClass *klass)
+{
+GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+g_type_class_add_private (klass, sizeof (MenuPrivate));
+
+object_class->dispose = menu_dispose;
+object_class->finalize = menu_finalize;
+}
+
+static void
+menu_init (Menu *self)
+{
+}
+
+static void
+menu_dispose (GObject *object)
+{
+G_OBJECT_CLASS (menu_parent_class)->dispose (object);
+}
+
+static void
+menu_finalize (GObject *object)
+{
+G_OBJECT_CLASS (menu_parent_class)->finalize (object);
+}
diff --git a/libdbusmenu-gtk/menu.h b/libdbusmenu-gtk/menu.h
new file mode 100644
index 0000000..783737a
--- /dev/null
+++ b/libdbusmenu-gtk/menu.h
@@ -0,0 +1,33 @@
+#ifndef __MENU_H__
+#define __MENU_H__
+
+#include <glib.h>
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define MENU_TYPE (menu_get_type ())
+#define MENU(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MENU_TYPE, Menu))
+#define MENU_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MENU_TYPE, MenuClass))
+#define IS_MENU(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MENU_TYPE))
+#define IS_MENU_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MENU_TYPE))
+#define MENU_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MENU_TYPE, MenuClass))
+
+typedef struct _Menu Menu;
+typedef struct _MenuClass MenuClass;
+
+struct _MenuClass
+{
+GtkMenuClass parent_class;
+};
+
+struct _Menu
+{
+GtkMenu parent;
+};
+
+GType menu_get_type (void);
+
+G_END_DECLS
+
+#endif
diff --git a/libdbusmenu-gtk/test.c b/libdbusmenu-gtk/test.c
deleted file mode 100644
index 8ebb3f7..0000000
--- a/libdbusmenu-gtk/test.c
+++ /dev/null
@@ -1,4 +0,0 @@
-
-void mysymbol (void) {
- return;
-}
diff --git a/libdbusmenu-gtk/test.h b/libdbusmenu-gtk/test.h
deleted file mode 100644
index ad000af..0000000
--- a/libdbusmenu-gtk/test.h
+++ /dev/null
@@ -1,2 +0,0 @@
-
-void mysymbol (void);