From c6055d45604745ac063db2d1daf8207df5c7fad5 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 22 Jun 2011 15:42:44 -0500
Subject: Stealing all of the status providers from indicator-me so that we can
 use them here.

---
 src/Makefile.am | 159 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 153 insertions(+), 6 deletions(-)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index 8597d77..8e4f170 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,14 @@
 
+BUILT_SOURCES = 
+EXTRA_DIST =
+
 libexec_PROGRAMS = indicator-messages-service
 
+STATUS_PROVIDER_API_VERSION = 1
+STATUS_PROVIDER_DIR = $(libexecdir)/status-providers/$(STATUS_PROVIDER_API_VERSION)/
+statusprovidersdir = $(STATUS_PROVIDER_DIR)
+statusproviders_LTLIBRARIES = 
+
 ######################################
 # Building the messages indicator
 ######################################
@@ -44,7 +52,11 @@ indicator_messages_service_SOURCES = \
 	seen-db.c \
 	seen-db.h \
 	dirs.h \
-	dbus-data.h
+	dbus-data.h \
+	\
+	status-provider.c \
+	status-provider.h
+
 indicator_messages_service_CFLAGS = \
 	$(APPLET_CFLAGS) \
 	-Wall \
@@ -52,7 +64,9 @@ indicator_messages_service_CFLAGS = \
 	-Wl,-z,defs \
 	-Wl,--as-needed \
 	-Werror \
-	-DG_LOG_DOMAIN=\"Indicator-Messages\"
+	-DG_LOG_DOMAIN=\"Indicator-Messages\" \
+	-DSTAUTS_PROVIDER_DIR=\"$(STATUS_PROVIDER_DIR)\"
+
 indicator_messages_service_LDADD = $(APPLET_LIBS)
 
 gen-%.xml.h: %.xml
@@ -65,13 +79,146 @@ gen-%.xml.c: %.xml
 	@sed -e "s:\":\\\\\":g" -e s:^:\": -e s:\$$:\\\\n\": $< >> $@
 	@echo ";" >> $@
 
-BUILT_SOURCES = \
+BUILT_SOURCES += \
 	gen-messages-service.xml.h \
 	gen-messages-service.xml.c
 
