From 1f822bf64b8891dab03937060dd47b8003bb8ab5 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 6 Oct 2009 15:28:41 -0400 Subject: Building a base object. --- .bzrignore | 1 + libindicator/Makefile.am | 10 +++++++- libindicator/indicator-object.c | 55 +++++++++++++++++++++++++++++++++++++++++ libindicator/indicator-object.h | 33 +++++++++++++++++++++++++ 4 files changed, 98 insertions(+), 1 deletion(-) create mode 100644 libindicator/indicator-object.c create mode 100644 libindicator/indicator-object.h diff --git a/.bzrignore b/.bzrignore index b8537d5..ae13edd 100644 --- a/.bzrignore +++ b/.bzrignore @@ -103,3 +103,4 @@ src-sus/indicator-applet-sus data/GNOME_IndicatorAppletSUS.server data/GNOME_IndicatorAppletSUS.server.in src-sus/indicator-applet-no-sus +libindicator/libindicator.la diff --git a/libindicator/Makefile.am b/libindicator/Makefile.am index be68721..29b7bb5 100644 --- a/libindicator/Makefile.am +++ b/libindicator/Makefile.am @@ -4,11 +4,19 @@ EXTRA_DIST = \ libindicatorincludedir=$(includedir)/libindicator-0.1/libindicator indicator_headers = \ - indicator.h + indicator.h \ + indicator-object.h libindicatorinclude_HEADERS = \ $(indicator_headers) +lib_LTLIBRARIES = \ + libindicator.la + +libindicator_la_SOURCES = \ + $(indicator_headers) \ + indicator-object.c + pkgconfig_DATA = indicator.pc pkgconfigdir = $(libdir)/pkgconfig diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c new file mode 100644 index 0000000..772110b --- /dev/null +++ b/libindicator/indicator-object.c @@ -0,0 +1,55 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "indicator-object.h" + +typedef struct _IndicatorObjectPrivate IndicatorObjectPrivate; +struct _IndicatorObjectPrivate { +}; + +#define INDICATOR_OBJECT_GET_PRIVATE(o) \ + (G_TYPE_INSTANCE_GET_PRIVATE ((o), INDICATOR_OBJECT_TYPE, IndicatorObjectPrivate)) + +static void indicator_object_class_init (IndicatorObjectClass *klass); +static void indicator_object_init (IndicatorObject *self); +static void indicator_object_dispose (GObject *object); +static void indicator_object_finalize (GObject *object); + +G_DEFINE_TYPE (IndicatorObject, indicator_object, G_TYPE_OBJECT); + +static void +indicator_object_class_init (IndicatorObjectClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + g_type_class_add_private (klass, sizeof (IndicatorObjectPrivate)); + + object_class->dispose = indicator_object_dispose; + object_class->finalize = indicator_object_finalize; + + return; +} + +static void +indicator_object_init (IndicatorObject *self) +{ + + return; +} + +static void +indicator_object_dispose (GObject *object) +{ + + G_OBJECT_CLASS (indicator_object_parent_class)->dispose (object); + return; +} + +static void +indicator_object_finalize (GObject *object) +{ + + G_OBJECT_CLASS (indicator_object_parent_class)->finalize (object); + return; +} diff --git a/libindicator/indicator-object.h b/libindicator/indicator-object.h new file mode 100644 index 0000000..9c6c103 --- /dev/null +++ b/libindicator/indicator-object.h @@ -0,0 +1,33 @@ +#ifndef __INDICATOR_OBJECT_H__ +#define __INDICATOR_OBJECT_H__ + +#include +#include + +G_BEGIN_DECLS + +#define INDICATOR_OBJECT_TYPE (indicator_object_get_type ()) +#define INDICATOR_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), INDICATOR_OBJECT_TYPE, IndicatorObject)) +#define INDICATOR_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), INDICATOR_OBJECT_TYPE, IndicatorObjectClass)) +#define IS_INDICATOR_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), INDICATOR_OBJECT_TYPE)) +#define IS_INDICATOR_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), INDICATOR_OBJECT_TYPE)) +#define INDICATOR_OBJECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), INDICATOR_OBJECT_TYPE, IndicatorObjectClass)) + +typedef struct _IndicatorObject IndicatorObject; +typedef struct _IndicatorObjectClass IndicatorObjectClass; + +struct _IndicatorObjectClass { + GObjectClass parent_class; + +}; + +struct _IndicatorObject { + GObject parent; + +}; + +GType indicator_object_get_type (void); + +G_END_DECLS + +#endif -- cgit v1.2.3 From 24d025363c4a708c61acee26456a42a0b9a4b609 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 6 Oct 2009 16:32:23 -0400 Subject: Adding some pkg-config love to get things compiling all nice like. --- configure.ac | 13 +++++++++++++ libindicator/Makefile.am | 7 +++++++ 2 files changed, 20 insertions(+) diff --git a/configure.ac b/configure.ac index 70ef98b..fc7fcab 100644 --- a/configure.ac +++ b/configure.ac @@ -20,6 +20,19 @@ AC_CONFIG_MACRO_DIR([m4]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) +############################## +# Dependencies +############################## + +GLIB_REQUIRED_VERSION=2.18 +DBUS_REQUIRED_VERSION=0.76 + +PKG_CHECK_MODULES(LIBINDICATOR, glib-2.0 >= $GLIB_REQUIRED_VERSION + dbus-glib-1 >= $DBUS_REQUIRED_VERSION) + +AC_SUBST(LIBINDICATOR_CFLAGS) +AC_SUBST(LIBINDICATOR_LIBS) + ############################## # Custom Junk ############################## diff --git a/libindicator/Makefile.am b/libindicator/Makefile.am index 29b7bb5..db45f3c 100644 --- a/libindicator/Makefile.am +++ b/libindicator/Makefile.am @@ -17,6 +17,13 @@ libindicator_la_SOURCES = \ $(indicator_headers) \ indicator-object.c +libindicator_la_CFLAGS = \ + $(LIBINDICATOR_CFLAGS) \ + -Wall -Werror + +libindicator_la_LIBADD = \ + $(LIBINDICATOR_LIBS) + pkgconfig_DATA = indicator.pc pkgconfigdir = $(libdir)/pkgconfig -- cgit v1.2.3 From 1ca966660489e088fe0e3fd7154ee54997209cff Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 12:05:36 -0400 Subject: Ignoring our new file. --- .bzrignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.bzrignore b/.bzrignore index ae13edd..0faee7c 100644 --- a/.bzrignore +++ b/.bzrignore @@ -104,3 +104,5 @@ data/GNOME_IndicatorAppletSUS.server data/GNOME_IndicatorAppletSUS.server.in src-sus/indicator-applet-no-sus libindicator/libindicator.la +libindicator/libindicator_la-indicator-object. +libindicator/libindicator_la-indicator-object.lo -- cgit v1.2.3 From fa946df247f0e16de3a355dd5696f4671277348a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 12:18:23 -0400 Subject: Adding in a tests folder --- Makefile.am | 3 ++- configure.ac | 1 + tests/Makefile.am | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 tests/Makefile.am diff --git a/Makefile.am b/Makefile.am index ae85ded..f0211b0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,7 @@ SUBDIRS = \ - libindicator + libindicator \ + tests DISTCLEANFILES = \ libindicator-*.tar.gz diff --git a/configure.ac b/configure.ac index fc7fcab..db437a6 100644 --- a/configure.ac +++ b/configure.ac @@ -86,6 +86,7 @@ AC_OUTPUT([ Makefile libindicator/Makefile libindicator/indicator.pc +tests/Makefile ]) ########################### diff --git a/tests/Makefile.am b/tests/Makefile.am new file mode 100644 index 0000000..8ac6544 --- /dev/null +++ b/tests/Makefile.am @@ -0,0 +1 @@ +#Something should go here -- cgit v1.2.3 From c314d6040b93da70359e19a8b7475c94fc86fb1c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 12:29:12 -0400 Subject: Adding in a simple little test. --- .bzrignore | 3 +++ tests/Makefile.am | 25 ++++++++++++++++++++++++- tests/test-loader.c | 7 +++++++ 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 tests/test-loader.c diff --git a/.bzrignore b/.bzrignore index 0faee7c..a947a1a 100644 --- a/.bzrignore +++ b/.bzrignore @@ -106,3 +106,6 @@ src-sus/indicator-applet-no-sus libindicator/libindicator.la libindicator/libindicator_la-indicator-object. libindicator/libindicator_la-indicator-object.lo +tests/loader-check-results.xml +tests/loader-check-results.html +tests/test-loader diff --git a/tests/Makefile.am b/tests/Makefile.am index 8ac6544..a04855c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1 +1,24 @@ -#Something should go here + +noinst_PROGRAMS = \ + test-loader + +test_loader_SOURCES = \ + test-loader.c + +test_loader_CFLAGS = \ + -Wall -Werror \ + $(UPANEL_CFLAGS) -I$(top_srcdir) + +test_loader_LDADD = \ + $(UPANEL_LIBS) $(top_builddir)/libindicator/.libs/libindicator.a + +XML_REPORT = loader-check-results.xml +HTML_REPORT = loader-check-results.html + +loader-tester: test-loader + @gtester -o=$(XML_REPORT) ./test-loader + +check-local: loader-tester + +DISTCLEANFILES = $(XML_REPORT) $(HTML_REPORT) + diff --git a/tests/test-loader.c b/tests/test-loader.c new file mode 100644 index 0000000..63590c7 --- /dev/null +++ b/tests/test-loader.c @@ -0,0 +1,7 @@ + +int +main (int argc, char ** argv) +{ + + return 0; +} -- cgit v1.2.3 From 1386478a87fd0f228dd31a00d8f3d969d6a6a98c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 13:00:00 -0400 Subject: Fleshing out the test a little bit. --- tests/Makefile.am | 6 +++--- tests/test-loader.c | 24 +++++++++++++++++++++++- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index a04855c..2779ad7 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,5 +1,5 @@ -noinst_PROGRAMS = \ +check_PROGRAMS = \ test-loader test_loader_SOURCES = \ @@ -7,10 +7,10 @@ test_loader_SOURCES = \ test_loader_CFLAGS = \ -Wall -Werror \ - $(UPANEL_CFLAGS) -I$(top_srcdir) + $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) test_loader_LDADD = \ - $(UPANEL_LIBS) $(top_builddir)/libindicator/.libs/libindicator.a + $(LIBINDICATOR_LIBS) $(top_builddir)/libindicator/.libs/libindicator.a XML_REPORT = loader-check-results.xml HTML_REPORT = loader-check-results.html diff --git a/tests/test-loader.c b/tests/test-loader.c index 63590c7..7e77195 100644 --- a/tests/test-loader.c +++ b/tests/test-loader.c @@ -1,7 +1,29 @@ +#include +#include "libindicator/indicator-object.h" + +void +test_loader_refunref (void) +{ + + return; +} + +void +test_loader_creation_deletion_suite (void) +{ + g_test_add_func ("/libindicator/loader/ref_and_unref", test_loader_refunref); + + return; +} + int main (int argc, char ** argv) { + g_type_init (); + g_test_init (&argc, &argv, NULL); + + test_loader_creation_deletion_suite(); - return 0; + return g_test_run(); } -- cgit v1.2.3 From 4658844f6c1d0e4352ee7baf0e7fcf56bde01d10 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 16:29:36 -0400 Subject: Test to build the object and unref it. --- tests/test-loader.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tests/test-loader.c b/tests/test-loader.c index 7e77195..68bfe48 100644 --- a/tests/test-loader.c +++ b/tests/test-loader.c @@ -1,9 +1,25 @@ #include #include "libindicator/indicator-object.h" +void +destroy_cb (gpointer data) +{ + gboolean * bob = (gboolean *)data; + *bob = TRUE; + return; +} + void test_loader_refunref (void) { + GObject * object = g_object_new(INDICATOR_OBJECT_TYPE, NULL); + + gboolean unreffed = FALSE; + g_signal_connect(object, "destroy", G_CALLBACK(destroy_cb), &unreffed); + + g_object_unref(object); + + g_assert(unreffed == TRUE); return; } -- cgit v1.2.3 From 3bf9efb38a2bd564bede8e542d5adc267056ec0a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 16:32:19 -0400 Subject: Putting data in the private --- libindicator/indicator-object.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c index 772110b..bb154fc 100644 --- a/libindicator/indicator-object.c +++ b/libindicator/indicator-object.c @@ -6,6 +6,7 @@ typedef struct _IndicatorObjectPrivate IndicatorObjectPrivate; struct _IndicatorObjectPrivate { + guint data; }; #define INDICATOR_OBJECT_GET_PRIVATE(o) \ -- cgit v1.2.3 From 26ced5cdf75d022c4b40cc3ef8658bf486a0dba1 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 16:34:13 -0400 Subject: Using a weak ref instead of connecting to a signal that doesn't exist --- tests/test-loader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test-loader.c b/tests/test-loader.c index 68bfe48..f754685 100644 --- a/tests/test-loader.c +++ b/tests/test-loader.c @@ -2,7 +2,7 @@ #include "libindicator/indicator-object.h" void -destroy_cb (gpointer data) +destroy_cb (gpointer data, GObject * object) { gboolean * bob = (gboolean *)data; *bob = TRUE; @@ -15,7 +15,7 @@ test_loader_refunref (void) GObject * object = g_object_new(INDICATOR_OBJECT_TYPE, NULL); gboolean unreffed = FALSE; - g_signal_connect(object, "destroy", G_CALLBACK(destroy_cb), &unreffed); + g_object_weak_ref(object, destroy_cb, &unreffed); g_object_unref(object); -- cgit v1.2.3 From 605f74bd18652f40b619771e60978d6abd23c65f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 17:02:06 -0400 Subject: Switch from GLib to GTK as that's what we really needed. --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index db437a6..51706ef 100644 --- a/configure.ac +++ b/configure.ac @@ -24,10 +24,10 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) # Dependencies ############################## -GLIB_REQUIRED_VERSION=2.18 +GTK_REQUIRED_VERSION=2.18 DBUS_REQUIRED_VERSION=0.76 -PKG_CHECK_MODULES(LIBINDICATOR, glib-2.0 >= $GLIB_REQUIRED_VERSION +PKG_CHECK_MODULES(LIBINDICATOR, gtk+-2.0 >= $GTK_REQUIRED_VERSION dbus-glib-1 >= $DBUS_REQUIRED_VERSION) AC_SUBST(LIBINDICATOR_CFLAGS) -- cgit v1.2.3 From c594126850cb7b59294069f2711fa0a5d96febbb Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 17:03:20 -0400 Subject: Creating a dummy indicator that returns null --- .bzrignore | 2 ++ tests/Makefile.am | 31 ++++++++++++++++++++++++++++++- tests/dummy-indicator-null.c | 23 +++++++++++++++++++++++ 3 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 tests/dummy-indicator-null.c diff --git a/.bzrignore b/.bzrignore index a947a1a..24efd20 100644 --- a/.bzrignore +++ b/.bzrignore @@ -109,3 +109,5 @@ libindicator/libindicator_la-indicator-object.lo tests/loader-check-results.xml tests/loader-check-results.html tests/test-loader +tests/libdummy-indicator-null.la +tests/libdummy_indicator_null_la-dummy-indicator-null.lo diff --git a/tests/Makefile.am b/tests/Makefile.am index 2779ad7..ad5e5c6 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -2,6 +2,13 @@ check_PROGRAMS = \ test-loader +check_LTLIBRARIES = \ + libdummy-indicator-null.la + +############################# +# Test Loader +############################# + test_loader_SOURCES = \ test-loader.c @@ -12,10 +19,32 @@ test_loader_CFLAGS = \ test_loader_LDADD = \ $(LIBINDICATOR_LIBS) $(top_builddir)/libindicator/.libs/libindicator.a +############################# +# Dummy Indicator +############################# + +libdummy_indicator_null_la_SOURCES = \ + dummy-indicator-null.c + +libdummy_indicator_null_la_CFLAGS = \ + -Wall -Werror \ + $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) + +libdummy_indicator_null_la_LIBADD = \ + $(LIBINDICATOR_LIBS) + +libdummy_indicator_null_la_LDFLAGS = \ + -module \ + -avoid-version + +############################# +# Test stuff +############################# + XML_REPORT = loader-check-results.xml HTML_REPORT = loader-check-results.html -loader-tester: test-loader +loader-tester: test-loader libdummy-indicator-null.la @gtester -o=$(XML_REPORT) ./test-loader check-local: loader-tester diff --git a/tests/dummy-indicator-null.c b/tests/dummy-indicator-null.c new file mode 100644 index 0000000..ff99d71 --- /dev/null +++ b/tests/dummy-indicator-null.c @@ -0,0 +1,23 @@ + +#include "libindicator/indicator.h" + +INDICATOR_SET_VERSION +INDICATOR_SET_NAME("dummy-indicator-null") + +GtkLabel * +get_label (void) +{ + return NULL; +} + +GtkImage * +get_icon (void) +{ + return NULL; +} + +GtkMenu * +get_menu (void) +{ + return NULL; +} -- cgit v1.2.3 From b4d20eb0049cc36dbdd03754f820bd46df6e60ec Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 17:09:21 -0400 Subject: Adding a function to create an object from a file --- libindicator/indicator-object.c | 6 ++++++ libindicator/indicator-object.h | 1 + 2 files changed, 7 insertions(+) diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c index bb154fc..00ede90 100644 --- a/libindicator/indicator-object.c +++ b/libindicator/indicator-object.c @@ -54,3 +54,9 @@ indicator_object_finalize (GObject *object) G_OBJECT_CLASS (indicator_object_parent_class)->finalize (object); return; } + +IndicatorObject * +indicator_object_new_from_file (const gchar * file) +{ + return NULL; +} diff --git a/libindicator/indicator-object.h b/libindicator/indicator-object.h index 9c6c103..fd7f470 100644 --- a/libindicator/indicator-object.h +++ b/libindicator/indicator-object.h @@ -27,6 +27,7 @@ struct _IndicatorObject { }; GType indicator_object_get_type (void); +IndicatorObject * indicator_object_new_from_file (const gchar * file); G_END_DECLS -- cgit v1.2.3 From d946049ea36d1c6a0946750655eac070566f4974 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 17:11:47 -0400 Subject: Adding a test that should pass as given a bad filename we should get no object back. --- tests/test-loader.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/test-loader.c b/tests/test-loader.c index f754685..85cb924 100644 --- a/tests/test-loader.c +++ b/tests/test-loader.c @@ -1,6 +1,14 @@ #include #include "libindicator/indicator-object.h" +void +test_loader_filename_bad (void) +{ + IndicatorObject * object = indicator_object_new_from_file("/this/file/should/not/exist.so"); + g_assert(object == NULL); + return; +} + void destroy_cb (gpointer data, GObject * object) { @@ -28,6 +36,7 @@ void test_loader_creation_deletion_suite (void) { g_test_add_func ("/libindicator/loader/ref_and_unref", test_loader_refunref); + g_test_add_func ("/libindicator/loader/filename_bad", test_loader_filename_bad); return; } -- cgit v1.2.3 From 1b828c9f669ce1364618387d13fc8a134244e2ba Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 17:53:01 -0400 Subject: Apparently they have to be installable to get the .so. Fail. --- tests/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index ad5e5c6..52cc224 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -2,7 +2,7 @@ check_PROGRAMS = \ test-loader -check_LTLIBRARIES = \ +lib_LTLIBRARIES = \ libdummy-indicator-null.la ############################# -- cgit v1.2.3 From bce9f5143bfbe49972aebe3fa3e0a4566e2502b7 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 17:57:14 -0400 Subject: A test to load the dummy indicator --- tests/test-loader.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tests/test-loader.c b/tests/test-loader.c index 85cb924..3e94981 100644 --- a/tests/test-loader.c +++ b/tests/test-loader.c @@ -1,6 +1,23 @@ #include #include "libindicator/indicator-object.h" +void destroy_cb (gpointer data, GObject * object); + +void +test_loader_filename_dummy_null (void) +{ + IndicatorObject * object = indicator_object_new_from_file("./.libs/libdummy-indicator-null.so"); + g_assert(object != NULL); + + gboolean unreffed = FALSE; + g_object_weak_ref(G_OBJECT(object), destroy_cb, &unreffed); + + g_object_unref(object); + g_assert(unreffed == TRUE); + + return; +} + void test_loader_filename_bad (void) { @@ -37,6 +54,7 @@ test_loader_creation_deletion_suite (void) { g_test_add_func ("/libindicator/loader/ref_and_unref", test_loader_refunref); g_test_add_func ("/libindicator/loader/filename_bad", test_loader_filename_bad); + g_test_add_func ("/libindicator/loader/dummy/null_load", test_loader_filename_dummy_null); return; } -- cgit v1.2.3 From f4b307cda5b10c41dd733d6189fd5a1ce7fe3111 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 18:36:06 -0400 Subject: Fleshing out the load from file function. Still fails. --- libindicator/indicator-object.c | 68 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 66 insertions(+), 2 deletions(-) diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c index 00ede90..afeaf19 100644 --- a/libindicator/indicator-object.c +++ b/libindicator/indicator-object.c @@ -1,12 +1,16 @@ + #ifdef HAVE_CONFIG_H #include "config.h" #endif +#include "indicator.h" #include "indicator-object.h" typedef struct _IndicatorObjectPrivate IndicatorObjectPrivate; struct _IndicatorObjectPrivate { - guint data; + GtkLabel * label; + GtkImage * icon; + GtkMenu * menu; }; #define INDICATOR_OBJECT_GET_PRIVATE(o) \ @@ -35,6 +39,11 @@ indicator_object_class_init (IndicatorObjectClass *klass) static void indicator_object_init (IndicatorObject *self) { + IndicatorObjectPrivate * priv = INDICATOR_OBJECT_GET_PRIVATE(self); + + priv->label = NULL; + priv->icon = NULL; + priv->menu = NULL; return; } @@ -42,6 +51,22 @@ indicator_object_init (IndicatorObject *self) static void indicator_object_dispose (GObject *object) { + IndicatorObjectPrivate * priv = INDICATOR_OBJECT_GET_PRIVATE(object); + + if (priv->label != NULL) { + g_object_unref(priv->label); + priv->label = NULL; + } + + if (priv->icon != NULL) { + g_object_unref(priv->icon); + priv->icon = NULL; + } + + if (priv->menu != NULL) { + g_object_unref(priv->menu); + priv->menu = NULL; + } G_OBJECT_CLASS (indicator_object_parent_class)->dispose (object); return; @@ -58,5 +83,44 @@ indicator_object_finalize (GObject *object) IndicatorObject * indicator_object_new_from_file (const gchar * file) { - return NULL; + g_return_val_if_fail(file != NULL, NULL); + + GModule * module = g_module_open(file, + G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); + g_return_val_if_fail(module != NULL, NULL); + + get_version_t lget_version = NULL; + g_return_val_if_fail(g_module_symbol(module, INDICATOR_GET_VERSION_S, (gpointer *)(&lget_version)), FALSE); + if (!INDICATOR_VERSION_CHECK(lget_version())) { + g_warning("Indicator using API version '%s' we're expecting '%s'", lget_version(), INDICATOR_VERSION); + return NULL; + } + + GObject * object = g_object_new(INDICATOR_OBJECT_TYPE, NULL); + IndicatorObjectPrivate * priv = INDICATOR_OBJECT_GET_PRIVATE(object); + + get_label_t lget_label = NULL; + g_return_val_if_fail(g_module_symbol(module, INDICATOR_GET_LABEL_S, (gpointer *)(&lget_label)), FALSE); + g_return_val_if_fail(lget_label != NULL, FALSE); + priv->label = lget_label(); + + get_icon_t lget_icon = NULL; + g_return_val_if_fail(g_module_symbol(module, INDICATOR_GET_ICON_S, (gpointer *)(&lget_icon)), FALSE); + g_return_val_if_fail(lget_icon != NULL, FALSE); + priv->icon = lget_icon(); + + get_menu_t lget_menu = NULL; + g_return_val_if_fail(g_module_symbol(module, INDICATOR_GET_MENU_S, (gpointer *)(&lget_menu)), FALSE); + g_return_val_if_fail(lget_menu != NULL, FALSE); + priv->menu = lget_menu(); + + if (priv->label == NULL && priv->icon == NULL) { + /* This is the case where there is nothing to display, + kinda odd that we'd have a module with nothing. */ + g_warning("No label or icon. Odd."); + g_object_unref(object); + return NULL; + } + + return INDICATOR_OBJECT(object); } -- cgit v1.2.3 From bece9de31705d57c83822ce3ece6dd24f92b9283 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 18:43:10 -0400 Subject: Making it so that we're not using g_return_if_fail as it messes up the test suite. --- libindicator/indicator-object.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c index afeaf19..06ca48f 100644 --- a/libindicator/indicator-object.c +++ b/libindicator/indicator-object.c @@ -83,14 +83,20 @@ indicator_object_finalize (GObject *object) IndicatorObject * indicator_object_new_from_file (const gchar * file) { - g_return_val_if_fail(file != NULL, NULL); + if (file != NULL) + return NULL; GModule * module = g_module_open(file, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); - g_return_val_if_fail(module != NULL, NULL); + if(module != NULL) { + g_warning("Unable to load module: %s", file); + return NULL; + } get_version_t lget_version = NULL; - g_return_val_if_fail(g_module_symbol(module, INDICATOR_GET_VERSION_S, (gpointer *)(&lget_version)), FALSE); + if (!g_module_symbol(module, INDICATOR_GET_VERSION_S, (gpointer *)(&lget_version))) + return NULL; + if (!INDICATOR_VERSION_CHECK(lget_version())) { g_warning("Indicator using API version '%s' we're expecting '%s'", lget_version(), INDICATOR_VERSION); return NULL; -- cgit v1.2.3 From 376658695b00a0d272b9463722a9d7914a7d7ffc Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 18:48:59 -0400 Subject: Build dir fix and making gtester run all of them even if one fails. --- tests/Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 52cc224..2048a9a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -14,7 +14,8 @@ test_loader_SOURCES = \ test_loader_CFLAGS = \ -Wall -Werror \ - $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) + $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) \ + -DBUILD_DIR="\"$(builddir)\"" test_loader_LDADD = \ $(LIBINDICATOR_LIBS) $(top_builddir)/libindicator/.libs/libindicator.a @@ -45,7 +46,7 @@ XML_REPORT = loader-check-results.xml HTML_REPORT = loader-check-results.html loader-tester: test-loader libdummy-indicator-null.la - @gtester -o=$(XML_REPORT) ./test-loader + @gtester -k -o=$(XML_REPORT) ./test-loader check-local: loader-tester -- cgit v1.2.3 From 3bafca747c5c9a1508bc93fdcf9efa77af99710b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 18:49:08 -0400 Subject: Use the new build dir flag --- tests/test-loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test-loader.c b/tests/test-loader.c index 3e94981..16c0292 100644 --- a/tests/test-loader.c +++ b/tests/test-loader.c @@ -6,7 +6,7 @@ void destroy_cb (gpointer data, GObject * object); void test_loader_filename_dummy_null (void) { - IndicatorObject * object = indicator_object_new_from_file("./.libs/libdummy-indicator-null.so"); + IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/.libs/libdummy-indicator-null.so"); g_assert(object != NULL); gboolean unreffed = FALSE; -- cgit v1.2.3 From a65694f2fc7c4c3aa4b955f101617278e4f1c9b4 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 19:04:51 -0400 Subject: Turning all the return if fails into proper if's with warning and unref the object so there aren't any memory leaks. --- libindicator/indicator-object.c | 48 ++++++++++++++++++++++++++++++++++------- 1 file changed, 40 insertions(+), 8 deletions(-) diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c index 06ca48f..d7f18d3 100644 --- a/libindicator/indicator-object.c +++ b/libindicator/indicator-object.c @@ -83,8 +83,10 @@ indicator_object_finalize (GObject *object) IndicatorObject * indicator_object_new_from_file (const gchar * file) { - if (file != NULL) + if (file != NULL) { + g_warning("Invalid filename."); return NULL; + } GModule * module = g_module_open(file, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); @@ -94,8 +96,10 @@ indicator_object_new_from_file (const gchar * file) } get_version_t lget_version = NULL; - if (!g_module_symbol(module, INDICATOR_GET_VERSION_S, (gpointer *)(&lget_version))) + if (!g_module_symbol(module, INDICATOR_GET_VERSION_S, (gpointer *)(&lget_version))) { + g_warning("Unable to get the symbol for getting the version."); return NULL; + } if (!INDICATOR_VERSION_CHECK(lget_version())) { g_warning("Indicator using API version '%s' we're expecting '%s'", lget_version(), INDICATOR_VERSION); @@ -105,19 +109,43 @@ indicator_object_new_from_file (const gchar * file) GObject * object = g_object_new(INDICATOR_OBJECT_TYPE, NULL); IndicatorObjectPrivate * priv = INDICATOR_OBJECT_GET_PRIVATE(object); + /* The function for grabbing a label from the module + execute it, and make sure everything is a-okay */ get_label_t lget_label = NULL; - g_return_val_if_fail(g_module_symbol(module, INDICATOR_GET_LABEL_S, (gpointer *)(&lget_label)), FALSE); - g_return_val_if_fail(lget_label != NULL, FALSE); + if (!g_module_symbol(module, INDICATOR_GET_LABEL_S, (gpointer *)(&lget_label))) { + g_warning("Unable to get '" INDICATOR_GET_LABEL_S "' symbol from module: %s", file); + goto unrefandout; + } + if (lget_label == NULL) { + g_warning("Symbol '" INDICATOR_GET_LABEL_S "' is (null) in module: %s", file); + goto unrefandout; + } priv->label = lget_label(); + /* The function for grabbing an icon from the module + execute it, and make sure everything is a-okay */ get_icon_t lget_icon = NULL; - g_return_val_if_fail(g_module_symbol(module, INDICATOR_GET_ICON_S, (gpointer *)(&lget_icon)), FALSE); - g_return_val_if_fail(lget_icon != NULL, FALSE); + if (!g_module_symbol(module, INDICATOR_GET_ICON_S, (gpointer *)(&lget_icon))) { + g_warning("Unable to get '" INDICATOR_GET_ICON_S "' symbol from module: %s", file); + goto unrefandout; + } + if (lget_icon == NULL) { + g_warning("Symbol '" INDICATOR_GET_ICON_S "' is (null) in module: %s", file); + goto unrefandout; + } priv->icon = lget_icon(); + /* The function for grabbing a menu from the module + execute it, and make sure everything is a-okay */ get_menu_t lget_menu = NULL; - g_return_val_if_fail(g_module_symbol(module, INDICATOR_GET_MENU_S, (gpointer *)(&lget_menu)), FALSE); - g_return_val_if_fail(lget_menu != NULL, FALSE); + if (!g_module_symbol(module, INDICATOR_GET_MENU_S, (gpointer *)(&lget_menu))) { + g_warning("Unable to get '" INDICATOR_GET_MENU_S "' symbol from module: %s", file); + goto unrefandout; + } + if (lget_menu == NULL) { + g_warning("Symbol '" INDICATOR_GET_MENU_S "' is (null) in module: %s", file); + goto unrefandout; + } priv->menu = lget_menu(); if (priv->label == NULL && priv->icon == NULL) { @@ -129,4 +157,8 @@ indicator_object_new_from_file (const gchar * file) } return INDICATOR_OBJECT(object); + +unrefandout: + g_object_unref(object); + return NULL; } -- cgit v1.2.3 From 18f63963ad625504956f753677927bda0e83d0dc Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 19:07:03 -0400 Subject: Truth. Sucks. --- libindicator/indicator-object.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c index d7f18d3..7188a07 100644 --- a/libindicator/indicator-object.c +++ b/libindicator/indicator-object.c @@ -83,7 +83,7 @@ indicator_object_finalize (GObject *object) IndicatorObject * indicator_object_new_from_file (const gchar * file) { - if (file != NULL) { + if (file == NULL) { g_warning("Invalid filename."); return NULL; } -- cgit v1.2.3 From b2942d9cc8631275fe8abdc53bd518b5b9f9ffcc Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 19:12:47 -0400 Subject: Checking to see if a file exists before trying to load it. --- libindicator/indicator-object.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c index 7188a07..9fc439e 100644 --- a/libindicator/indicator-object.c +++ b/libindicator/indicator-object.c @@ -88,6 +88,11 @@ indicator_object_new_from_file (const gchar * file) return NULL; } + if (!g_file_test(file, G_FILE_TEST_EXISTS)) { + g_warning("File '%s' does not exist.", file); + return NULL; + } + GModule * module = g_module_open(file, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); if(module != NULL) { -- cgit v1.2.3 From 4ea28685563e8f7267ca75c28541582b4f3e544b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 19:17:15 -0400 Subject: Truth again. Keeps bitting back. I shouldn't of lied in the 2nd grade, I confess! No more, please. --- libindicator/indicator-object.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c index 9fc439e..a70a3ec 100644 --- a/libindicator/indicator-object.c +++ b/libindicator/indicator-object.c @@ -95,7 +95,7 @@ indicator_object_new_from_file (const gchar * file) GModule * module = g_module_open(file, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); - if(module != NULL) { + if(module == NULL) { g_warning("Unable to load module: %s", file); return NULL; } -- cgit v1.2.3 From 66b0d1beb9907963f35dd36ccf3e193eb641f694 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 19:48:44 -0400 Subject: Making it so that we use the same unref code as everyone else. --- libindicator/indicator-object.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c index a70a3ec..6a638ec 100644 --- a/libindicator/indicator-object.c +++ b/libindicator/indicator-object.c @@ -157,8 +157,7 @@ indicator_object_new_from_file (const gchar * file) /* This is the case where there is nothing to display, kinda odd that we'd have a module with nothing. */ g_warning("No label or icon. Odd."); - g_object_unref(object); - return NULL; + goto unrefandout; } return INDICATOR_OBJECT(object); -- cgit v1.2.3 From 56450cfd530c876adc4ad33b1a5ab53a6a6078fa Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 19:49:23 -0400 Subject: Making it so that the null test checks for failure as we shoudln't have a null image and label. Also making it so that warnings don't cause the test to fail. --- tests/test-loader.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/tests/test-loader.c b/tests/test-loader.c index 16c0292..3dcc595 100644 --- a/tests/test-loader.c +++ b/tests/test-loader.c @@ -4,9 +4,9 @@ void destroy_cb (gpointer data, GObject * object); void -test_loader_filename_dummy_null (void) +test_loader_filename_dummy_simple (void) { - IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/.libs/libdummy-indicator-null.so"); + IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/.libs/libdummy-indicator-simple.so"); g_assert(object != NULL); gboolean unreffed = FALSE; @@ -18,6 +18,14 @@ test_loader_filename_dummy_null (void) return; } +void +test_loader_filename_dummy_null (void) +{ + IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/.libs/libdummy-indicator-null.so"); + g_assert(object == NULL); + return; +} + void test_loader_filename_bad (void) { @@ -68,5 +76,7 @@ main (int argc, char ** argv) test_loader_creation_deletion_suite(); + g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL); + return g_test_run(); } -- cgit v1.2.3 From a28e917b914b07de67027c97eb29d533e3fe9393 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 19:50:40 -0400 Subject: Being a bit more verbose --- tests/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 2048a9a..461bb51 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -46,7 +46,7 @@ XML_REPORT = loader-check-results.xml HTML_REPORT = loader-check-results.html loader-tester: test-loader libdummy-indicator-null.la - @gtester -k -o=$(XML_REPORT) ./test-loader + @gtester -k --verbose -o=$(XML_REPORT) ./test-loader check-local: loader-tester -- cgit v1.2.3 From 97a4004d26cd5ebec0b25b51d4793d1df51b5dba Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 20:12:48 -0400 Subject: Create a very simple indicator and testing it. --- .bzrignore | 2 ++ tests/Makefile.am | 25 ++++++++++++++++++++++--- tests/dummy-indicator-simple.c | 23 +++++++++++++++++++++++ tests/test-loader.c | 1 + 4 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 tests/dummy-indicator-simple.c diff --git a/.bzrignore b/.bzrignore index 24efd20..6a346c8 100644 --- a/.bzrignore +++ b/.bzrignore @@ -111,3 +111,5 @@ tests/loader-check-results.html tests/test-loader tests/libdummy-indicator-null.la tests/libdummy_indicator_null_la-dummy-indicator-null.lo +tests/libdummy-indicator-simple.la +tests/libdummy_indicator_simple_la-dummy-indicator-simple.lo diff --git a/tests/Makefile.am b/tests/Makefile.am index 461bb51..c21ff09 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -3,7 +3,8 @@ check_PROGRAMS = \ test-loader lib_LTLIBRARIES = \ - libdummy-indicator-null.la + libdummy-indicator-null.la \ + libdummy-indicator-simple.la ############################# # Test Loader @@ -21,7 +22,7 @@ test_loader_LDADD = \ $(LIBINDICATOR_LIBS) $(top_builddir)/libindicator/.libs/libindicator.a ############################# -# Dummy Indicator +# Dummy Indicator NULL ############################# libdummy_indicator_null_la_SOURCES = \ @@ -38,6 +39,24 @@ libdummy_indicator_null_la_LDFLAGS = \ -module \ -avoid-version +############################# +# Dummy Indicator Simple +############################# + +libdummy_indicator_simple_la_SOURCES = \ + dummy-indicator-simple.c + +libdummy_indicator_simple_la_CFLAGS = \ + -Wall -Werror \ + $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) + +libdummy_indicator_simple_la_LIBADD = \ + $(LIBINDICATOR_LIBS) + +libdummy_indicator_simple_la_LDFLAGS = \ + -module \ + -avoid-version + ############################# # Test stuff ############################# @@ -45,7 +64,7 @@ libdummy_indicator_null_la_LDFLAGS = \ XML_REPORT = loader-check-results.xml HTML_REPORT = loader-check-results.html -loader-tester: test-loader libdummy-indicator-null.la +loader-tester: test-loader libdummy-indicator-null.la libdummy-indicator-simple.la @gtester -k --verbose -o=$(XML_REPORT) ./test-loader check-local: loader-tester diff --git a/tests/dummy-indicator-simple.c b/tests/dummy-indicator-simple.c new file mode 100644 index 0000000..d939141 --- /dev/null +++ b/tests/dummy-indicator-simple.c @@ -0,0 +1,23 @@ + +#include "libindicator/indicator.h" + +INDICATOR_SET_VERSION +INDICATOR_SET_NAME("dummy-indicator-simple") + +GtkLabel * +get_label (void) +{ + return GTK_LABEL(gtk_label_new("Simple Item")); +} + +GtkImage * +get_icon (void) +{ + return GTK_IMAGE(gtk_image_new()); +} + +GtkMenu * +get_menu (void) +{ + return GTK_MENU(gtk_menu_new()); +} diff --git a/tests/test-loader.c b/tests/test-loader.c index 3dcc595..1d6a7c3 100644 --- a/tests/test-loader.c +++ b/tests/test-loader.c @@ -63,6 +63,7 @@ test_loader_creation_deletion_suite (void) g_test_add_func ("/libindicator/loader/ref_and_unref", test_loader_refunref); g_test_add_func ("/libindicator/loader/filename_bad", test_loader_filename_bad); g_test_add_func ("/libindicator/loader/dummy/null_load", test_loader_filename_dummy_null); + g_test_add_func ("/libindicator/loader/dummy/simple_load", test_loader_filename_dummy_simple); return; } -- cgit v1.2.3 From 9c16e7c9708c757c46be1e96d58ab6430d729b0a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 20:17:04 -0400 Subject: A better dummy menu. --- tests/dummy-indicator-simple.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/dummy-indicator-simple.c b/tests/dummy-indicator-simple.c index d939141..cee4eac 100644 --- a/tests/dummy-indicator-simple.c +++ b/tests/dummy-indicator-simple.c @@ -19,5 +19,10 @@ get_icon (void) GtkMenu * get_menu (void) { - return GTK_MENU(gtk_menu_new()); + GtkMenu * main_menu = GTK_MENU(gtk_menu_new()); + GtkWidget * loading_item = gtk_menu_item_new_with_label("Loading..."); + gtk_menu_shell_append(GTK_MENU_SHELL(main_menu), loading_item); + gtk_widget_show(GTK_WIDGET(loading_item)); + + return main_menu; } -- cgit v1.2.3 From 32fc4b833fd948270eaa16f33d5b80eafef6f281 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 20:18:20 -0400 Subject: We need to use GTK. --- tests/test-loader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/test-loader.c b/tests/test-loader.c index 1d6a7c3..0409a6f 100644 --- a/tests/test-loader.c +++ b/tests/test-loader.c @@ -1,4 +1,4 @@ -#include +#include #include "libindicator/indicator-object.h" void destroy_cb (gpointer data, GObject * object); @@ -74,6 +74,7 @@ main (int argc, char ** argv) { g_type_init (); g_test_init (&argc, &argv, NULL); + gtk_init(&argc, &argv); test_loader_creation_deletion_suite(); -- cgit v1.2.3 From fda24e437ad0664e7287237e5bcffcbe15faade4 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 20:22:59 -0400 Subject: Maintaining a reference to the objects we create in the object. --- libindicator/indicator-object.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c index 6a638ec..71e72d8 100644 --- a/libindicator/indicator-object.c +++ b/libindicator/indicator-object.c @@ -126,6 +126,9 @@ indicator_object_new_from_file (const gchar * file) goto unrefandout; } priv->label = lget_label(); + if (priv->label) { + g_object_ref(G_OBJECT(priv->label)); + } /* The function for grabbing an icon from the module execute it, and make sure everything is a-okay */ @@ -139,6 +142,9 @@ indicator_object_new_from_file (const gchar * file) goto unrefandout; } priv->icon = lget_icon(); + if (priv->icon) { + g_object_ref(G_OBJECT(priv->icon)); + } /* The function for grabbing a menu from the module execute it, and make sure everything is a-okay */ @@ -152,6 +158,9 @@ indicator_object_new_from_file (const gchar * file) goto unrefandout; } priv->menu = lget_menu(); + if (priv->menu) { + g_object_ref(G_OBJECT(priv->menu)); + } if (priv->label == NULL && priv->icon == NULL) { /* This is the case where there is nothing to display, -- cgit v1.2.3 From 5144944dbe90e1eaf65bfeedbd6057b858880abc Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 20:47:19 -0400 Subject: Adding some accessor functions for the various GTK objects. --- libindicator/indicator-object.c | 24 ++++++++++++++++++++++++ libindicator/indicator-object.h | 4 ++++ 2 files changed, 28 insertions(+) diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c index 71e72d8..38847dd 100644 --- a/libindicator/indicator-object.c +++ b/libindicator/indicator-object.c @@ -175,3 +175,27 @@ unrefandout: g_object_unref(object); return NULL; } + +GtkLabel * +indicator_object_get_label (IndicatorObject * io) +{ + g_return_val_if_fail(IS_INDICATOR_OBJECT(io), NULL); + IndicatorObjectPrivate * priv = INDICATOR_OBJECT_GET_PRIVATE(io); + return priv->label; +} + +GtkImage * +indicator_object_get_icon (IndicatorObject * io) +{ + g_return_val_if_fail(IS_INDICATOR_OBJECT(io), NULL); + IndicatorObjectPrivate * priv = INDICATOR_OBJECT_GET_PRIVATE(io); + return priv->icon; +} + +GtkMenu * +indicator_object_get_menu (IndicatorObject * io) +{ + g_return_val_if_fail(IS_INDICATOR_OBJECT(io), NULL); + IndicatorObjectPrivate * priv = INDICATOR_OBJECT_GET_PRIVATE(io); + return priv->menu; +} diff --git a/libindicator/indicator-object.h b/libindicator/indicator-object.h index fd7f470..d06355b 100644 --- a/libindicator/indicator-object.h +++ b/libindicator/indicator-object.h @@ -29,6 +29,10 @@ struct _IndicatorObject { GType indicator_object_get_type (void); IndicatorObject * indicator_object_new_from_file (const gchar * file); +GtkLabel * indicator_object_get_label (IndicatorObject * io); +GtkImage * indicator_object_get_icon (IndicatorObject * io); +GtkMenu * indicator_object_get_menu (IndicatorObject * io); + G_END_DECLS #endif -- cgit v1.2.3 From bb7b49ae82deb1f551ec8892511e4a19c881f6cc Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 21:03:30 -0400 Subject: Testing the accessors --- tests/test-loader.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tests/test-loader.c b/tests/test-loader.c index 0409a6f..ecbf502 100644 --- a/tests/test-loader.c +++ b/tests/test-loader.c @@ -3,6 +3,21 @@ void destroy_cb (gpointer data, GObject * object); +void +test_loader_filename_dummy_simple_accessors (void) +{ + IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/.libs/libdummy-indicator-simple.so"); + g_assert(object != NULL); + + g_assert(indicator_object_get_label(object) != NULL); + g_assert(indicator_object_get_menu(object) != NULL); + g_assert(indicator_object_get_icon(object) != NULL); + + g_object_unref(object); + + return; +} + void test_loader_filename_dummy_simple (void) { @@ -64,6 +79,7 @@ test_loader_creation_deletion_suite (void) g_test_add_func ("/libindicator/loader/filename_bad", test_loader_filename_bad); g_test_add_func ("/libindicator/loader/dummy/null_load", test_loader_filename_dummy_null); g_test_add_func ("/libindicator/loader/dummy/simple_load", test_loader_filename_dummy_simple); + g_test_add_func ("/libindicator/loader/dummy/simple_accessors", test_loader_filename_dummy_simple_accessors); return; } -- cgit v1.2.3 From a2f4f868e8744fd6aea1ffb0b335e70c54e039ea Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sun, 11 Oct 2009 21:49:22 -0500 Subject: Building a new dummy indicator that doesn't have any symbols in it. --- .bzrignore | 2 ++ tests/Makefile.am | 19 +++++++++++++++++++ tests/dummy-indicator-blank.c | 6 ++++++ 3 files changed, 27 insertions(+) create mode 100644 tests/dummy-indicator-blank.c diff --git a/.bzrignore b/.bzrignore index 6a346c8..52613e0 100644 --- a/.bzrignore +++ b/.bzrignore @@ -113,3 +113,5 @@ tests/libdummy-indicator-null.la tests/libdummy_indicator_null_la-dummy-indicator-null.lo tests/libdummy-indicator-simple.la tests/libdummy_indicator_simple_la-dummy-indicator-simple.lo +tests/libdummy-indicator-blank.la +tests/libdummy_indicator_blank_la-dummy-indicator-blank.lo diff --git a/tests/Makefile.am b/tests/Makefile.am index c21ff09..8121136 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -3,6 +3,7 @@ check_PROGRAMS = \ test-loader lib_LTLIBRARIES = \ + libdummy-indicator-blank.la \ libdummy-indicator-null.la \ libdummy-indicator-simple.la @@ -21,6 +22,24 @@ test_loader_CFLAGS = \ test_loader_LDADD = \ $(LIBINDICATOR_LIBS) $(top_builddir)/libindicator/.libs/libindicator.a +############################# +# Dummy Indicator Blank +############################# + +libdummy_indicator_blank_la_SOURCES = \ + dummy-indicator-blank.c + +libdummy_indicator_blank_la_CFLAGS = \ + -Wall -Werror \ + $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) + +libdummy_indicator_blank_la_LIBADD = \ + $(LIBINDICATOR_LIBS) + +libdummy_indicator_blank_la_LDFLAGS = \ + -module \ + -avoid-version + ############################# # Dummy Indicator NULL ############################# diff --git a/tests/dummy-indicator-blank.c b/tests/dummy-indicator-blank.c new file mode 100644 index 0000000..41249f2 --- /dev/null +++ b/tests/dummy-indicator-blank.c @@ -0,0 +1,6 @@ + +#include "libindicator/indicator.h" + +INDICATOR_SET_VERSION +INDICATOR_SET_NAME("dummy-indicator-null") + -- cgit v1.2.3 From ccc7f82c202d8f0691fbbfbdd36d08624ae44e0c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sun, 11 Oct 2009 21:50:46 -0500 Subject: using the blank dummy indicator --- tests/test-loader.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/test-loader.c b/tests/test-loader.c index ecbf502..4b2b096 100644 --- a/tests/test-loader.c +++ b/tests/test-loader.c @@ -33,6 +33,14 @@ test_loader_filename_dummy_simple (void) return; } +void +test_loader_filename_dummy_blank (void) +{ + IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/.libs/libdummy-indicator-blank.so"); + g_assert(object == NULL); + return; +} + void test_loader_filename_dummy_null (void) { @@ -78,6 +86,7 @@ test_loader_creation_deletion_suite (void) g_test_add_func ("/libindicator/loader/ref_and_unref", test_loader_refunref); g_test_add_func ("/libindicator/loader/filename_bad", test_loader_filename_bad); g_test_add_func ("/libindicator/loader/dummy/null_load", test_loader_filename_dummy_null); + g_test_add_func ("/libindicator/loader/dummy/blank_load", test_loader_filename_dummy_null); g_test_add_func ("/libindicator/loader/dummy/simple_load", test_loader_filename_dummy_simple); g_test_add_func ("/libindicator/loader/dummy/simple_accessors", test_loader_filename_dummy_simple_accessors); -- cgit v1.2.3 From 0b18e53f290d8c536f42ce2ee7d0c905e95e27f2 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sun, 11 Oct 2009 22:05:28 -0500 Subject: Making a tools directory --- Makefile.am | 3 ++- configure.ac | 1 + tools/Makefile.am | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 tools/Makefile.am diff --git a/Makefile.am b/Makefile.am index f0211b0..8894e24 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,8 @@ SUBDIRS = \ libindicator \ - tests + tests \ + tools DISTCLEANFILES = \ libindicator-*.tar.gz diff --git a/configure.ac b/configure.ac index 51706ef..fe4aec5 100644 --- a/configure.ac +++ b/configure.ac @@ -87,6 +87,7 @@ Makefile libindicator/Makefile libindicator/indicator.pc tests/Makefile +tools/Makefile ]) ########################### diff --git a/tools/Makefile.am b/tools/Makefile.am new file mode 100644 index 0000000..9de44fc --- /dev/null +++ b/tools/Makefile.am @@ -0,0 +1 @@ +#Something -- cgit v1.2.3 From 7cc9b8f4e41087d11dfec4d55dd80b7e3c865bcc Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sun, 11 Oct 2009 22:06:46 -0500 Subject: Adding the terballs into ignore --- .bzrignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.bzrignore b/.bzrignore index 52613e0..e81c2cd 100644 --- a/.bzrignore +++ b/.bzrignore @@ -115,3 +115,5 @@ tests/libdummy-indicator-simple.la tests/libdummy_indicator_simple_la-dummy-indicator-simple.lo tests/libdummy-indicator-blank.la tests/libdummy_indicator_blank_la-dummy-indicator-blank.lo +libindicator-[0-9].[0-9].[0-9].tar.gz +libindicator-[0-9].[0-9].[0-9].tar.gz.asc -- cgit v1.2.3 From f28c65a127b070d5ad6f78b1b4a77b43557aadb9 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 14 Oct 2009 09:08:40 -0500 Subject: Adding in check for valgrind that we'll need for the test tools. --- configure.ac | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/configure.ac b/configure.ac index fe4aec5..586807e 100644 --- a/configure.ac +++ b/configure.ac @@ -33,6 +33,16 @@ PKG_CHECK_MODULES(LIBINDICATOR, gtk+-2.0 >= $GTK_REQUIRED_VERSION AC_SUBST(LIBINDICATOR_CFLAGS) AC_SUBST(LIBINDICATOR_LIBS) +############################## +# Valgrind +############################## + +PKG_CHECK_MODULES(VALGRIND, valgrind) + +AC_SUBST(VALGRIND_CFLAGS) +AC_SUBST(VALGRIND_LIBS) + + ############################## # Custom Junk ############################## -- cgit v1.2.3 From a8b1436ded0d74d44a414b0ab3df9334e24eb426 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 28 Oct 2009 16:37:49 -0500 Subject: Adding in comments. --- libindicator/indicator-object.c | 66 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c index 38847dd..e80c1d5 100644 --- a/libindicator/indicator-object.c +++ b/libindicator/indicator-object.c @@ -6,6 +6,14 @@ #include "indicator.h" #include "indicator-object.h" +/** + IndicatorObjectPrivate: + @label: The label representing this indicator or #NULL if none. + @icon: The icon representing this indicator or #NULL if none. + @menu: The menu representing this indicator or #NULL if none. + + Private data for the object. +*/ typedef struct _IndicatorObjectPrivate IndicatorObjectPrivate; struct _IndicatorObjectPrivate { GtkLabel * label; @@ -23,6 +31,8 @@ static void indicator_object_finalize (GObject *object); G_DEFINE_TYPE (IndicatorObject, indicator_object, G_TYPE_OBJECT); +/* Setup the class and put the functions into the + class structure */ static void indicator_object_class_init (IndicatorObjectClass *klass) { @@ -36,6 +46,7 @@ indicator_object_class_init (IndicatorObjectClass *klass) return; } +/* Inititalize an instance */ static void indicator_object_init (IndicatorObject *self) { @@ -48,6 +59,7 @@ indicator_object_init (IndicatorObject *self) return; } +/* Unref the objects that we're holding on to. */ static void indicator_object_dispose (GObject *object) { @@ -72,6 +84,7 @@ indicator_object_dispose (GObject *object) return; } +/* Free memory */ static void indicator_object_finalize (GObject *object) { @@ -80,9 +93,22 @@ indicator_object_finalize (GObject *object) return; } +/** + indicator_object_new_from_file: + @file: Filename containing a loadable module + + This function builds an #IndicatorObject using the symbols + that are found in @file. The module is loaded and the + references are all kept by the object. To unload the + module the object must be destroyed. + + Return value: A valid #IndicatorObject or #NULL if error. +*/ IndicatorObject * indicator_object_new_from_file (const gchar * file) { + /* Check to make sure the name exists and that the + file itself exists */ if (file == NULL) { g_warning("Invalid filename."); return NULL; @@ -93,6 +119,8 @@ indicator_object_new_from_file (const gchar * file) return NULL; } + /* Grab the g_module reference, pull it in but let's + keep the symbols local to avoid conflicts. */ GModule * module = g_module_open(file, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); if(module == NULL) { @@ -100,17 +128,23 @@ indicator_object_new_from_file (const gchar * file) return NULL; } + /* Look for the version function, error if not found. */ get_version_t lget_version = NULL; if (!g_module_symbol(module, INDICATOR_GET_VERSION_S, (gpointer *)(&lget_version))) { g_warning("Unable to get the symbol for getting the version."); return NULL; } + /* Check the version with the macro and make sure we're + all talking the same language. */ if (!INDICATOR_VERSION_CHECK(lget_version())) { g_warning("Indicator using API version '%s' we're expecting '%s'", lget_version(), INDICATOR_VERSION); return NULL; } + /* A this point we allocate the object, any code beyond + here needs to deallocate it if we're returning in an + error'd state. */ GObject * object = g_object_new(INDICATOR_OBJECT_TYPE, NULL); IndicatorObjectPrivate * priv = INDICATOR_OBJECT_GET_PRIVATE(object); @@ -171,11 +205,23 @@ indicator_object_new_from_file (const gchar * file) return INDICATOR_OBJECT(object); + /* Error, let's drop the object and return NULL. Sad when + this happens. */ unrefandout: g_object_unref(object); return NULL; } +/** + indicator_object_get_label: + @io: An #IndicatorObject. + + A function to get the label for a particular object. This + function does not increase the refcount. That's your job + if you want to do it. + + Return value: A #GtkLabel or #NULL if unavailable. +*/ GtkLabel * indicator_object_get_label (IndicatorObject * io) { @@ -184,6 +230,16 @@ indicator_object_get_label (IndicatorObject * io) return priv->label; } +/** + indicator_object_get_icon: + @io: An #IndicatorObject. + + A function to get the icon for a particular object. This + function does not increase the refcount. That's your job + if you want to do it. + + Return value: A #GtkImage or #NULL if unavailable. +*/ GtkImage * indicator_object_get_icon (IndicatorObject * io) { @@ -192,6 +248,16 @@ indicator_object_get_icon (IndicatorObject * io) return priv->icon; } +/** + indicator_object_get_menu: + @io: An #IndicatorObject. + + A function to get the menu for a particular object. This + function does not increase the refcount. That's your job + if you want to do it. + + Return value: A #GtkMenu or #NULL if unavailable. +*/ GtkMenu * indicator_object_get_menu (IndicatorObject * io) { -- cgit v1.2.3 From 755adf0afbb0b0478f6c9f3534f04f21bcdea910 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 28 Oct 2009 16:41:34 -0500 Subject: Oh, legal headers. Fun, fun. --- libindicator/indicator-object.c | 21 +++++++++++++++++++++ libindicator/indicator-object.h | 22 ++++++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c index e80c1d5..5921ce5 100644 --- a/libindicator/indicator-object.c +++ b/libindicator/indicator-object.c @@ -1,3 +1,24 @@ +/* +An interface for indicators to link to for creation. + +Copyright 2009 Canonical Ltd. + +Authors: + Ted Gould + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +version 3.0 as published by the Free Software Foundation. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License version 3.0 for more details. + +You should have received a copy of the GNU General Public +License along with this library. If not, see +. +*/ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/libindicator/indicator-object.h b/libindicator/indicator-object.h index d06355b..cb01b85 100644 --- a/libindicator/indicator-object.h +++ b/libindicator/indicator-object.h @@ -1,3 +1,25 @@ +/* +An interface for indicators to link to for creation. + +Copyright 2009 Canonical Ltd. + +Authors: + Ted Gould + +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +version 3.0 as published by the Free Software Foundation. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License version 3.0 for more details. + +You should have received a copy of the GNU General Public +License along with this library. If not, see +. +*/ + #ifndef __INDICATOR_OBJECT_H__ #define __INDICATOR_OBJECT_H__ -- cgit v1.2.3 From b98a4811a0b03335da1fad3d0e0bce08bdad2a00 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 28 Oct 2009 16:43:19 -0500 Subject: Removing valgrind as I want to clean this branch up and make another for that. --- configure.ac | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/configure.ac b/configure.ac index 586807e..fe4aec5 100644 --- a/configure.ac +++ b/configure.ac @@ -33,16 +33,6 @@ PKG_CHECK_MODULES(LIBINDICATOR, gtk+-2.0 >= $GTK_REQUIRED_VERSION AC_SUBST(LIBINDICATOR_CFLAGS) AC_SUBST(LIBINDICATOR_LIBS) -############################## -# Valgrind -############################## - -PKG_CHECK_MODULES(VALGRIND, valgrind) - -AC_SUBST(VALGRIND_CFLAGS) -AC_SUBST(VALGRIND_LIBS) - - ############################## # Custom Junk ############################## -- cgit v1.2.3 From 07c7bb1b4870184989d7dd79cc3fcd63338aada2 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 3 Nov 2009 09:31:53 -0600 Subject: Comments in the copyright statements updated. --- libindicator/indicator-object.c | 3 ++- libindicator/indicator-object.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c index 5921ce5..2908ed9 100644 --- a/libindicator/indicator-object.c +++ b/libindicator/indicator-object.c @@ -1,5 +1,6 @@ /* -An interface for indicators to link to for creation. +An object to represent loadable indicator modules to make loading +them easy and objectified. Copyright 2009 Canonical Ltd. diff --git a/libindicator/indicator-object.h b/libindicator/indicator-object.h index cb01b85..fa6373d 100644 --- a/libindicator/indicator-object.h +++ b/libindicator/indicator-object.h @@ -1,5 +1,6 @@ /* -An interface for indicators to link to for creation. +An object to represent loadable indicator modules to make loading +them easy and objectified. Copyright 2009 Canonical Ltd. -- cgit v1.2.3 From b3fc7791fdf7bea9787555b63c33e0b1f67390c4 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 3 Nov 2009 09:34:00 -0600 Subject: Typo --- libindicator/indicator-object.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c index 2908ed9..72cea9d 100644 --- a/libindicator/indicator-object.c +++ b/libindicator/indicator-object.c @@ -68,7 +68,7 @@ indicator_object_class_init (IndicatorObjectClass *klass) return; } -/* Inititalize an instance */ +/* Initialize an instance */ static void indicator_object_init (IndicatorObject *self) { -- cgit v1.2.3 From c09917d4792ccbd9fbd773874ae6e75e73c32a6e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 3 Nov 2009 17:06:39 -0600 Subject: Changing comment on private struct. --- libindicator/indicator-object.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c index 72cea9d..ce07ad6 100644 --- a/libindicator/indicator-object.c +++ b/libindicator/indicator-object.c @@ -34,7 +34,8 @@ License along with this library. If not, see @icon: The icon representing this indicator or #NULL if none. @menu: The menu representing this indicator or #NULL if none. - Private data for the object. + Structure to define the memory for the private area + of the object instance. */ typedef struct _IndicatorObjectPrivate IndicatorObjectPrivate; struct _IndicatorObjectPrivate { -- cgit v1.2.3