Merging in the status work branch

9 files changed, 390 insertions, 6 deletions

diff --git a/.bzrignore b/.bzrignore
index c96bb4d..22ecc23 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -40,3 +40,7 @@ gtk-logout-helper
 .libs
 src/libsession.la
 src/libsession_la-indicator-session.lo
+src/status-provider-pidgin-marshal.c
+src/status-provider-pidgin-marshal.h
+src/status-provider-telepathy-marshal.c
+src/status-provider-telepathy-marshal.h
diff --git a/configure.ac b/configure.ac
index 0baf030..ac90330 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,6 +17,8 @@ AC_PROG_LIBTOOL
 AC_SUBST(VERSION)
 AC_CONFIG_MACRO_DIR([m4])
 
+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+
 ###########################
 # Dependencies 
 ###########################
diff --git a/debian/changelog b/debian/changelog
index 62f5111..c034734 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+indicator-session (0.1~bzr17-0ubuntu1~ppa2~morestatus1) UNRELEASED; urgency=low
+
+  * Merging in the status work branch
+
+ -- Ted Gould <ted@ubuntu.com>  Sat, 22 Aug 2009 13:11:48 -0500
+
 indicator-session (0.1~bzr17-0ubuntu1~ppa1) karmic; urgency=low
 
   * Merging in trunk with rename from 'sus' to 'session'
diff --git a/src/Makefile.am b/src/Makefile.am
index bd35910..599b70a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,7 +28,13 @@ indicator_status_service_SOURCES = \
 	status-provider.h \
 	status-provider.c \
 	status-provider-pidgin.h \
-	status-provider-pidgin.c
+	status-provider-pidgin.c \
+	status-provider-pidgin-marshal.h \
+	status-provider-pidgin-marshal.c \
+	status-provider-telepathy.h \
+	status-provider-telepathy.c \
+	status-provider-telepathy-marshal.h \
+	status-provider-telepathy-marshal.c
 indicator_status_service_CFLAGS = $(STATUSSERVICE_CFLAGS) -Wall -Werror
 indicator_status_service_LDADD = $(STATUSSERVICE_LIBS)
 
@@ -46,6 +52,26 @@ status-service-server.h: $(srcdir)/status-service.xml
 		--output=status-service-server.h \
 		$(srcdir)/status-service.xml
 
+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
+
+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
+
 ###############
 # Users Stuff
 ###############
@@ -68,10 +94,16 @@ indicator_session_service_LDADD = $(SESSIONSERVICE_LIBS)
 
 BUILT_SOURCES = \
 	status-service-client.h \
-	status-service-server.h
+	status-service-server.h \
+	status-provider-pidgin-marshal.h \
+	status-provider-pidgin-marshal.c \
+	status-provider-telepathy-marshal.h \
+	status-provider-telepathy-marshal.c
 
 EXTRA_DIST = \
-	status-service.xml
+	status-service.xml \
+	status-provider-pidgin.list \
+	status-provider-telepathy.list
 
 CLEANFILES = \
 	$(BUILT_SOURCES)
diff --git a/src/status-provider-pidgin.c b/src/status-provider-pidgin.c
index aaa8732..052ce12 100644
--- a/src/status-provider-pidgin.c
+++ b/src/status-provider-pidgin.c
@@ -26,6 +26,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "status-provider.h"
 #include "status-provider-pidgin.h"
+#include "status-provider-pidgin-marshal.h"
 
 #include <dbus/dbus-glib.h>
 
@@ -101,6 +102,75 @@ status_provider_pidgin_class_init (StatusProviderPidginClass *klass)
 }
 
 static void
