From 3a33240e301a02fa6ee0aa0bd41780a0e3a28633 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Fri, 18 Jan 2013 19:48:04 +0100 Subject: Add IndicatorNg IndicatorNg is an indicator object that reads an indicator service file and watches the bus for a corresponding service to appear. It turns the menus and actions exported by the service into an indicator entry. --- libindicator/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'libindicator/Makefile.am') diff --git a/libindicator/Makefile.am b/libindicator/Makefile.am index ef6c6c7..de87e3b 100644 --- a/libindicator/Makefile.am +++ b/libindicator/Makefile.am @@ -51,7 +51,9 @@ libindicator_la_SOURCES = \ indicator-object-marshal.h \ indicator-object-marshal.c \ indicator-service.c \ - indicator-service-manager.c + indicator-service-manager.c \ + indicator-ng.c \ + indicator-ng.h libindicator_la_CFLAGS = \ $(LIBINDICATOR_CFLAGS) \ -- cgit v1.2.3 From aaae4aa191dc5ad4dd643822b33397bc6faace0e Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Fri, 18 Jan 2013 22:17:54 +0100 Subject: Only build and use IndicatorNg in the gtk3 build --- libindicator/Makefile.am | 6 +++++- tools/indicator-loader.c | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'libindicator/Makefile.am') diff --git a/libindicator/Makefile.am b/libindicator/Makefile.am index de87e3b..edb4fac 100644 --- a/libindicator/Makefile.am +++ b/libindicator/Makefile.am @@ -51,9 +51,13 @@ libindicator_la_SOURCES = \ indicator-object-marshal.h \ indicator-object-marshal.c \ indicator-service.c \ - indicator-service-manager.c \ + indicator-service-manager.c + +if USE_GTK3 +libindicator_la_SOURCES += \ indicator-ng.c \ indicator-ng.h +endif libindicator_la_CFLAGS = \ $(LIBINDICATOR_CFLAGS) \ diff --git a/tools/indicator-loader.c b/tools/indicator-loader.c index 51d2e46..d275c43 100644 --- a/tools/indicator-loader.c +++ b/tools/indicator-loader.c @@ -24,7 +24,10 @@ License along with this library. If not, see #include #include + +#if GTK_MAJOR_VERSION == 3 #include +#endif static GHashTable * entry_to_menuitem = NULL; @@ -137,6 +140,7 @@ load_module (const gchar * name, GtkWidget * menu) if (g_str_has_suffix(name, G_MODULE_SUFFIX)) { io = indicator_object_new_from_file(name); } +#if GTK_MAJOR_VERSION == 3 else if (g_str_has_suffix(name, ".indicator")) { GError *error = NULL; @@ -147,6 +151,7 @@ load_module (const gchar * name, GtkWidget * menu) return FALSE; } } +#endif else return FALSE; -- cgit v1.2.3 From 36e0fea77699a71d03245900b9c0ae5a7cf2bcf5 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Mon, 21 Jan 2013 17:30:05 +0100 Subject: Make sure indicator-ng.h is installed --- libindicator/Makefile.am | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'libindicator/Makefile.am') diff --git a/libindicator/Makefile.am b/libindicator/Makefile.am index edb4fac..7bd37ef 100644 --- a/libindicator/Makefile.am +++ b/libindicator/Makefile.am @@ -36,6 +36,10 @@ indicator_headers = \ indicator-service.h \ indicator-service-manager.h +if USE_GTK3 +indicator_headers += indicator-ng.h +endif + libindicatorinclude_HEADERS = \ $(indicator_headers) @@ -54,9 +58,7 @@ libindicator_la_SOURCES = \ indicator-service-manager.c if USE_GTK3 -libindicator_la_SOURCES += \ - indicator-ng.c \ - indicator-ng.h +libindicator_la_SOURCES += indicator-ng.c endif libindicator_la_CFLAGS = \ -- cgit v1.2.3