+EXTRA_DIST += \
+	messages-service.xml
+
+######################################
+# Status provider: Pidgin
+######################################
+
+statusproviders_LTLIBRARIES += libpidgin.la
+libpidgin_la_SOURCES = \
+	status-provider-pidgin.h \
+	status-provider-pidgin.c \
+	status-provider-pidgin-marshal.h \
+	status-provider-pidgin-marshal.c
+libpidgin_la_CFLAGS = \
+	$(APPLET_CFLAGS) \
+	$(STATUS_PROVIDER_PIDGIN_CFLAGS) \
+	-Wall -Werror \
+	-DG_LOG_DOMAIN=\"Status-Provider-Pidgin\"
+libpidgin_la_LIBADD = \
+	$(APPLET_LIBS) \
+	$(STATUS_PROVIDER_PIDGIN_LIBS)
+libpidgin_la_LDFLAGS = -module -avoid-version
+
+status-provider-pidgin-marshal.h: $(srcdir)/status-provider-pidgin.list
+	glib-genmarshal --header \
+		--prefix=_status_provider_pidgin_marshal $(srcdir)/status-provider-pidgin.list \
+		> status-provider-pidgin-marshal.h
+
+status-provider-pidgin-marshal.c: $(srcdir)/status-provider-pidgin.list
+	glib-genmarshal --body \
+		--prefix=_status_provider_pidgin_marshal $(srcdir)/status-provider-pidgin.list \
+		> status-provider-pidgin-marshal.c
+
+BUILT_SOURCES += \
+	status-provider-pidgin-marshal.h \
+	status-provider-pidgin-marshal.c 
+
+EXTRA_DIST += \
+	status-provider-pidgin.list
+
+######################################
+# Status provider: Mission Control 4
+######################################
+
+statusproviders_LTLIBRARIES += libtelepathy.la
+libtelepathy_la_SOURCES = \
+	status-provider-telepathy.h \
+	status-provider-telepathy.c \
+	status-provider-telepathy-marshal.h \
+	status-provider-telepathy-marshal.c
+libtelepathy_la_CFLAGS = \
+	$(APPLET_CFLAGS) \
+	$(STATUS_PROVIDER_TELEPATHY_CFLAGS) \
+	-Wall -Werror \
+	-DG_LOG_DOMAIN=\"Status-Provider-Telepathy\"
+libtelepathy_la_LIBADD = \
+	$(APPLET_LIBS) \
+	$(STATUS_PROVIDER_TELEPATHY_LIBS)
+libtelepathy_la_LDFLAGS = -module -avoid-version
+
+status-provider-telepathy-marshal.h: $(srcdir)/status-provider-telepathy.list
+	glib-genmarshal --header \
+		--prefix=_status_provider_telepathy_marshal $(srcdir)/status-provider-telepathy.list \
+		> status-provider-telepathy-marshal.h
+
+status-provider-telepathy-marshal.c: $(srcdir)/status-provider-telepathy.list
+	glib-genmarshal --body \
+		--prefix=_status_provider_telepathy_marshal $(srcdir)/status-provider-telepathy.list \
+		> status-provider-telepathy-marshal.c
+
+BUILT_SOURCES += \
+	status-provider-telepathy-marshal.h \
+	status-provider-telepathy-marshal.c
+
+EXTRA_DIST += \
+	status-provider-telepathy.list
+
+######################################
+# Status provider: Mission Control 5
+######################################
+
+statusproviders_LTLIBRARIES += libmc5.la
+libmc5_la_SOURCES = \
+	status-provider-mc5.h \
+	status-provider-mc5.c \
+	status-provider-mc5-marshal.h \
+	status-provider-mc5-marshal.c
+libmc5_la_CFLAGS = \
+	$(APPLET_CFLAGS) \
+	$(STATUS_PROVIDER_MC5_CFLAGS) \
+	-Wall -Werror \
+	-DG_LOG_DOMAIN=\"Status-Provider-MC5\"
+libmc5_la_LIBADD = \
+	$(APPLET_LIBS) \
+	$(STATUS_PROVIDER_MC5_LIBS)
+libmc5_la_LDFLAGS = -module -avoid-version
+
+status-provider-mc5-marshal.h: $(srcdir)/status-provider-mc5.list
+	glib-genmarshal --header \
+		--prefix=_status_provider_mc5_marshal $(srcdir)/status-provider-mc5.list \
+		> status-provider-mc5-marshal.h
+
+status-provider-mc5-marshal.c: $(srcdir)/status-provider-mc5.list
+	glib-genmarshal --body \
+		--prefix=_status_provider_mc5_marshal $(srcdir)/status-provider-mc5.list \
+		> status-provider-mc5-marshal.c
+
+BUILT_SOURCES += \
+	status-provider-mc5-marshal.h \
+	status-provider-mc5-marshal.c
+
+EXTRA_DIST += \
+	status-provider-mc5.list
+
+######################################
+# Status provider: Emesene
+######################################
+
+statusproviders_LTLIBRARIES += libemesene.la
+libemesene_la_SOURCES = \
+	status-provider-emesene.h \
+	status-provider-emesene.c
+libemesene_la_CFLAGS = \
+	$(APPLET_CFLAGS) \
+	$(STATUS_PROVIDER_EMESENE_CFLAGS) \
+	-Wall -Werror \
+	-DG_LOG_DOMAIN=\"Status-Provider-Emesene\"
+libemesene_la_LIBADD = \
+	$(APPLET_LIBS) \
+	$(STATUS_PROVIDER_EMESENE_LIBS)
+libemesene_la_LDFLAGS = -module -avoid-version
+
+######################################
+# Extras
+######################################
+
 CLEANFILES = \
 	$(BUILT_SOURCES)
 
