From b8b206c6e84757c6d4d36cec619a1e7c37d1eb5f Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Wed, 10 Feb 2021 13:06:05 +0100 Subject: Move source files to src --- tests/Makefile.am | 42 +-- tests/dummy-indicator-blank.c | 2 +- tests/dummy-indicator-entry-func.h | 14 +- tests/dummy-indicator-null.c | 44 +-- tests/dummy-indicator-signaler.c | 90 ++--- tests/dummy-indicator-simple.c | 52 +-- tests/dummy-indicator-visible.c | 68 ++-- tests/service-manager-connect-service.c | 2 +- tests/service-manager-connect.c | 2 +- tests/service-manager-no-connect.c | 2 +- tests/service-manager-nostart-connect.c | 2 +- tests/service-shutdown-timeout.c | 2 +- tests/service-version-bad-service.c | 2 +- tests/service-version-good-service.c | 2 +- tests/service-version-manager.c | 2 +- .../service-version-multiwatch-manager-impolite.c | 2 +- tests/service-version-multiwatch-manager.c | 2 +- tests/service-version-multiwatch-service.c | 2 +- tests/test-desktop-shortcuts.c | 2 +- tests/test-indicator-ng.c | 2 +- tests/test-loader.c | 380 ++++++++++----------- 21 files changed, 359 insertions(+), 359 deletions(-) (limited to 'tests') diff --git a/tests/Makefile.am b/tests/Makefile.am index 100eb16..476de28 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -9,7 +9,7 @@ TESTS = DISTCLEANFILES = XFAIL_TESTS = -check_PROGRAMS = +check_PROGRAMS = lib_LTLIBRARIES = \ libdummy-indicator-blank.la \ @@ -46,7 +46,7 @@ test_loader_CFLAGS = \ test_loader_LDADD = \ $(LIBINDICATOR_LIBS) \ - -L$(top_builddir)/libayatana-indicator/.libs \ + -L$(top_builddir)/src/.libs \ $(INDICATOR_LIB) ############################# @@ -66,7 +66,7 @@ test_desktop_shortcuts_CFLAGS = \ test_desktop_shortcuts_LDADD = \ $(LIBINDICATOR_LIBS) \ - -L$(top_builddir)/libayatana-indicator/.libs \ + -L$(top_builddir)/src/.libs \ $(INDICATOR_LIB) DS_XML_REPORT = desktop-shortcuts-check-results.xml @@ -99,7 +99,7 @@ libdummy_indicator_blank_la_CFLAGS = \ libdummy_indicator_blank_la_LIBADD = \ $(LIBINDICATOR_LIBS) \ - -L$(top_builddir)/libayatana-indicator/.libs \ + -L$(top_builddir)/src/.libs \ $(INDICATOR_LIB) libdummy_indicator_blank_la_LDFLAGS = \ @@ -120,7 +120,7 @@ libdummy_indicator_null_la_CFLAGS = \ libdummy_indicator_null_la_LIBADD = \ $(LIBINDICATOR_LIBS) \ - -L$(top_builddir)/libayatana-indicator/.libs \ + -L$(top_builddir)/src/.libs \ $(INDICATOR_LIB) libdummy_indicator_null_la_LDFLAGS = \ @@ -141,7 +141,7 @@ libdummy_indicator_signaler_la_CFLAGS = \ libdummy_indicator_signaler_la_LIBADD = \ $(LIBINDICATOR_LIBS) \ - -L$(top_builddir)/libayatana-indicator/.libs \ + -L$(top_builddir)/src/.libs \ $(INDICATOR_LIB) libdummy_indicator_signaler_la_LDFLAGS = \ @@ -162,7 +162,7 @@ libdummy_indicator_simple_la_CFLAGS = \ libdummy_indicator_simple_la_LIBADD = \ $(LIBINDICATOR_LIBS) \ - -L$(top_builddir)/libayatana-indicator/.libs \ + -L$(top_builddir)/src/.libs \ $(INDICATOR_LIB) libdummy_indicator_simple_la_LDFLAGS = \ @@ -184,7 +184,7 @@ libdummy_indicator_entry_func_la_CFLAGS = \ libdummy_indicator_entry_func_la_LIBADD = \ $(LIBINDICATOR_LIBS) \ - -L$(top_builddir)/libayatana-indicator/.libs \ + -L$(top_builddir)/src/.libs \ $(INDICATOR_LIB) libdummy_indicator_entry_func_la_LDFLAGS = \ @@ -205,7 +205,7 @@ libdummy_indicator_visible_la_CFLAGS = \ libdummy_indicator_visible_la_LIBADD = \ $(LIBINDICATOR_LIBS) \ - -L$(top_builddir)/libayatana-indicator/.libs \ + -L$(top_builddir)/src/.libs \ $(INDICATOR_LIB) libdummy_indicator_visible_la_LDFLAGS = \ @@ -227,7 +227,7 @@ service_shutdown_timeout_CFLAGS = \ service_shutdown_timeout_LDADD = \ $(LIBINDICATOR_LIBS) \ - -L$(top_builddir)/libayatana-indicator/.libs \ + -L$(top_builddir)/src/.libs \ $(INDICATOR_LIB) service-shutdown-timeout-tester: service-shutdown-timeout Makefile @@ -253,7 +253,7 @@ service_manager_no_connect_CFLAGS = \ service_manager_no_connect_LDADD = \ $(LIBINDICATOR_LIBS) \ - -L$(top_builddir)/libayatana-indicator/.libs \ + -L$(top_builddir)/src/.libs \ $(INDICATOR_LIB) service-manager-no-connect-tester: service-manager-no-connect Makefile.am @@ -285,7 +285,7 @@ service_manager_connect_CFLAGS = \ service_manager_connect_LDADD = \ $(LIBINDICATOR_LIBS) \ - -L$(top_builddir)/libayatana-indicator/.libs \ + -L$(top_builddir)/src/.libs \ $(INDICATOR_LIB) check_PROGRAMS += service-manager-connect-service @@ -299,7 +299,7 @@ service_manager_connect_service_CFLAGS = \ service_manager_connect_service_LDADD = \ $(LIBINDICATOR_LIBS) \ - -L$(top_builddir)/libayatana-indicator/.libs \ + -L$(top_builddir)/src/.libs \ $(INDICATOR_LIB) service-manager-connect-tester: service-manager-connect service-manager-connect-service session.conf service-manager-connect.service Makefile.am @@ -332,7 +332,7 @@ service_version_manager_CFLAGS = \ service_version_manager_LDADD = \ $(LIBINDICATOR_LIBS) \ - -L$(top_builddir)/libayatana-indicator/.libs \ + -L$(top_builddir)/src/.libs \ $(INDICATOR_LIB) check_PROGRAMS += service-version-bad-service @@ -347,7 +347,7 @@ service_version_bad_service_CFLAGS = \ service_version_bad_service_LDADD = \ $(LIBINDICATOR_LIBS) \ - -L$(top_builddir)/libayatana-indicator/.libs \ + -L$(top_builddir)/src/.libs \ $(INDICATOR_LIB) check_PROGRAMS += service-version-good-service @@ -362,7 +362,7 @@ service_version_good_service_CFLAGS = \ service_version_good_service_LDADD = \ $(LIBINDICATOR_LIBS) \ - -L$(top_builddir)/libayatana-indicator/.libs \ + -L$(top_builddir)/src/.libs \ $(INDICATOR_LIB) service-version-tester: service-version-manager service-version-bad-service service-version-good-service session.conf service-version-bad.service service-version-good.service Makefile.am @@ -389,7 +389,7 @@ service_version_multiwatch_manager_CFLAGS = \ service_version_multiwatch_manager_LDADD = \ $(LIBINDICATOR_LIBS) \ - -L$(top_builddir)/libayatana-indicator/.libs \ + -L$(top_builddir)/src/.libs \ $(INDICATOR_LIB) check_PROGRAMS += service-version-multiwatch-manager-impolite @@ -404,7 +404,7 @@ service_version_multiwatch_manager_impolite_CFLAGS = \ service_version_multiwatch_manager_impolite_LDADD = \ $(LIBINDICATOR_LIBS) \ - -L$(top_builddir)/libayatana-indicator/.libs \ + -L$(top_builddir)/src/.libs \ $(INDICATOR_LIB) check_PROGRAMS += service-version-multiwatch-service @@ -419,7 +419,7 @@ service_version_multiwatch_service_CFLAGS = \ service_version_multiwatch_service_LDADD = \ $(LIBINDICATOR_LIBS) \ - -L$(top_builddir)/libayatana-indicator/.libs \ + -L$(top_builddir)/src/.libs \ $(INDICATOR_LIB) service-version-multiwatch-tester: service-version-multiwatch-manager service-version-multiwatch-service service-version-multiwatch-manager-impolite Makefile.am @@ -445,7 +445,7 @@ service_manager_nostart_connect_CFLAGS = \ service_manager_nostart_connect_LDADD = \ $(LIBINDICATOR_LIBS) \ - -L$(top_builddir)/libayatana-indicator/.libs \ + -L$(top_builddir)/src/.libs \ $(INDICATOR_LIB) service-manager-connect-nostart-tester: service-manager-nostart-connect service-manager-connect-service Makefile.am @@ -496,7 +496,7 @@ test_indicator_ng_CFLAGS = \ test_indicator_ng_LDADD = \ $(LIBINDICATOR_LIBS) \ - -L$(top_builddir)/libayatana-indicator/.libs \ + -L$(top_builddir)/src/.libs \ $(INDICATOR_LIB) diff --git a/tests/dummy-indicator-blank.c b/tests/dummy-indicator-blank.c index dcbb99f..b085c52 100644 --- a/tests/dummy-indicator-blank.c +++ b/tests/dummy-indicator-blank.c @@ -21,7 +21,7 @@ License along with this library. If not, see */ -#include "libayatana-indicator/indicator.h" +#include "src/indicator.h" INDICATOR_SET_VERSION diff --git a/tests/dummy-indicator-entry-func.h b/tests/dummy-indicator-entry-func.h index c1fa8d3..b5653c7 100644 --- a/tests/dummy-indicator-entry-func.h +++ b/tests/dummy-indicator-entry-func.h @@ -26,8 +26,8 @@ License along with this library. If not, see #include #include -#include "libayatana-indicator/indicator.h" -#include "libayatana-indicator/indicator-object.h" +#include "src/indicator.h" +#include "src/indicator-object.h" G_BEGIN_DECLS @@ -42,15 +42,15 @@ typedef struct _DummyIndicatorEntryFunc DummyIndicatorEntryFunc; typedef struct _DummyIndicatorEntryFuncClass DummyIndicatorEntryFuncClass; struct _DummyIndicatorEntryFuncClass { - IndicatorObjectClass parent_class; + IndicatorObjectClass parent_class; }; struct _DummyIndicatorEntryFunc { - IndicatorObject parent; + IndicatorObject parent; - gboolean entry_activate_called; - gboolean entry_activate_window_called; - gboolean entry_close_called; + gboolean entry_activate_called; + gboolean entry_activate_window_called; + gboolean entry_close_called; }; #endif /* __DUMMY_INDICATOR_ENTRY_FUNC__ */ diff --git a/tests/dummy-indicator-null.c b/tests/dummy-indicator-null.c index 5eb8716..ee424d4 100644 --- a/tests/dummy-indicator-null.c +++ b/tests/dummy-indicator-null.c @@ -24,8 +24,8 @@ License along with this library. If not, see #include #include -#include "libayatana-indicator/indicator.h" -#include "libayatana-indicator/indicator-object.h" +#include "src/indicator.h" +#include "src/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)) @@ -38,11 +38,11 @@ typedef struct _DummyIndicatorNull DummyIndicatorNull; typedef struct _DummyIndicatorNullClass DummyIndicatorNullClass; struct _DummyIndicatorNullClass { - IndicatorObjectClass parent_class; + IndicatorObjectClass parent_class; }; struct _DummyIndicatorNull { - IndicatorObject parent; + IndicatorObject parent; }; GType dummy_indicator_null_get_type (void); @@ -54,24 +54,24 @@ INDICATOR_SET_TYPE(DUMMY_INDICATOR_NULL_TYPE) GtkLabel * get_label (IndicatorObject * io) { - return NULL; + return NULL; } GtkImage * get_icon (IndicatorObject * io) { - return NULL; + return NULL; } GtkMenu * get_menu (IndicatorObject * io) { - return NULL; + return NULL; } const gchar * get_accessible_desc (IndicatorObject * io) { - return NULL; + return NULL; } static void dummy_indicator_null_class_init (DummyIndicatorNullClass *klass); @@ -84,40 +84,40 @@ 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); + GObjectClass *object_class = G_OBJECT_CLASS (klass); - object_class->dispose = dummy_indicator_null_dispose; - object_class->finalize = dummy_indicator_null_finalize; + object_class->dispose = dummy_indicator_null_dispose; + object_class->finalize = dummy_indicator_null_finalize; - IndicatorObjectClass * io_class = INDICATOR_OBJECT_CLASS(klass); + 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; - io_class->get_accessible_desc = get_accessible_desc; + io_class->get_label = get_label; + io_class->get_image = get_icon; + io_class->get_menu = get_menu; + io_class->get_accessible_desc = get_accessible_desc; - return; + return; } static void dummy_indicator_null_init (DummyIndicatorNull *self) { - return; + return; } static void dummy_indicator_null_dispose (GObject *object) { - G_OBJECT_CLASS (dummy_indicator_null_parent_class)->dispose (object); - return; + 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; + G_OBJECT_CLASS (dummy_indicator_null_parent_class)->finalize (object); + return; } diff --git a/tests/dummy-indicator-signaler.c b/tests/dummy-indicator-signaler.c index f73f35e..c963c6d 100644 --- a/tests/dummy-indicator-signaler.c +++ b/tests/dummy-indicator-signaler.c @@ -23,8 +23,8 @@ License along with this library. If not, see #include #include -#include "libayatana-indicator/indicator.h" -#include "libayatana-indicator/indicator-object.h" +#include "src/indicator.h" +#include "src/indicator-object.h" #define DUMMY_INDICATOR_SIGNALER_TYPE (dummy_indicator_signaler_get_type ()) #define DUMMY_INDICATOR_SIGNALER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DUMMY_INDICATOR_SIGNALER_TYPE, DummyIndicatorSignaler)) @@ -37,12 +37,12 @@ typedef struct _DummyIndicatorSignaler DummyIndicatorSignaler; typedef struct _DummyIndicatorSignalerClass DummyIndicatorSignalerClass; struct _DummyIndicatorSignalerClass { - IndicatorObjectClass parent_class; + IndicatorObjectClass parent_class; }; struct _DummyIndicatorSignaler { - IndicatorObject parent; - IndicatorObjectEntry *entries; + IndicatorObject parent; + IndicatorObjectEntry *entries; }; GType dummy_indicator_signaler_get_type (void); @@ -53,30 +53,30 @@ INDICATOR_SET_TYPE(DUMMY_INDICATOR_SIGNALER_TYPE) GtkLabel * get_label (IndicatorObject * io) { - return GTK_LABEL(gtk_label_new("Signaler Item")); + return GTK_LABEL(gtk_label_new("Signaler Item")); } GtkImage * get_icon (IndicatorObject * io) { - return GTK_IMAGE(gtk_image_new()); + return GTK_IMAGE(gtk_image_new()); } GtkMenu * get_menu (IndicatorObject * io) { - 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)); + 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; + return main_menu; } const gchar * get_accessible_desc (IndicatorObject * io) { - return "Signaler Item"; + return "Signaler Item"; } static void dummy_indicator_signaler_class_init (DummyIndicatorSignalerClass *klass); @@ -89,66 +89,66 @@ G_DEFINE_TYPE (DummyIndicatorSignaler, dummy_indicator_signaler, INDICATOR_OBJEC static void dummy_indicator_signaler_class_init (DummyIndicatorSignalerClass *klass) { - GObjectClass *object_class = G_OBJECT_CLASS (klass); + GObjectClass *object_class = G_OBJECT_CLASS (klass); - object_class->dispose = dummy_indicator_signaler_dispose; - object_class->finalize = dummy_indicator_signaler_finalize; + object_class->dispose = dummy_indicator_signaler_dispose; + object_class->finalize = dummy_indicator_signaler_finalize; - IndicatorObjectClass * io_class = INDICATOR_OBJECT_CLASS(klass); + 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; - io_class->get_accessible_desc = get_accessible_desc; - io_class->entry_being_removed = NULL; - io_class->entry_was_added = NULL; + io_class->get_label = get_label; + io_class->get_image = get_icon; + io_class->get_menu = get_menu; + io_class->get_accessible_desc = get_accessible_desc; + io_class->entry_being_removed = NULL; + io_class->entry_was_added = NULL; - return; + return; } static gboolean idle_signal (gpointer data) { - DummyIndicatorSignaler * self = DUMMY_INDICATOR_SIGNALER(data); + DummyIndicatorSignaler * self = DUMMY_INDICATOR_SIGNALER(data); - IndicatorObjectEntry *added_entry, *removed_entry, *moved_entry; + IndicatorObjectEntry *added_entry, *removed_entry, *moved_entry; - added_entry = &self->entries[0]; - moved_entry = &self->entries[1]; - removed_entry = &self->entries[2]; + added_entry = &self->entries[0]; + moved_entry = &self->entries[1]; + removed_entry = &self->entries[2]; - added_entry->name_hint = "added"; - moved_entry->name_hint = "moved"; - removed_entry->name_hint = "removed"; + added_entry->name_hint = "added"; + moved_entry->name_hint = "moved"; + removed_entry->name_hint = "removed"; - g_signal_emit(G_OBJECT(self), INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED_ID, 0, added_entry); - g_signal_emit(G_OBJECT(self), INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED_ID, 0, moved_entry, 0, 1); - g_signal_emit(G_OBJECT(self), INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED_ID, 0, removed_entry); + g_signal_emit(G_OBJECT(self), INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED_ID, 0, added_entry); + g_signal_emit(G_OBJECT(self), INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED_ID, 0, moved_entry, 0, 1); + g_signal_emit(G_OBJECT(self), INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED_ID, 0, removed_entry); - return FALSE; /* Don't queue again */ + return FALSE; /* Don't queue again */ } static void dummy_indicator_signaler_init (DummyIndicatorSignaler *self) { - self->entries = g_new0(IndicatorObjectEntry, 3); - g_idle_add(idle_signal, self); - return; + self->entries = g_new0(IndicatorObjectEntry, 3); + g_idle_add(idle_signal, self); + return; } static void dummy_indicator_signaler_dispose (GObject *object) { - G_OBJECT_CLASS (dummy_indicator_signaler_parent_class)->dispose (object); - return; + G_OBJECT_CLASS (dummy_indicator_signaler_parent_class)->dispose (object); + return; } static void dummy_indicator_signaler_finalize (GObject *object) { - DummyIndicatorSignaler * self = DUMMY_INDICATOR_SIGNALER(object); - g_free (self->entries); - G_OBJECT_CLASS (dummy_indicator_signaler_parent_class)->finalize (object); - return; + DummyIndicatorSignaler * self = DUMMY_INDICATOR_SIGNALER(object); + g_free (self->entries); + G_OBJECT_CLASS (dummy_indicator_signaler_parent_class)->finalize (object); + return; } diff --git a/tests/dummy-indicator-simple.c b/tests/dummy-indicator-simple.c index 69a9c1d..d62c991 100644 --- a/tests/dummy-indicator-simple.c +++ b/tests/dummy-indicator-simple.c @@ -23,8 +23,8 @@ License along with this library. If not, see #include #include -#include "libayatana-indicator/indicator.h" -#include "libayatana-indicator/indicator-object.h" +#include "src/indicator.h" +#include "src/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)) @@ -37,11 +37,11 @@ typedef struct _DummyIndicatorSimple DummyIndicatorSimple; typedef struct _DummyIndicatorSimpleClass DummyIndicatorSimpleClass; struct _DummyIndicatorSimpleClass { - IndicatorObjectClass parent_class; + IndicatorObjectClass parent_class; }; struct _DummyIndicatorSimple { - IndicatorObject parent; + IndicatorObject parent; }; GType dummy_indicator_simple_get_type (void); @@ -52,30 +52,30 @@ INDICATOR_SET_TYPE(DUMMY_INDICATOR_SIMPLE_TYPE) GtkLabel * get_label (IndicatorObject * io) { - return GTK_LABEL(gtk_label_new("Simple Item")); + return GTK_LABEL(gtk_label_new("Simple Item")); } GtkImage * get_icon (IndicatorObject * io) { - return GTK_IMAGE(gtk_image_new()); + return GTK_IMAGE(gtk_image_new()); } GtkMenu * get_menu (IndicatorObject * io) { - 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)); + 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; + return main_menu; } const gchar * get_accessible_desc (IndicatorObject * io) { - return "Simple Item"; + return "Simple Item"; } static void dummy_indicator_simple_class_init (DummyIndicatorSimpleClass *klass); @@ -88,40 +88,40 @@ G_DEFINE_TYPE (DummyIndicatorSimple, dummy_indicator_simple, INDICATOR_OBJECT_TY static void dummy_indicator_simple_class_init (DummyIndicatorSimpleClass *klass) { - GObjectClass *object_class = G_OBJECT_CLASS (klass); + GObjectClass *object_class = G_OBJECT_CLASS (klass); - object_class->dispose = dummy_indicator_simple_dispose; - object_class->finalize = dummy_indicator_simple_finalize; + object_class->dispose = dummy_indicator_simple_dispose; + object_class->finalize = dummy_indicator_simple_finalize; - IndicatorObjectClass * io_class = INDICATOR_OBJECT_CLASS(klass); + 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; - io_class->get_accessible_desc = get_accessible_desc; + io_class->get_label = get_label; + io_class->get_image = get_icon; + io_class->get_menu = get_menu; + io_class->get_accessible_desc = get_accessible_desc; - return; + return; } static void dummy_indicator_simple_init (DummyIndicatorSimple *self) { - return; + return; } static void dummy_indicator_simple_dispose (GObject *object) { - G_OBJECT_CLASS (dummy_indicator_simple_parent_class)->dispose (object); - return; + 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; + G_OBJECT_CLASS (dummy_indicator_simple_parent_class)->finalize (object); + return; } diff --git a/tests/dummy-indicator-visible.c b/tests/dummy-indicator-visible.c index 05bc9ad..a9dbaf7 100644 --- a/tests/dummy-indicator-visible.c +++ b/tests/dummy-indicator-visible.c @@ -23,8 +23,8 @@ License along with this library. If not, see #include #include -#include "libayatana-indicator/indicator.h" -#include "libayatana-indicator/indicator-object.h" +#include "src/indicator.h" +#include "src/indicator-object.h" #define DUMMY_INDICATOR_VISIBLE_TYPE (dummy_indicator_visible_get_type ()) #define DUMMY_INDICATOR_VISIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DUMMY_INDICATOR_VISIBLE_TYPE, DummyIndicatorVisible)) @@ -37,11 +37,11 @@ typedef struct _DummyIndicatorVisible DummyIndicatorVisible; typedef struct _DummyIndicatorVisibleClass DummyIndicatorVisibleClass; struct _DummyIndicatorVisibleClass { - IndicatorObjectClass parent_class; + IndicatorObjectClass parent_class; }; struct _DummyIndicatorVisible { - IndicatorObject parent; + IndicatorObject parent; }; GType dummy_indicator_visible_get_type (void); @@ -52,30 +52,30 @@ INDICATOR_SET_TYPE(DUMMY_INDICATOR_VISIBLE_TYPE) GtkLabel * get_label (IndicatorObject * io) { - return GTK_LABEL(gtk_label_new("Visible Item")); + return GTK_LABEL(gtk_label_new("Visible Item")); } GtkImage * get_icon (IndicatorObject * io) { - return GTK_IMAGE(gtk_image_new()); + return GTK_IMAGE(gtk_image_new()); } GtkMenu * get_menu (IndicatorObject * io) { - 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)); + 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; + return main_menu; } const gchar * get_accessible_desc (IndicatorObject * io) { - return "Visible Item"; + return "Visible Item"; } static void dummy_indicator_visible_class_init (DummyIndicatorVisibleClass *klass); @@ -88,43 +88,43 @@ G_DEFINE_TYPE (DummyIndicatorVisible, dummy_indicator_visible, INDICATOR_OBJECT_ static void dummy_indicator_entry_being_removed (IndicatorObject * io, IndicatorObjectEntry * entry) { - IndicatorObjectClass * indicator_object_class = INDICATOR_OBJECT_CLASS (dummy_indicator_visible_parent_class); + IndicatorObjectClass * indicator_object_class = INDICATOR_OBJECT_CLASS (dummy_indicator_visible_parent_class); - g_object_set_data(G_OBJECT(entry->label), "is-hidden", GINT_TO_POINTER(1)); + g_object_set_data(G_OBJECT(entry->label), "is-hidden", GINT_TO_POINTER(1)); - if (indicator_object_class->entry_being_removed != NULL) { - indicator_object_class->entry_being_removed (io, entry); - } + if (indicator_object_class->entry_being_removed != NULL) { + indicator_object_class->entry_being_removed (io, entry); + } } static void dummy_indicator_entry_was_added (IndicatorObject * io, IndicatorObjectEntry * entry) { - IndicatorObjectClass * indicator_object_class = INDICATOR_OBJECT_CLASS (dummy_indicator_visible_parent_class); + IndicatorObjectClass * indicator_object_class = INDICATOR_OBJECT_CLASS (dummy_indicator_visible_parent_class); - g_object_steal_data(G_OBJECT(entry->label), "is-hidden"); + g_object_steal_data(G_OBJECT(entry->label), "is-hidden"); - if (indicator_object_class->entry_was_added != NULL) { - indicator_object_class->entry_was_added (io, entry); - } + if (indicator_object_class->entry_was_added != NULL) { + indicator_object_class->entry_was_added (io, entry); + } } static void dummy_indicator_visible_class_init (DummyIndicatorVisibleClass *klass) { - GObjectClass *object_class = G_OBJECT_CLASS (klass); + GObjectClass *object_class = G_OBJECT_CLASS (klass); - object_class->dispose = dummy_indicator_visible_dispose; - object_class->finalize = dummy_indicator_visible_finalize; + object_class->dispose = dummy_indicator_visible_dispose; + object_class->finalize = dummy_indicator_visible_finalize; - IndicatorObjectClass * io_class = INDICATOR_OBJECT_CLASS(klass); + 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; - io_class->get_accessible_desc = get_accessible_desc; - io_class->entry_being_removed = dummy_indicator_entry_being_removed; - io_class->entry_was_added = dummy_indicator_entry_was_added; + io_class->get_label = get_label; + io_class->get_image = get_icon; + io_class->get_menu = get_menu; + io_class->get_accessible_desc = get_accessible_desc; + io_class->entry_being_removed = dummy_indicator_entry_being_removed; + io_class->entry_was_added = dummy_indicator_entry_was_added; } static void @@ -136,12 +136,12 @@ static void dummy_indicator_visible_dispose (GObject *object) { - G_OBJECT_CLASS (dummy_indicator_visible_parent_class)->dispose (object); + G_OBJECT_CLASS (dummy_indicator_visible_parent_class)->dispose (object); } static void dummy_indicator_visible_finalize (GObject *object) { - G_OBJECT_CLASS (dummy_indicator_visible_parent_class)->finalize (object); + G_OBJECT_CLASS (dummy_indicator_visible_parent_class)->finalize (object); } diff --git a/tests/service-manager-connect-service.c b/tests/service-manager-connect-service.c index fb00712..85c353e 100644 --- a/tests/service-manager-connect-service.c +++ b/tests/service-manager-connect-service.c @@ -22,7 +22,7 @@ License along with this library. If not, see #include -#include "libayatana-indicator/indicator-service.h" +#include "src/indicator-service.h" static GMainLoop * mainloop = NULL; static gboolean passed = FALSE; diff --git a/tests/service-manager-connect.c b/tests/service-manager-connect.c index d4774f7..902efaa 100644 --- a/tests/service-manager-connect.c +++ b/tests/service-manager-connect.c @@ -22,7 +22,7 @@ License along with this library. If not, see #include -#include "libayatana-indicator/indicator-service-manager.h" +#include "src/indicator-service-manager.h" static GMainLoop * mainloop = NULL; static gboolean passed = FALSE; diff --git a/tests/service-manager-no-connect.c b/tests/service-manager-no-connect.c index 7aeffc2..5f81118 100644 --- a/tests/service-manager-no-connect.c +++ b/tests/service-manager-no-connect.c @@ -22,7 +22,7 @@ License along with this library. If not, see #include -#include "libayatana-indicator/indicator-service-manager.h" +#include "src/indicator-service-manager.h" static GMainLoop * mainloop = NULL; static gboolean passed = FALSE; diff --git a/tests/service-manager-nostart-connect.c b/tests/service-manager-nostart-connect.c index 36d1bdd..a0b09c3 100644 --- a/tests/service-manager-nostart-connect.c +++ b/tests/service-manager-nostart-connect.c @@ -22,7 +22,7 @@ License along with this library. If not, see #include -#include "libayatana-indicator/indicator-service-manager.h" +#include "src/indicator-service-manager.h" static GMainLoop * mainloop = NULL; static gboolean passed = FALSE; diff --git a/tests/service-shutdown-timeout.c b/tests/service-shutdown-timeout.c index e044216..5407c27 100644 --- a/tests/service-shutdown-timeout.c +++ b/tests/service-shutdown-timeout.c @@ -22,7 +22,7 @@ License along with this library. If not, see #include -#include "libayatana-indicator/indicator-service.h" +#include "src/indicator-service.h" static GMainLoop * mainloop = NULL; static gboolean passed = FALSE; diff --git a/tests/service-version-bad-service.c b/tests/service-version-bad-service.c index f78f6e1..e5e3287 100644 --- a/tests/service-version-bad-service.c +++ b/tests/service-version-bad-service.c @@ -22,7 +22,7 @@ License along with this library. If not, see #include -#include "libayatana-indicator/indicator-service.h" +#include "src/indicator-service.h" #include "service-version-values.h" static GMainLoop * mainloop = NULL; diff --git a/tests/service-version-good-service.c b/tests/service-version-good-service.c index a811d96..7a4abbb 100644 --- a/tests/service-version-good-service.c +++ b/tests/service-version-good-service.c @@ -22,7 +22,7 @@ License along with this library. If not, see #include -#include "libayatana-indicator/indicator-service.h" +#include "src/indicator-service.h" #include "service-version-values.h" static GMainLoop * mainloop = NULL; diff --git a/tests/service-version-manager.c b/tests/service-version-manager.c index 370dbd0..85e1b37 100644 --- a/tests/service-version-manager.c +++ b/tests/service-version-manager.c @@ -22,7 +22,7 @@ License along with this library. If not, see #include -#include "libayatana-indicator/indicator-service-manager.h" +#include "src/indicator-service-manager.h" #include "service-version-values.h" static GMainLoop * mainloop = NULL; diff --git a/tests/service-version-multiwatch-manager-impolite.c b/tests/service-version-multiwatch-manager-impolite.c index 4e3a5a9..c22736e 100644 --- a/tests/service-version-multiwatch-manager-impolite.c +++ b/tests/service-version-multiwatch-manager-impolite.c @@ -22,7 +22,7 @@ License along with this library. If not, see #include -#include "libayatana-indicator/indicator-service-manager.h" +#include "src/indicator-service-manager.h" #include "service-version-values.h" static GMainLoop * mainloop = NULL; diff --git a/tests/service-version-multiwatch-manager.c b/tests/service-version-multiwatch-manager.c index c24b41d..32a0079 100644 --- a/tests/service-version-multiwatch-manager.c +++ b/tests/service-version-multiwatch-manager.c @@ -22,7 +22,7 @@ License along with this library. If not, see #include -#include "libayatana-indicator/indicator-service-manager.h" +#include "src/indicator-service-manager.h" #include "service-version-values.h" static GMainLoop * mainloop = NULL; diff --git a/tests/service-version-multiwatch-service.c b/tests/service-version-multiwatch-service.c index 1a43414..ffad013 100644 --- a/tests/service-version-multiwatch-service.c +++ b/tests/service-version-multiwatch-service.c @@ -22,7 +22,7 @@ License along with this library. If not, see #include -#include "libayatana-indicator/indicator-service.h" +#include "src/indicator-service.h" #include "service-version-values.h" static GMainLoop * mainloop = NULL; diff --git a/tests/test-desktop-shortcuts.c b/tests/test-desktop-shortcuts.c index 59084dd..02e313a 100644 --- a/tests/test-desktop-shortcuts.c +++ b/tests/test-desktop-shortcuts.c @@ -21,7 +21,7 @@ License along with this library. If not, see */ #include -#include "libayatana-indicator/indicator-desktop-shortcuts.h" +#include "src/indicator-desktop-shortcuts.h" /* Basic object creation and destruction. Stop big f*** ups here. */ diff --git a/tests/test-indicator-ng.c b/tests/test-indicator-ng.c index 0844334..dd0592f 100644 --- a/tests/test-indicator-ng.c +++ b/tests/test-indicator-ng.c @@ -1,5 +1,5 @@ -#include +#include "src/indicator-ng.h" static void indicator_ng_test_func (gconstpointer user_data) diff --git a/tests/test-loader.c b/tests/test-loader.c index 5f9b8d3..c1e4b6d 100644 --- a/tests/test-loader.c +++ b/tests/test-loader.c @@ -21,78 +21,78 @@ License along with this library. If not, see */ #include -#include "libayatana-indicator/indicator-object.h" +#include "src/indicator-object.h" #include "dummy-indicator-entry-func.h" void entry_func_swap (IndicatorObject * io) { - static void (*saved_func) (IndicatorObject * io, IndicatorObjectEntry * entry, guint windowid, guint timestamp) = NULL; - IndicatorObjectClass * klass = INDICATOR_OBJECT_GET_CLASS(io); + static void (*saved_func) (IndicatorObject * io, IndicatorObjectEntry * entry, guint windowid, guint timestamp) = NULL; + IndicatorObjectClass * klass = INDICATOR_OBJECT_GET_CLASS(io); - if (saved_func == NULL) { - saved_func = klass->entry_activate_window; - } + if (saved_func == NULL) { + saved_func = klass->entry_activate_window; + } - if (klass->entry_activate_window == NULL) { - klass->entry_activate_window = saved_func; - } else { - klass->entry_activate_window = NULL; - } + if (klass->entry_activate_window == NULL) { + klass->entry_activate_window = saved_func; + } else { + klass->entry_activate_window = NULL; + } - return; + return; } void test_loader_entry_func_window (void) { - IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/.libs/libdummy-indicator-entry-func.so"); - g_assert(object != NULL); + IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/.libs/libdummy-indicator-entry-func.so"); + g_assert(object != NULL); - DummyIndicatorEntryFunc * entryfunc = (DummyIndicatorEntryFunc *)(object); + DummyIndicatorEntryFunc * entryfunc = (DummyIndicatorEntryFunc *)(object); - entryfunc->entry_activate_called = FALSE; - entryfunc->entry_activate_window_called = FALSE; - entryfunc->entry_close_called = FALSE; + entryfunc->entry_activate_called = FALSE; + entryfunc->entry_activate_window_called = FALSE; + entryfunc->entry_close_called = FALSE; - entry_func_swap(object); - indicator_object_entry_activate_window(object, NULL, 0, 0); - g_assert(entryfunc->entry_activate_called); + entry_func_swap(object); + indicator_object_entry_activate_window(object, NULL, 0, 0); + g_assert(entryfunc->entry_activate_called); - entry_func_swap(object); - indicator_object_entry_activate_window(object, NULL, 0, 0); - g_assert(entryfunc->entry_activate_window_called); + entry_func_swap(object); + indicator_object_entry_activate_window(object, NULL, 0, 0); + g_assert(entryfunc->entry_activate_window_called); - g_object_unref(object); + g_object_unref(object); - return; + return; } void test_loader_entry_funcs (void) { - IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/.libs/libdummy-indicator-entry-func.so"); - g_assert(object != NULL); + IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/.libs/libdummy-indicator-entry-func.so"); + g_assert(object != NULL); - DummyIndicatorEntryFunc * entryfunc = (DummyIndicatorEntryFunc *)(object); + DummyIndicatorEntryFunc * entryfunc = (DummyIndicatorEntryFunc *)(object); - entryfunc->entry_activate_called = FALSE; - entryfunc->entry_activate_window_called = FALSE; - entryfunc->entry_close_called = FALSE; + entryfunc->entry_activate_called = FALSE; + entryfunc->entry_activate_window_called = FALSE; + entryfunc->entry_close_called = FALSE; - indicator_object_entry_activate(object, NULL, 0); - g_assert(entryfunc->entry_activate_called); + indicator_object_entry_activate(object, NULL, 0); + g_assert(entryfunc->entry_activate_called); - indicator_object_entry_activate_window(object, NULL, 0, 0); - g_assert(entryfunc->entry_activate_window_called); + indicator_object_entry_activate_window(object, NULL, 0, 0); + g_assert(entryfunc->entry_activate_window_called); - indicator_object_entry_close(object, NULL, 0); - g_assert(entryfunc->entry_close_called); + indicator_object_entry_close(object, NULL, 0); + g_assert(entryfunc->entry_close_called); - g_object_unref(object); + g_object_unref(object); - return; + return; } void destroy_cb (gpointer data, GObject * object); @@ -100,53 +100,53 @@ void destroy_cb (gpointer data, GObject * object); void entry_change_cb (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer data) { - IndicatorObjectEntry *other_entry = data; - other_entry->name_hint = entry->name_hint; - other_entry->parent_object = entry->parent_object; - return; + IndicatorObjectEntry *other_entry = data; + other_entry->name_hint = entry->name_hint; + other_entry->parent_object = entry->parent_object; + return; } void entry_move_cb (IndicatorObject * io, IndicatorObjectEntry * entry, gint old, gint new, gpointer data) { - return entry_change_cb(io, entry, data); + return entry_change_cb(io, entry, data); } void test_loader_filename_dummy_signaler (void) { - IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/.libs/libdummy-indicator-signaler.so"); - g_assert(object != NULL); + IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/.libs/libdummy-indicator-signaler.so"); + g_assert(object != NULL); - IndicatorObjectEntry *added_entry, *moved_entry, *removed_entry; - IndicatorObjectEntry entries[3]; + IndicatorObjectEntry *added_entry, *moved_entry, *removed_entry; + IndicatorObjectEntry entries[3]; - added_entry = &entries[0]; - moved_entry = &entries[1]; - removed_entry = &entries[2]; + added_entry = &entries[0]; + moved_entry = &entries[1]; + removed_entry = &entries[2]; - g_signal_connect_after(G_OBJECT(object), INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED, G_CALLBACK(entry_change_cb), added_entry); - g_signal_connect_after(G_OBJECT(object), INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED, G_CALLBACK(entry_move_cb), moved_entry); - g_signal_connect_after(G_OBJECT(object), INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED, G_CALLBACK(entry_change_cb), removed_entry); + g_signal_connect_after(G_OBJECT(object), INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED, G_CALLBACK(entry_change_cb), added_entry); + g_signal_connect_after(G_OBJECT(object), INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED, G_CALLBACK(entry_move_cb), moved_entry); + g_signal_connect_after(G_OBJECT(object), INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED, G_CALLBACK(entry_change_cb), removed_entry); - GList * list = indicator_object_get_entries(object); - g_assert(list != NULL); - g_list_free(list); + GList * list = indicator_object_get_entries(object); + g_assert(list != NULL); + g_list_free(list); - while (g_main_context_pending(NULL)) { - g_main_context_iteration(NULL, TRUE); - } + while (g_main_context_pending(NULL)) { + g_main_context_iteration(NULL, TRUE); + } - g_assert(g_strcmp0(added_entry->name_hint, "added") == 0); - g_assert(g_strcmp0(removed_entry->name_hint, "removed") == 0); - g_assert(g_strcmp0(moved_entry->name_hint, "moved") == 0); + g_assert(g_strcmp0(added_entry->name_hint, "added") == 0); + g_assert(g_strcmp0(removed_entry->name_hint, "removed") == 0); + g_assert(g_strcmp0(moved_entry->name_hint, "moved") == 0); - g_assert(added_entry->parent_object == object); - g_assert(removed_entry->parent_object == NULL); + g_assert(added_entry->parent_object == object); + g_assert(removed_entry->parent_object == NULL); - g_object_unref(object); + g_object_unref(object); - return; + return; } /*** @@ -156,86 +156,86 @@ test_loader_filename_dummy_signaler (void) static void visible_entry_added (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer box) { - GtkWidget * child = GTK_WIDGET (entry->label); - g_assert (child != NULL); - - if (g_object_get_data (G_OBJECT(child), "frame-parent") == NULL) - { - GtkWidget * frame = gtk_frame_new (NULL); - gtk_container_add (GTK_CONTAINER(frame), child); - gtk_box_pack_start (GTK_BOX(box), frame, FALSE, FALSE, 0); - g_object_set_data (G_OBJECT(child), "frame-parent", frame); - } + GtkWidget * child = GTK_WIDGET (entry->label); + g_assert (child != NULL); + + if (g_object_get_data (G_OBJECT(child), "frame-parent") == NULL) + { + GtkWidget * frame = gtk_frame_new (NULL); + gtk_container_add (GTK_CONTAINER(frame), child); + gtk_box_pack_start (GTK_BOX(box), frame, FALSE, FALSE, 0); + g_object_set_data (G_OBJECT(child), "frame-parent", frame); + } } static void visible_entry_removed (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer box) { - GtkWidget * child = GTK_WIDGET (entry->label); - g_assert (child != NULL); - g_assert (g_object_get_data (G_OBJECT(child), "frame-parent") != NULL); + GtkWidget * child = GTK_WIDGET (entry->label); + g_assert (child != NULL); + g_assert (g_object_get_data (G_OBJECT(child), "frame-parent") != NULL); } void test_loader_filename_dummy_visible (void) { - const GQuark is_hidden_quark = g_quark_from_static_string ("is-hidden"); - IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/.libs/libdummy-indicator-visible.so"); - g_assert(object != NULL); + const GQuark is_hidden_quark = g_quark_from_static_string ("is-hidden"); + IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/.libs/libdummy-indicator-visible.so"); + g_assert(object != NULL); - // create our local parent widgetry + // create our local parent widgetry #if GTK_CHECK_VERSION(3,0,0) - GtkWidget * box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); + GtkWidget * box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); #else - GtkWidget * box = gtk_hbox_new (TRUE, 0); + GtkWidget * box = gtk_hbox_new (TRUE, 0); #endif - g_signal_connect(object, INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED, - G_CALLBACK(visible_entry_added), box); - g_signal_connect(object, INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED, - G_CALLBACK(visible_entry_removed), box); - - // on startup, DummyVisible has one entry and it has a label - GList * list = indicator_object_get_entries(object); - g_assert(g_list_length(list) == 1); - IndicatorObjectEntry * entry = list->data; - g_assert(entry != NULL); - g_list_free(list); - g_assert(GTK_IS_LABEL(entry->label)); - g_assert(entry->parent_object == object); - g_assert(INDICATOR_IS_OBJECT(entry->parent_object)); - GtkWidget * label = GTK_WIDGET(entry->label); + g_signal_connect(object, INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED, + G_CALLBACK(visible_entry_added), box); + g_signal_connect(object, INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED, + G_CALLBACK(visible_entry_removed), box); + + // on startup, DummyVisible has one entry and it has a label + GList * list = indicator_object_get_entries(object); + g_assert(g_list_length(list) == 1); + IndicatorObjectEntry * entry = list->data; + g_assert(entry != NULL); + g_list_free(list); + g_assert(GTK_IS_LABEL(entry->label)); + g_assert(entry->parent_object == object); + g_assert(INDICATOR_IS_OBJECT(entry->parent_object)); + GtkWidget * label = GTK_WIDGET(entry->label); g_assert(g_object_get_qdata(G_OBJECT(label), is_hidden_quark) == NULL); - // add the inital entry to our local parent widgetry - visible_entry_added (object, entry, box); - entry = NULL; - list = gtk_container_get_children (GTK_CONTAINER(box)); - g_assert(g_list_length(list) == 1); - g_list_free(list); - - // hide the entries and confirm that the label survived - indicator_object_set_visible (object, FALSE); - while (g_main_context_pending(NULL)) - g_main_context_iteration(NULL, TRUE); - g_assert(GTK_IS_LABEL(label)); + // add the inital entry to our local parent widgetry + visible_entry_added (object, entry, box); + entry = NULL; + list = gtk_container_get_children (GTK_CONTAINER(box)); + g_assert(g_list_length(list) == 1); + g_list_free(list); + + // hide the entries and confirm that the label survived + indicator_object_set_visible (object, FALSE); + while (g_main_context_pending(NULL)) + g_main_context_iteration(NULL, TRUE); + g_assert(GTK_IS_LABEL(label)); g_assert(g_object_get_qdata(G_OBJECT(label), is_hidden_quark) != NULL); - list = gtk_container_get_children (GTK_CONTAINER(box)); - g_assert(g_list_length(list) == 1); - g_list_free(list); - - // restore the entries and confirm that the label survived - indicator_object_set_visible (object, TRUE); - while (g_main_context_pending(NULL)) - g_main_context_iteration(NULL, TRUE); - g_assert(GTK_IS_LABEL(label)); + list = gtk_container_get_children (GTK_CONTAINER(box)); + g_assert(g_list_length(list) == 1); + g_list_free(list); + + // restore the entries and confirm that the label survived + indicator_object_set_visible (object, TRUE); + while (g_main_context_pending(NULL)) + g_main_context_iteration(NULL, TRUE); + g_assert(GTK_IS_LABEL(label)); g_assert(g_object_get_qdata(G_OBJECT(label), is_hidden_quark) == NULL); - list = gtk_container_get_children (GTK_CONTAINER(box)); - g_assert(g_list_length(list) == 1); - g_list_free(list); + list = gtk_container_get_children (GTK_CONTAINER(box)); + g_assert(g_list_length(list) == 1); + g_list_free(list); - // cleanup - g_object_unref(object); - gtk_widget_destroy(box); + // cleanup + g_object_unref(object); + gtk_widget_destroy(box); } /*** @@ -245,129 +245,129 @@ test_loader_filename_dummy_visible (void) void test_loader_filename_dummy_simple_location (void) { - IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/.libs/libdummy-indicator-simple.so"); - g_assert(object != NULL); + IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/.libs/libdummy-indicator-simple.so"); + g_assert(object != NULL); - GList * entries = indicator_object_get_entries(object); - g_assert(entries != NULL); - g_assert(g_list_length(entries) == 1); + GList * entries = indicator_object_get_entries(object); + g_assert(entries != NULL); + g_assert(g_list_length(entries) == 1); - IndicatorObjectEntry *entry = entries->data; + IndicatorObjectEntry *entry = entries->data; - g_assert(indicator_object_get_location(object, entry) == 0); - g_assert(indicator_object_get_location(object, NULL) == 0); - g_assert(entry->parent_object == object); + g_assert(indicator_object_get_location(object, entry) == 0); + g_assert(indicator_object_get_location(object, NULL) == 0); + g_assert(entry->parent_object == object); - g_object_unref(object); + g_object_unref(object); - return; + return; } 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); + IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/.libs/libdummy-indicator-simple.so"); + g_assert(object != NULL); - g_assert(indicator_object_get_entries(object) != NULL); + g_assert(indicator_object_get_entries(object) != NULL); - g_object_unref(object); + g_object_unref(object); - return; + return; } void test_loader_filename_dummy_simple (void) { - IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/.libs/libdummy-indicator-simple.so"); - g_assert(object != NULL); + IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/.libs/libdummy-indicator-simple.so"); + g_assert(object != NULL); - gboolean unreffed = FALSE; - g_object_weak_ref(G_OBJECT(object), destroy_cb, &unreffed); + gboolean unreffed = FALSE; + g_object_weak_ref(G_OBJECT(object), destroy_cb, &unreffed); - g_object_unref(object); - g_assert(unreffed == TRUE); + g_object_unref(object); + g_assert(unreffed == TRUE); - return; + 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; + 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) { - IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/.libs/libdummy-indicator-null.so"); - g_assert(object != NULL); - g_assert(indicator_object_get_entries(object) == NULL); - g_object_unref(G_OBJECT(object)); - return; + IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/.libs/libdummy-indicator-null.so"); + g_assert(object != NULL); + g_assert(indicator_object_get_entries(object) == NULL); + g_object_unref(G_OBJECT(object)); + return; } void test_loader_filename_bad (void) { - IndicatorObject * object = indicator_object_new_from_file("/this/file/should/not/exist.so"); - g_assert(object == NULL); - return; + 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) { - gboolean * bob = (gboolean *)data; - *bob = TRUE; - return; + gboolean * bob = (gboolean *)data; + *bob = TRUE; + return; } void test_loader_refunref (void) { - GObject * object = g_object_new(INDICATOR_OBJECT_TYPE, NULL); + GObject * object = g_object_new(INDICATOR_OBJECT_TYPE, NULL); - gboolean unreffed = FALSE; - g_object_weak_ref(object, destroy_cb, &unreffed); + gboolean unreffed = FALSE; + g_object_weak_ref(object, destroy_cb, &unreffed); - g_object_unref(object); + g_object_unref(object); - g_assert(unreffed == TRUE); + g_assert(unreffed == TRUE); - return; + return; } 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); - 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); - g_test_add_func ("/libindicator/loader/dummy/simple_location", test_loader_filename_dummy_simple_location); - g_test_add_func ("/libindicator/loader/dummy/signaler", test_loader_filename_dummy_signaler); - g_test_add_func ("/libindicator/loader/dummy/entry_funcs", test_loader_entry_funcs); - g_test_add_func ("/libindicator/loader/dummy/entry_func_window", test_loader_entry_func_window); - g_test_add_func ("/libindicator/loader/dummy/visible", test_loader_filename_dummy_visible); - - return; + 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); + g_test_add_func ("/libindicator/loader/dummy/simple_location", test_loader_filename_dummy_simple_location); + g_test_add_func ("/libindicator/loader/dummy/signaler", test_loader_filename_dummy_signaler); + g_test_add_func ("/libindicator/loader/dummy/entry_funcs", test_loader_entry_funcs); + g_test_add_func ("/libindicator/loader/dummy/entry_func_window", test_loader_entry_func_window); + g_test_add_func ("/libindicator/loader/dummy/visible", test_loader_filename_dummy_visible); + + return; } int main (int argc, char ** argv) { - g_test_init (&argc, &argv, NULL); - gtk_init(&argc, &argv); + g_test_init (&argc, &argv, NULL); + gtk_init(&argc, &argv); - test_loader_creation_deletion_suite(); + test_loader_creation_deletion_suite(); - g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL); + g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL); - return g_test_run(); + return g_test_run(); } -- cgit v1.2.3