+type_cb (DBusGProxy * proxy, DBusGProxyCall * call, gpointer userdata)
+{
+	GError * error = NULL;
+	gint status = 0;
+	if (!dbus_g_proxy_end_call(proxy, call, &error, G_TYPE_INT, &status, G_TYPE_INVALID)) {
+		g_warning("Unable to get type from Pidgin: %s", error->message);
+		g_error_free(error);
+		return;
+	}
+
+	StatusProviderPidginPrivate * priv = STATUS_PROVIDER_PIDGIN_GET_PRIVATE(userdata);
+	if (status != priv->pg_status) {
+		priv->pg_status = status;
+
+		g_signal_emit(G_OBJECT(userdata), STATUS_PROVIDER_SIGNAL_STATUS_CHANGED_ID, 0, pg_to_sp_map[priv->pg_status], TRUE);
+	}
+
+	return;
+}
+
+static void
+saved_status_to_type (StatusProviderPidgin * spp, gint savedstatus)
+{
+	StatusProviderPidginPrivate * priv = STATUS_PROVIDER_PIDGIN_GET_PRIVATE(spp);
+
+	g_debug("Pidgin figuring out type for %d", savedstatus);
+	dbus_g_proxy_begin_call(priv->proxy,
+	                        "PurpleSavedstatusGetType", type_cb, spp, NULL,
+	                        G_TYPE_INT, savedstatus, G_TYPE_INVALID);
+
+	return;
+}
+
+static void
+savedstatus_cb (DBusGProxy * proxy, DBusGProxyCall * call, gpointer userdata)
+{
+	GError * error = NULL;
+	gint status = 0;
+	if (!dbus_g_proxy_end_call(proxy, call, &error, G_TYPE_INT, &status, G_TYPE_INVALID)) {
+		g_warning("Unable to get saved status from Pidgin: %s", error->message);
+		g_error_free(error);
+		return;
+	}
+
+	saved_status_to_type(STATUS_PROVIDER_PIDGIN(userdata), status);
+	return;
+}
+
+
+static void
+changed_status (DBusGProxy * proxy, gint savedstatus, GError ** error, StatusProviderPidgin * spp)
+{
+	saved_status_to_type(spp, savedstatus);
+	return;
+}
+
+static void
+proxy_destroy (DBusGProxy * proxy, StatusProviderPidgin * spp)
+{
+	StatusProviderPidginPrivate * priv = STATUS_PROVIDER_PIDGIN_GET_PRIVATE(spp);
+
+	priv->proxy = NULL;
+	priv->pg_status = PG_STATUS_OFFLINE;
+
+	g_signal_emit(G_OBJECT(spp), STATUS_PROVIDER_SIGNAL_STATUS_CHANGED_ID, 0, pg_to_sp_map[priv->pg_status], TRUE);
+	return;
+}
+
+static void
 status_provider_pidgin_init (StatusProviderPidgin *self)
 {
 	StatusProviderPidginPrivate * priv = STATUS_PROVIDER_PIDGIN_GET_PRIVATE(self);
@@ -121,6 +191,37 @@ status_provider_pidgin_init (StatusProviderPidgin *self)
 	if (error != NULL) {
 		g_debug("Unable to get Pidgin proxy: %s", error->message);
 		g_error_free(error);
+		return;
+	}
+
+	if (priv->proxy != NULL) {
+		g_object_add_weak_pointer (G_OBJECT(priv->proxy), (gpointer *)&priv->proxy);
+		g_signal_connect(G_OBJECT(priv->proxy), "destroy",
+		                 G_CALLBACK(proxy_destroy), self);
+
+		g_debug("Adding Pidgin Signals");
+		dbus_g_object_register_marshaller(_status_provider_pidgin_marshal_VOID__INT_INT,
+		                            G_TYPE_NONE,
+		                            G_TYPE_INT,
+		                            G_TYPE_INT,
+		                            G_TYPE_INVALID);
+		dbus_g_proxy_add_signal    (priv->proxy,
+		                            "SavedstatusChanged",
+		                            G_TYPE_INT,
+		                            G_TYPE_INT,
+		                            G_TYPE_INVALID);
+		dbus_g_proxy_connect_signal(priv->proxy,
+		                            "SavedstatusChanged",
+		                            G_CALLBACK(changed_status),
+		                            (void *)self,
+		                            NULL);
+
+		dbus_g_proxy_begin_call(priv->proxy,
+		                        "PurpleSavedstatusGetCurrent",
+		                        savedstatus_cb,
+		                        self,
+		                        NULL,
+		                        G_TYPE_INVALID);
 	}
 
 	return;
@@ -167,11 +268,79 @@ status_provider_pidgin_new (void)
 static void
 set_status (StatusProvider * sp, StatusProviderStatus status)
 {
-	g_debug("\tSetting Pidgin Status: %d", status);
+	gchar * message = "";
+
 	g_return_if_fail(IS_STATUS_PROVIDER_PIDGIN(sp));
 	StatusProviderPidginPrivate * priv = STATUS_PROVIDER_PIDGIN_GET_PRIVATE(sp);
-	pg_status_t pg_status = sp_to_pg_map[status];
-	priv->pg_status = pg_status;
+
+	g_debug("\tPidgin set status to %d", status);
+	if (priv->proxy == NULL) {
+		return;
+	}
+
+	priv->pg_status = sp_to_pg_map[status];
+	gint status_val = 0;
+	gboolean ret = FALSE;
+	GError * error = NULL;
+
+	ret = dbus_g_proxy_call(priv->proxy,
+	                        "PurpleSavedstatusFindTransientByTypeAndMessage", &error,
+							G_TYPE_INT, priv->pg_status,
+							G_TYPE_STRING, message,
+	                        G_TYPE_INVALID,
+	                        G_TYPE_INT, &status_val,
+	                        G_TYPE_INVALID);
+
+	if (!ret) {
+		if (error != NULL) {
+			g_error_free(error);
+		}
+		error = NULL;
+		status_val = 0;
+		g_debug("No Pidgin saved status to apply");
+	}
+
+	if (status_val == 0) {
+		ret = dbus_g_proxy_call(priv->proxy,
+								"PurpleSavedstatusNew", &error,
+								G_TYPE_STRING, message,
+								G_TYPE_INT, priv->pg_status,
+								G_TYPE_INVALID,
+								G_TYPE_INT, &status_val,
+								G_TYPE_INVALID);
+
+		if (!ret) {
+			status_val = 0;
+			if (error != NULL) {
+				g_warning("Unable to create Pidgin status for %d: %s", status, error->message);
+				g_error_free(error);
+			} else {
+				g_warning("Unable to create Pidgin status for %d", status);
+			}
+			error = NULL;
+		}
+	}
+
+	if (status_val == 0) {
+		return;
+	}
+
+	ret = dbus_g_proxy_call(priv->proxy,
+	                        "PurpleSavedstatusActivate", &error,
+	                        G_TYPE_INT, status_val,
+	                        G_TYPE_INVALID,
+	                        G_TYPE_INVALID);
+
+	if (!ret) {
+		if (error != NULL) {
+			g_warning("Pidgin unable to change to status: %s", error->message);
+			g_error_free(error);
+		} else {
+			g_warning("Pidgin unable to change to status");
+		}
+		error = NULL;
+	}
+
 	g_signal_emit(G_OBJECT(sp), STATUS_PROVIDER_SIGNAL_STATUS_CHANGED_ID, 0, pg_to_sp_map[priv->pg_status], TRUE);
 	return;
 }
diff --git a/src/status-provider-pidgin.list b/src/status-provider-pidgin.list
new file mode 100644
index 0000000..1f953dd
--- /dev/null
+++ b/src/status-provider-pidgin.list
@@ -0,0 +1 @@
+VOID:INT,INT
diff --git a/src/status-provider-telepathy.c b/src/status-provider-telepathy.c
new file mode 100644
index 0000000..339ede3
--- /dev/null
+++ b/src/status-provider-telepathy.c
@@ -0,0 +1,113 @@
+/*
+A small wrapper utility to load indicators and put them as menu items
+into the gnome-panel using it's applet interface.
+
+Copyright 2009 Canonical Ltd.
+
+Authors:
+    Ted Gould <ted@canonical.com>
+
+This program is free software: you can redistribute it and/or modify it 
+under the terms of the GNU General Public License version 3, as published 
+by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but 
+WITHOUT ANY WARRANTY; without even the implied warranties of 
+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along 
+with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "status-provider.h"
+#include "status-provider-telepathy.h"
+#include "status-provider-telepathy-marshal.h"
+
+#include <dbus/dbus-glib.h>
+
+
+typedef struct _StatusProviderTelepathyPrivate StatusProviderTelepathyPrivate;
+struct _StatusProviderTelepathyPrivate {
+	DBusGProxy * proxy;
+};
+
+#define STATUS_PROVIDER_TELEPATHY_GET_PRIVATE(o) \
+(G_TYPE_INSTANCE_GET_PRIVATE ((o), STATUS_PROVIDER_TELEPATHY_TYPE, StatusProviderTelepathyPrivate))
+
+/* Prototypes */
+/* GObject stuff */
+static void status_provider_telepathy_class_init (StatusProviderTelepathyClass *klass);
+static void status_provider_telepathy_init       (StatusProviderTelepathy *self);
+static void status_provider_telepathy_dispose    (GObject *object);
+static void status_provider_telepathy_finalize   (GObject *object);
+
+G_DEFINE_TYPE (StatusProviderTelepathy, status_provider_telepathy, STATUS_PROVIDER_TYPE);
+
+static void
+status_provider_telepathy_class_init (StatusProviderTelepathyClass *klass)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+	g_type_class_add_private (klass, sizeof (StatusProviderTelepathyPrivate));
+
+	object_class->dispose = status_provider_telepathy_dispose;
+	object_class->finalize = status_provider_telepathy_finalize;
+
+	//StatusProviderClass * spclass = STATUS_PROVIDER_CLASS(klass);
+
+	//spclass->set_status = set_status;
+	//spclass->get_status = get_status;
+
+	return;
+}
+
+
+static void
+status_provider_telepathy_init (StatusProviderTelepathy *self)
+{
+	//StatusProviderTelepathyPrivate * priv = STATUS_PROVIDER_TELEPATHY_GET_PRIVATE(self);
+
+	return;
+}
+
+static void
+status_provider_telepathy_dispose (GObject *object)
+{
+	StatusProviderTelepathyPrivate * priv = STATUS_PROVIDER_TELEPATHY_GET_PRIVATE(object);
+
+	if (priv->proxy != NULL) {
+		g_object_unref(priv->proxy);
+		priv->proxy = NULL;
+	}
+
+	G_OBJECT_CLASS (status_provider_telepathy_parent_class)->dispose (object);
+	return;
+}
+
+static void
+status_provider_telepathy_finalize (GObject *object)
+{
+
+	G_OBJECT_CLASS (status_provider_telepathy_parent_class)->finalize (object);
+	return;
+}
+
+/**
+	status_provider_telepathy_new:
+
+	Creates a new #StatusProviderTelepathy object.  No parameters or anything
+	like that.  Just a convience function.
+
+	Return value: A new instance of #StatusProviderTelepathy
+*/
+StatusProvider *
+status_provider_telepathy_new (void)
+{
+	return STATUS_PROVIDER(g_object_new(STATUS_PROVIDER_TELEPATHY_TYPE, NULL));
+}
+
diff --git a/src/status-provider-telepathy.h b/src/status-provider-telepathy.h
new file mode 100644
index 0000000..a67ee40
--- /dev/null
+++ b/src/status-provider-telepathy.h
@@ -0,0 +1,56 @@
+/*
+A small wrapper utility to load indicators and put them as menu items
+into the gnome-panel using it's applet interface.
+
+Copyright 2009 Canonical Ltd.
+
+Authors:
+    Ted Gould <ted@canonical.com>
+
+This program is free software: you can redistribute it and/or modify it 
+under the terms of the GNU General Public License version 3, as published 
+by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but 
+WITHOUT ANY WARRANTY; without even the implied warranties of 
+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along 
+with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __STATUS_PROVIDER_TELEPATHY_H__
+#define __STATUS_PROVIDER_TELEPATHY_H__
+
+#include <glib.h>
+#include <glib-object.h>
+
+#include "status-provider.h"
+
+G_BEGIN_DECLS
+
+#define STATUS_PROVIDER_TELEPATHY_TYPE            (status_provider_telepathy_get_type ())
+#define STATUS_PROVIDER_TELEPATHY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), STATUS_PROVIDER_TELEPATHY_TYPE, StatusProviderTelepathy))
+#define STATUS_PROVIDER_TELEPATHY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), STATUS_PROVIDER_TELEPATHY_TYPE, StatusProviderTelepathyClass))
+#define IS_STATUS_PROVIDER_TELEPATHY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), STATUS_PROVIDER_TELEPATHY_TYPE))
+#define IS_STATUS_PROVIDER_TELEPATHY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), STATUS_PROVIDER_TELEPATHY_TYPE))
+#define STATUS_PROVIDER_TELEPATHY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), STATUS_PROVIDER_TELEPATHY_TYPE, StatusProviderTelepathyClass))
+
+
+typedef struct _StatusProviderTelepathyClass StatusProviderTelepathyClass;
+struct _StatusProviderTelepathyClass {
+	StatusProviderClass parent_class;
+};
+
+typedef struct _StatusProviderTelepathy      StatusProviderTelepathy;
+struct _StatusProviderTelepathy {
+	StatusProvider parent;
+};
+
+GType status_provider_telepathy_get_type (void);
+StatusProvider * status_provider_telepathy_new (void);
+
+G_END_DECLS
+
+#endif
diff --git a/src/status-provider-telepathy.list b/src/status-provider-telepathy.list
new file mode 100644
index 0000000..5ab45bf
--- /dev/null
+++ b/src/status-provider-telepathy.list
@@ -0,0 +1 @@
+VOID:UINT,STRING