-EXTRA_DIST = \
-	messages-service.xml
-
-- 
cgit v1.2.3


From f1e975ba53b6bc180a0a55ef7db64c9371c15f44 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 28 Jun 2011 14:26:39 -0500
Subject: Adding in some helpers with building up all the status-items.

---
 src/Makefile.am    |  2 ++
 src/status-items.c | 10 ++++++++++
 src/status-items.h | 14 ++++++++++++++
 3 files changed, 26 insertions(+)
 create mode 100644 src/status-items.c
 create mode 100644 src/status-items.h

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index 8e4f170..4f654da 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -54,6 +54,8 @@ indicator_messages_service_SOURCES = \
 	dirs.h \
 	dbus-data.h \
 	\
+	status-items.c \
+	status-items.h
 	status-provider.c \
 	status-provider.h
 
diff --git a/src/status-items.c b/src/status-items.c
new file mode 100644
index 0000000..7cd9c21
--- /dev/null
+++ b/src/status-items.c
@@ -0,0 +1,10 @@
+
+#include "status-items.h"
+
+GList *
+status_items_build (void)
+{
+
+
+	return NULL;
+}
diff --git a/src/status-items.h b/src/status-items.h
new file mode 100644
index 0000000..66844f4
--- /dev/null
+++ b/src/status-items.h
@@ -0,0 +1,14 @@
+
+#ifndef __STATUS_ITEMS_H__
+#define __STATUS_ITEMS_H__
+
+#include <glib.h>
+
+G_BEGIN_DECLS
+
+GList * status_items_build (void);
+
+G_END_DECLS
+
+#endif /* __STATUS_ITEMS_H__ */
+
-- 
cgit v1.2.3


From 1ee7d8ddc51a65bb14f4a294abd7024fda5c11b3 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 28 Jun 2011 15:58:48 -0500
Subject: Adding in an idle function for handling the directory.

---
 src/Makefile.am    |  2 +-
 src/status-items.c | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index 4f654da..de4fccb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -67,7 +67,7 @@ indicator_messages_service_CFLAGS = \
 	-Wl,--as-needed \
 	-Werror \
 	-DG_LOG_DOMAIN=\"Indicator-Messages\" \
-	-DSTAUTS_PROVIDER_DIR=\"$(STATUS_PROVIDER_DIR)\"
+	-DSTATUS_PROVIDER_DIR=\"$(STATUS_PROVIDER_DIR)\"
 
 indicator_messages_service_LDADD = $(APPLET_LIBS)
 
diff --git a/src/status-items.c b/src/status-items.c
index c0f60cd..e5e0d71 100644
--- a/src/status-items.c
+++ b/src/status-items.c
@@ -42,6 +42,10 @@ static const gchar * panel_active_icons[STATUS_PROVIDER_STATUS_LAST] = {
   /* STATUS_PROVIDER_STATUS_DISCONNECTED */ "indicator-messages-new-user-disconnected"
 };
 
+/* Prototypes */
+static gboolean provider_directory_parse (gpointer dir);
+
+/* Globals */
 static StatusProviderStatus current_status = STATUS_PROVIDER_STATUS_DISCONNECTED;
 GList * menuitems = NULL;
 
@@ -66,6 +70,8 @@ status_items_build (void)
 		menuitems = g_list_append(menuitems, item);
 	}
 
+	g_idle_add(provider_directory_parse, STATUS_PROVIDER_DIR);
+
 	return menuitems;
 }
 
@@ -79,3 +85,17 @@ status_current_panel_icon (gboolean alert)
 		return panel_icons[current_status];
 	}
 }
