aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@canonical.com>2009-11-03 21:31:04 -0600
committerTed Gould <ted@canonical.com>2009-11-03 21:31:04 -0600
commit57642ed848ab8f6afd9e364b503633727c5ee288 (patch)
treeaeaccb9ac5145881440dcae77dece37655ff48b3
parent1f96a346f7c2465a6a7785413d78071938829891 (diff)
downloadlibayatana-indicator-57642ed848ab8f6afd9e364b503633727c5ee288.tar.gz
libayatana-indicator-57642ed848ab8f6afd9e364b503633727c5ee288.tar.bz2
libayatana-indicator-57642ed848ab8f6afd9e364b503633727c5ee288.zip
Converting the dummy indicators over to the new API. They compile now.
-rw-r--r--tests/dummy-indicator-blank.c1
-rw-r--r--tests/dummy-indicator-null.c80
-rw-r--r--tests/dummy-indicator-simple.c78
3 files changed, 150 insertions, 9 deletions
diff --git a/tests/dummy-indicator-blank.c b/tests/dummy-indicator-blank.c
index 41249f2..5cfe0f0 100644
--- a/tests/dummy-indicator-blank.c
+++ b/tests/dummy-indicator-blank.c
@@ -2,5 +2,4 @@
#include "libindicator/indicator.h"
INDICATOR_SET_VERSION
-INDICATOR_SET_NAME("dummy-indicator-null")
diff --git a/tests/dummy-indicator-null.c b/tests/dummy-indicator-null.c
index ff99d71..767067d 100644
--- a/tests/dummy-indicator-null.c
+++ b/tests/dummy-indicator-null.c
@@ -1,23 +1,95 @@
+#include <glib.h>
+#include <glib-object.h>
+
#include "libindicator/indicator.h"
+#include "libindicator/indicator-object.h"
+
+#define DUMMY_INDICATOR_NULL_TYPE (dummy_indicator_null_get_type ())
+#define DUMMY_INDICATOR_NULL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DUMMY_INDICATOR_NULL_TYPE, DummyIndicatorNull))
+#define DUMMY_INDICATOR_NULL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DUMMY_INDICATOR_NULL_TYPE, DummyIndicatorNullClass))
+#define IS_DUMMY_INDICATOR_NULL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DUMMY_INDICATOR_NULL_TYPE))
+#define IS_DUMMY_INDICATOR_NULL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DUMMY_INDICATOR_NULL_TYPE))
+#define DUMMY_INDICATOR_NULL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DUMMY_INDICATOR_NULL_TYPE, DummyIndicatorNullClass))
+
+typedef struct _DummyIndicatorNull DummyIndicatorNull;
+typedef struct _DummyIndicatorNullClass DummyIndicatorNullClass;
+
+struct _DummyIndicatorNullClass {
+ IndicatorObjectClass parent_class;
+};
+
+struct _DummyIndicatorNull {
+ IndicatorObject parent;
+};
+
+GType dummy_indicator_null_get_type (void);
INDICATOR_SET_VERSION
-INDICATOR_SET_NAME("dummy-indicator-null")
+INDICATOR_SET_TYPE(DUMMY_INDICATOR_NULL_TYPE)
+
GtkLabel *
-get_label (void)
+get_label (IndicatorObject * io)
{
return NULL;
}
GtkImage *
-get_icon (void)
+get_icon (IndicatorObject * io)
{
return NULL;
}
GtkMenu *
-get_menu (void)
+get_menu (IndicatorObject * io)
{
return NULL;
}
+
+static void dummy_indicator_null_class_init (DummyIndicatorNullClass *klass);
+static void dummy_indicator_null_init (DummyIndicatorNull *self);
+static void dummy_indicator_null_dispose (GObject *object);
+static void dummy_indicator_null_finalize (GObject *object);
+
+G_DEFINE_TYPE (DummyIndicatorNull, dummy_indicator_null, INDICATOR_OBJECT_TYPE);
+
+static void
+dummy_indicator_null_class_init (DummyIndicatorNullClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+ object_class->dispose = dummy_indicator_null_dispose;
+ object_class->finalize = dummy_indicator_null_finalize;
+
+ IndicatorObjectClass * io_class = INDICATOR_OBJECT_CLASS(klass);
+
+ io_class->get_label = get_label;
+ io_class->get_image = get_icon;
+ io_class->get_menu = get_menu;
+
+ return;
+}
+
+static void
+dummy_indicator_null_init (DummyIndicatorNull *self)
+{
+
+ return;
+}
+
+static void
+dummy_indicator_null_dispose (GObject *object)
+{
+
+ G_OBJECT_CLASS (dummy_indicator_null_parent_class)->dispose (object);
+ return;
+}
+
+static void
+dummy_indicator_null_finalize (GObject *object)
+{
+
+ G_OBJECT_CLASS (dummy_indicator_null_parent_class)->finalize (object);
+ return;
+}
diff --git a/tests/dummy-indicator-simple.c b/tests/dummy-indicator-simple.c
index cee4eac..654650f 100644
--- a/tests/dummy-indicator-simple.c
+++ b/tests/dummy-indicator-simple.c
@@ -1,23 +1,46 @@
+#include <glib.h>
+#include <glib-object.h>
#include "libindicator/indicator.h"
+#include "libindicator/indicator-object.h"
+
+#define DUMMY_INDICATOR_SIMPLE_TYPE (dummy_indicator_simple_get_type ())
+#define DUMMY_INDICATOR_SIMPLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DUMMY_INDICATOR_SIMPLE_TYPE, DummyIndicatorSimple))
+#define DUMMY_INDICATOR_SIMPLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DUMMY_INDICATOR_SIMPLE_TYPE, DummyIndicatorSimpleClass))
+#define IS_DUMMY_INDICATOR_SIMPLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DUMMY_INDICATOR_SIMPLE_TYPE))
+#define IS_DUMMY_INDICATOR_SIMPLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DUMMY_INDICATOR_SIMPLE_TYPE))
+#define DUMMY_INDICATOR_SIMPLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DUMMY_INDICATOR_SIMPLE_TYPE, DummyIndicatorSimpleClass))
+
+typedef struct _DummyIndicatorSimple DummyIndicatorSimple;
+typedef struct _DummyIndicatorSimpleClass DummyIndicatorSimpleClass;
+
+struct _DummyIndicatorSimpleClass {
+ IndicatorObjectClass parent_class;
+};
+
+struct _DummyIndicatorSimple {
+ IndicatorObject parent;
+};
+
+GType dummy_indicator_simple_get_type (void);
INDICATOR_SET_VERSION
-INDICATOR_SET_NAME("dummy-indicator-simple")
+INDICATOR_SET_TYPE(DUMMY_INDICATOR_SIMPLE_TYPE)
GtkLabel *
-get_label (void)
+get_label (IndicatorObject * io)
{
return GTK_LABEL(gtk_label_new("Simple Item"));
}
GtkImage *
-get_icon (void)
+get_icon (IndicatorObject * io)
{
return GTK_IMAGE(gtk_image_new());
}
GtkMenu *
-get_menu (void)
+get_menu (IndicatorObject * io)
{
GtkMenu * main_menu = GTK_MENU(gtk_menu_new());
GtkWidget * loading_item = gtk_menu_item_new_with_label("Loading...");
@@ -26,3 +49,50 @@ get_menu (void)
return main_menu;
}
+
+static void dummy_indicator_simple_class_init (DummyIndicatorSimpleClass *klass);
+static void dummy_indicator_simple_init (DummyIndicatorSimple *self);
+static void dummy_indicator_simple_dispose (GObject *object);
+static void dummy_indicator_simple_finalize (GObject *object);
+
+G_DEFINE_TYPE (DummyIndicatorSimple, dummy_indicator_simple, INDICATOR_OBJECT_TYPE);
+
+static void
+dummy_indicator_simple_class_init (DummyIndicatorSimpleClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+ object_class->dispose = dummy_indicator_simple_dispose;
+ object_class->finalize = dummy_indicator_simple_finalize;
+
+ IndicatorObjectClass * io_class = INDICATOR_OBJECT_CLASS(klass);
+
+ io_class->get_label = get_label;
+ io_class->get_image = get_icon;
+ io_class->get_menu = get_menu;
+
+ return;
+}
+
+static void
+dummy_indicator_simple_init (DummyIndicatorSimple *self)
+{
+
+ return;
+}
+
+static void
+dummy_indicator_simple_dispose (GObject *object)
+{
+
+ G_OBJECT_CLASS (dummy_indicator_simple_parent_class)->dispose (object);
+ return;
+}
+
+static void
+dummy_indicator_simple_finalize (GObject *object)
+{
+
+ G_OBJECT_CLASS (dummy_indicator_simple_parent_class)->finalize (object);
+ return;
+}