+
+/* Start parsing a directory and setting up the entires in the idle loop */
+static gboolean
+provider_directory_parse (gpointer directory)
+{
+	const gchar * dir = (const gchar *)directory;
+
+	if (!g_file_test(dir, G_FILE_TEST_EXISTS)) {
+		return FALSE;
+	}
+
+
+	return FALSE;
+}
-- 
cgit v1.2.3


From 782c36c2ccf01dd0db6cbac8cc712cc316f23c90 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Sat, 2 Jul 2011 07:15:22 -0500
Subject: Loading the modules and getting an object

---
 src/Makefile.am                 |  2 +-
 src/status-items.c              | 26 ++++++++++++++++++++++++--
 src/status-provider-emesene.c   |  2 ++
 src/status-provider-mc5.c       |  2 ++
 src/status-provider-pidgin.c    |  2 ++
 src/status-provider-telepathy.c |  2 ++
 src/status-provider.h           |  3 +++
 7 files changed, 36 insertions(+), 3 deletions(-)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index de4fccb..87f3c67 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -55,7 +55,7 @@ indicator_messages_service_SOURCES = \
 	dbus-data.h \
 	\
 	status-items.c \
-	status-items.h
+	status-items.h \
 	status-provider.c \
 	status-provider.h
 
diff --git a/src/status-items.c b/src/status-items.c
index 5e8a07c..eef240f 100644
--- a/src/status-items.c
+++ b/src/status-items.c
@@ -107,7 +107,7 @@ provider_directory_parse (gpointer directory)
 
 	const gchar * name;
 	while ((name = g_dir_read_name(dir)) != NULL) {
-		if (!g_str_has_suffix(name, ".so")) {
+		if (!g_str_has_suffix(name, G_MODULE_SUFFIX)) {
 			continue;
 		}
 
@@ -137,10 +137,32 @@ load_status_provider (gpointer dir)
 	module = g_module_open(provider, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
 	if (module == NULL) {
 		g_warning("Unable to module for: %s", provider);
-		goto exit_final;
+		goto exit_module_fail;
 	}
 
 	/* Got it */
+	GType (*type_func) (void);
+	if (!g_module_symbol(module, STATUS_PROVIDER_EXPORT_S, (gpointer *)&type_func)) {
+		g_warning("Unable to find type symbol in: %s", provider);
+		goto exit_module_fail;
+	}
+
+	GType provider_type = type_func();
+	if (provider_type == 0) {
+		g_warning("Unable to create type from: %s", provider);
+		goto exit_module_fail;
+	}
+
+	StatusProvider * sprovider = STATUS_PROVIDER(g_object_new(provider_type, NULL));
+	if (sprovider == NULL) {
+		g_warning("Unable to build provider from: %s", provider);
+		goto exit_module_fail;
+	}
+
+
+	goto exit_final;
+
+exit_module_fail:
 	g_module_close(module);
 
 exit_final:
diff --git a/src/status-provider-emesene.c b/src/status-provider-emesene.c
index ab75f68..29a8a22 100644
--- a/src/status-provider-emesene.c
+++ b/src/status-provider-emesene.c
@@ -78,6 +78,8 @@ static void dbus_namechange (DBusGProxy * proxy, const gchar * name, const gchar
 
 G_DEFINE_TYPE (StatusProviderEmesene, status_provider_emesene, STATUS_PROVIDER_TYPE);
 
+STATUS_PROVIDER_EXPORT_TYPE(STATUS_PROVIDER_EMESENE_TYPE)
+
 static void
 status_provider_emesene_class_init (StatusProviderEmeseneClass *klass)
 {
diff --git a/src/status-provider-mc5.c b/src/status-provider-mc5.c
index 468c6e8..e70496c 100644
--- a/src/status-provider-mc5.c
+++ b/src/status-provider-mc5.c
@@ -89,6 +89,8 @@ static void mc5_exists_cb (DBusGProxy * proxy, gboolean exists, GError * error,
 
 G_DEFINE_TYPE (StatusProviderMC5, status_provider_mc5, STATUS_PROVIDER_TYPE);
 
+STATUS_PROVIDER_EXPORT_TYPE(STATUS_PROVIDER_MC5_TYPE)
+
 /* Create the class.  We over ride a few functions but nothing
    really shocking.  Most interesting is the set and get status. */
 static void
diff --git a/src/status-provider-pidgin.c b/src/status-provider-pidgin.c
index 3c0ca15..6c73d56 100644
--- a/src/status-provider-pidgin.c
+++ b/src/status-provider-pidgin.c
@@ -87,6 +87,8 @@ static void dbus_namechange (DBusGProxy * proxy, const gchar * name, const gchar
 
 G_DEFINE_TYPE (StatusProviderPidgin, status_provider_pidgin, STATUS_PROVIDER_TYPE);
 
+STATUS_PROVIDER_EXPORT_TYPE(STATUS_PROVIDER_PIDGIN_TYPE)
+
 static void
 status_provider_pidgin_class_init (StatusProviderPidginClass *klass)
 {
diff --git a/src/status-provider-telepathy.c b/src/status-provider-telepathy.c
index f2815fb..c8e89da 100644
--- a/src/status-provider-telepathy.c
+++ b/src/status-provider-telepathy.c
@@ -86,6 +86,8 @@ static void get_status_async (DBusGProxy * proxy, DBusGProxyCall * call, gpointe
 
 G_DEFINE_TYPE (StatusProviderTelepathy, status_provider_telepathy, STATUS_PROVIDER_TYPE);
 
+STATUS_PROVIDER_EXPORT_TYPE(STATUS_PROVIDER_TELEPATHY_TYPE)
+
 static void
 status_provider_telepathy_class_init (StatusProviderTelepathyClass *klass)
 {
diff --git a/src/status-provider.h b/src/status-provider.h
index a0e1c55..45433fc 100644
--- a/src/status-provider.h
+++ b/src/status-provider.h
@@ -28,6 +28,9 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 G_BEGIN_DECLS
 
+#define STATUS_PROVIDER_EXPORT_TYPE(x)  GType status_provider_export_type (void) { return (x); }
+#define STATUS_PROVIDER_EXPORT_S             "status_provider_export_type"
+
 #define STATUS_PROVIDER_TYPE            (status_provider_get_type ())
 #define STATUS_PROVIDER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), STATUS_PROVIDER_TYPE, StatusProvider))
 #define STATUS_PROVIDER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), STATUS_PROVIDER_TYPE, StatusProviderClass))
-- 
cgit v1.2.3


From 0b32b5d893fbd6685bb1b900d744a5d320796def Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Sat, 2 Jul 2011 07:44:18 -0500
Subject: Breaking the status provider base objec out into it's own library

---
 src/Makefile.am | 50 ++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 42 insertions(+), 8 deletions(-)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index 87f3c67..51551ba 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,10 +4,6 @@ EXTRA_DIST =
 
 libexec_PROGRAMS = indicator-messages-service
 
-STATUS_PROVIDER_API_VERSION = 1
-STATUS_PROVIDER_DIR = $(libexecdir)/status-providers/$(STATUS_PROVIDER_API_VERSION)/
-statusprovidersdir = $(STATUS_PROVIDER_DIR)
-statusproviders_LTLIBRARIES = 
 
 ######################################
 # Building the messages indicator
@@ -55,9 +51,7 @@ indicator_messages_service_SOURCES = \
 	dbus-data.h \
 	\
 	status-items.c \
-	status-items.h \
-	status-provider.c \
-	status-provider.h
+	status-items.h
 
 indicator_messages_service_CFLAGS = \
 	$(APPLET_CFLAGS) \
@@ -69,7 +63,9 @@ indicator_messages_service_CFLAGS = \
 	-DG_LOG_DOMAIN=\"Indicator-Messages\" \
 	-DSTATUS_PROVIDER_DIR=\"$(STATUS_PROVIDER_DIR)\"
 
-indicator_messages_service_LDADD = $(APPLET_LIBS)
+indicator_messages_service_LDADD = \
+	$(APPLET_LIBS) \
+	libindicator-messages-status-provider.la
 
 gen-%.xml.h: %.xml
 	@echo "Building $@ from $<"
@@ -88,6 +84,40 @@ BUILT_SOURCES += \
 EXTRA_DIST += \
 	messages-service.xml
 
+######################################
+# Status Provider Library
+######################################
+
+STATUS_PROVIDER_API_VERSION = 1
+STATUS_PROVIDER_DIR = $(libexecdir)/status-providers/$(STATUS_PROVIDER_API_VERSION)/
+statusprovidersdir = $(STATUS_PROVIDER_DIR)
+statusproviders_LTLIBRARIES = 
+
+lib_LTLIBRARIES = \
+	libindicator-messages-status-provider.la
+
+libindicator_messages_status_provider_la_HEADERS = \
+	status-provider.h
+
+libindicator_messages_status_provider_la_SOURCES = \
+	$(libindicator_messages_status_provider_HEADERS) \
+	status-provider.c
+
+libindicator_messages_status_provider_ladir = \
+	$(includedir)/libindicator-messages-status-provider-$(STATUS_PROVIDER_API_VERSION)/
+
+libindicator_messages_status_provider_la_LDFLAGS = \
+	-version-info $(STATUS_PROVIDER_API_VERSION):0:0 \
+	-no-undefined \
+	-export-symbols-regex "^[^_].*"
+
+libindicator_messages_status_provider_la_LIBADD = \
+	$(APPLET_LIBS)
+
+libindicator_messages_status_provider_la_CFLAGS = \
+	$(APPLET_CFLAGS) \
+	-Wall -Werror
+
 ######################################
 # Status provider: Pidgin
 ######################################
@@ -104,6 +134,7 @@ libpidgin_la_CFLAGS = \
 	-Wall -Werror \
 	-DG_LOG_DOMAIN=\"Status-Provider-Pidgin\"
 libpidgin_la_LIBADD = \
+	libindicator-messages-status-provider.la \
 	$(APPLET_LIBS) \
 	$(STATUS_PROVIDER_PIDGIN_LIBS)
 libpidgin_la_LDFLAGS = -module -avoid-version
@@ -141,6 +172,7 @@ libtelepathy_la_CFLAGS = \
 	-Wall -Werror \
 	-DG_LOG_DOMAIN=\"Status-Provider-Telepathy\"
 libtelepathy_la_LIBADD = \
+	libindicator-messages-status-provider.la \
 	$(APPLET_LIBS) \
 	$(STATUS_PROVIDER_TELEPATHY_LIBS)
 libtelepathy_la_LDFLAGS = -module -avoid-version
@@ -178,6 +210,7 @@ libmc5_la_CFLAGS = \
 	-Wall -Werror \
 	-DG_LOG_DOMAIN=\"Status-Provider-MC5\"
 libmc5_la_LIBADD = \
+	libindicator-messages-status-provider.la \
 	$(APPLET_LIBS) \
 	$(STATUS_PROVIDER_MC5_LIBS)
 libmc5_la_LDFLAGS = -module -avoid-version
@@ -213,6 +246,7 @@ libemesene_la_CFLAGS = \
 	-Wall -Werror \
 	-DG_LOG_DOMAIN=\"Status-Provider-Emesene\"
 libemesene_la_LIBADD = \
+	libindicator-messages-status-provider.la \
 	$(APPLET_LIBS) \
 	$(STATUS_PROVIDER_EMESENE_LIBS)
 libemesene_la_LDFLAGS = -module -avoid-version
-- 
cgit v1.2.3


From 357324760c1d7391276a25a83ecd1f83bea9aa7b Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Sat, 2 Jul 2011 10:05:14 -0500
Subject: The trailing slash makes distcheck fail.  No really.

---
 src/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index 51551ba..62159cb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -89,7 +89,7 @@ EXTRA_DIST += \
 ######################################
 
 STATUS_PROVIDER_API_VERSION = 1
-STATUS_PROVIDER_DIR = $(libexecdir)/status-providers/$(STATUS_PROVIDER_API_VERSION)/
+STATUS_PROVIDER_DIR = $(libexecdir)/status-providers/$(STATUS_PROVIDER_API_VERSION)
 statusprovidersdir = $(STATUS_PROVIDER_DIR)
 statusproviders_LTLIBRARIES = 
 
-- 
cgit v1.2.3


From 3e9685c57d9df7a353431d0b89138309816dee5b Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Fri, 8 Jul 2011 14:46:06 -0500
Subject: Making a pkgconfig file for the status providers

---
 configure.ac                                        |  1 +
 src/Makefile.am                                     | 18 +++++++++++++++++-
 src/indicator-messages-status-provider-0.5.pc.in.in | 15 +++++++++++++++
 3 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 src/indicator-messages-status-provider-0.5.pc.in.in

(limited to 'src/Makefile.am')

diff --git a/configure.ac b/configure.ac
index 95868b7..f57d7ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -159,6 +159,7 @@ AM_GLIB_GNU_GETTEXT
 AC_OUTPUT([
 Makefile
 src/Makefile
+src/indicator-messages-status-provider-0.5.pc.in
 data/Makefile
 data/icons/Makefile
 data/icons/16x16/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 62159cb..c631436 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,8 @@
 
 BUILT_SOURCES = 
 EXTRA_DIST =
+CLEANFILES = 
+DISTCLEANFILES =
 
 libexec_PROGRAMS = indicator-messages-service
 
@@ -93,6 +95,20 @@ STATUS_PROVIDER_DIR = $(libexecdir)/status-providers/$(STATUS_PROVIDER_API_VERSI
 statusprovidersdir = $(STATUS_PROVIDER_DIR)
 statusproviders_LTLIBRARIES = 
 
+EXTRA_DIST += \
+	indicator-messages-status-provider-0.5.pc.in.in
+CLEANFILES += \
+	indicator-messages-status-provider-0.5.pc
+
+pkgconfig_DATA = indicator-messages-status-provider-0.5.pc
+pkgconfigdir = $(libdir)/pkgconfig
+
+%.pc: %.pc.in
+	sed \
+		-e "s|\@status_provider_dir\@|$(STATUS_PROVIDER_DIR)|" \
+		-e "s|\@status_provider_api_version\@|$(STATUS_PROVIDER_API_VERSION)|" \
+		$< > $@
+
 lib_LTLIBRARIES = \
 	libindicator-messages-status-provider.la
 
@@ -255,6 +271,6 @@ libemesene_la_LDFLAGS = -module -avoid-version
 # Extras
 ######################################
 
-CLEANFILES = \
+CLEANFILES += \
 	$(BUILT_SOURCES)
 
diff --git a/src/indicator-messages-status-provider-0.5.pc.in.in b/src/indicator-messages-status-provider-0.5.pc.in.in
new file mode 100644
index 0000000..3fe4cf2
--- /dev/null
+++ b/src/indicator-messages-status-provider-0.5.pc.in.in
@@ -0,0 +1,15 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+bindir=@bindir@
+includedir=@includedir@
+
+statusproviderdir=@status_provider_dir@
+
+Cflags: -I${includedir}/indicator-messages-status-provider-0.@status_provider_api_version@
+Requires: gobject-2.0
+Libs: -L${libdir} -lindicator-messages-status-provider
+
+Name: indicator-messages-status-provider
+Description: Status providers for the indicator-messages menu.
+Version: @VERSION@
-- 
cgit v1.2.3