* Updating to the libindicate 0.3.0 API

* debian/control: Upping the libindicator-dev version to >= 0.3.0~dev
* debian/patches/01_locking_on_autologin.patch as it doesn't
  apply.

5 files changed, 97 insertions, 28 deletions

diff --git a/configure.ac b/configure.ac
index 340177e..536b5af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 ###########################
 
 GTK_REQUIRED_VERSION=2.12
-INDICATOR_REQUIRED_VERSION=0.2.0
+INDICATOR_REQUIRED_VERSION=0.3.0
 DBUSMENUGTK_REQUIRED_VERSION=0.1.1
 POLKIT_REQUIRED_VERSION=0.92
 
diff --git a/debian/changelog b/debian/changelog
index b5afa77..3e1863e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+indicator-session (0.2.0~dev-0ubuntu1~ppa1) UNRELEASED; urgency=low
+
+  * Updating to the libindicate 0.3.0 API
+  * debian/control: Upping the libindicator-dev version to >= 0.3.0~dev
+  * debian/patches/01_locking_on_autologin.patch as it doesn't
+    apply.
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 05 Nov 2009 09:19:25 -0600
+
 indicator-session (0.1.7-0ubuntu3~ppa1) karmic; urgency=low
 
   * Listen on DBus for MissionControl coming on and off the bus
diff --git a/debian/control b/debian/control
index 57aba13..a4f2be7 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5.0),
                libdbus-glib-1-dev,
                gnome-doc-utils,
                scrollkeeper,
-               libindicator-dev,
+               libindicator-dev (>= 0.3.0~dev),
                libdbusmenu-glib-dev (>= 0.1.2),
                libdbusmenu-gtk-dev (>= 0.1.2),
                libpolkit-gobject-1-dev,
diff --git a/debian/patches/01_locking_on_autologin.patch b/debian/patches/01_locking_on_autologin.patch
deleted file mode 100644
index 88b255f..0000000
--- a/debian/patches/01_locking_on_autologin.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Nur -x '*.orig' -x '*~' indicator-session-0.1.7/src/lock-helper.c indicator-session-0.1.7.new/src/lock-helper.c
---- indicator-session-0.1.7/src/lock-helper.c	2009-10-14 19:15:55.000000000 +0200
-+++ indicator-session-0.1.7.new/src/lock-helper.c	2009-10-14 19:16:16.000000000 +0200
-@@ -130,9 +130,11 @@
- gboolean
- will_lock_screen (void)
- {
-+/*
- 	if (gdm_auto_login) {
- 		return FALSE;
- 	}
-+*/
- 	if (is_guest) {
- 		return FALSE;
- 	}
diff --git a/src/indicator-session.c b/src/indicator-session.c
index c22aa1c..410ad12 100644
--- a/src/indicator-session.c
+++ b/src/indicator-session.c
@@ -20,7 +20,8 @@ You should have received a copy of the GNU General Public License along
 with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
+#include <glib.h>
+#include <glib-object.h>
 #include <gtk/gtk.h>
 #include <libdbusmenu-gtk/client.h>
 
@@ -28,12 +29,36 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <dbus/dbus-glib-bindings.h>
 
 #include <libindicator/indicator.h>
-INDICATOR_SET_VERSION
-INDICATOR_SET_NAME("users-status-session")
+#include <libindicator/indicator-object.h>
 
 #include "dbus-shared-names.h"
 #include "status-service-client.h"
 
+#define INDICATOR_SESSION_TYPE            (indicator_session_get_type ())
+#define INDICATOR_SESSION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), INDICATOR_SESSION_TYPE, IndicatorSession))
+#define INDICATOR_SESSION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), INDICATOR_SESSION_TYPE, IndicatorSessionClass))
+#define IS_INDICATOR_SESSION(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), INDICATOR_SESSION_TYPE))
+#define IS_INDICATOR_SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), INDICATOR_SESSION_TYPE))
+#define INDICATOR_SESSION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), INDICATOR_SESSION_TYPE, IndicatorSessionClass))
+
+typedef struct _IndicatorSession      IndicatorSession;
+typedef struct _IndicatorSessionClass IndicatorSessionClass;
+
+struct _IndicatorSessionClass {
+	IndicatorObjectClass parent_class;
+};
+
+struct _IndicatorSession {
+	IndicatorObject parent;
+};
+
+GType indicator_session_get_type (void);
+
+/* Indicator stuff */
+INDICATOR_SET_VERSION
+INDICATOR_SET_TYPE(INDICATOR_SESSION_TYPE)
+
+/* Globals */
 static DbusmenuGtkClient * status_client = NULL;
 static DbusmenuGtkClient * users_client = NULL;
 static DbusmenuGtkClient * session_client = NULL;
@@ -57,6 +82,7 @@ typedef enum {
 	END_OF_SECTIONS
 } section_t;
 
+/* Prototypes */
 static void child_added (DbusmenuMenuitem * parent, DbusmenuMenuitem * child, guint position, gpointer section);
 static guint status_menu_pos_offset (void);
 static guint users_menu_pos_offset (void);
@@ -64,17 +90,66 @@ static guint session_menu_pos_offset (void);
 static void child_realized (DbusmenuMenuitem * child, gpointer userdata);
 static gboolean start_service (gpointer userdata);
 static void start_service_phase2 (DBusGProxy * proxy, guint status, GError * error, gpointer data);
+static GtkLabel * get_label (IndicatorObject * io);
+static GtkImage * get_icon (IndicatorObject * io);
+static GtkMenu * get_menu (IndicatorObject * io);
 
-GtkLabel *
-get_label (void)
+static void indicator_session_class_init (IndicatorSessionClass *klass);
+static void indicator_session_init       (IndicatorSession *self);
+static void indicator_session_dispose    (GObject *object);
+static void indicator_session_finalize   (GObject *object);
+
+G_DEFINE_TYPE (IndicatorSession, indicator_session, INDICATOR_OBJECT_TYPE);
+
+static void
+indicator_session_class_init (IndicatorSessionClass *klass)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+	object_class->dispose = indicator_session_dispose;
+	object_class->finalize = indicator_session_finalize;
+
+	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;
+
+	return;
+}
+
+static void
+indicator_session_init (IndicatorSession *self)
+{
+
+	return;
+}
+
+static void
+indicator_session_dispose (GObject *object)
+{
+
+	G_OBJECT_CLASS (indicator_session_parent_class)->dispose (object);
+	return;
+}
+
+static void
+indicator_session_finalize (GObject *object)
+{
+
+	G_OBJECT_CLASS (indicator_session_parent_class)->finalize (object);
+	return;
+}
+
+static GtkLabel *
+get_label (IndicatorObject * io)
 {
 	GtkLabel * returnval = GTK_LABEL(gtk_label_new(g_get_user_name()));
 	gtk_widget_show(GTK_WIDGET(returnval));
 	return returnval;
 }
 
-GtkImage *
-get_icon (void)
+static GtkImage *
+get_icon (IndicatorObject * io)
 {
 	g_debug("Changing status icon: '%s'", "system-shutdown-panel");
 	status_image = GTK_IMAGE(gtk_image_new_from_icon_name("system-shutdown-panel", GTK_ICON_SIZE_MENU));
@@ -260,7 +335,7 @@ status_menu_root_changed(DbusmenuGtkClient * client, DbusmenuMenuitem * newroot,
 	return;
 }
 
-void
+static void
 status_icon_cb (DBusGProxy * proxy, char * icons, GError *error, gpointer userdata)
 {
 	g_return_if_fail(status_image != NULL);
@@ -273,7 +348,7 @@ status_icon_cb (DBusGProxy * proxy, char * icons, GError *error, gpointer userda
 	return;
 }
 
-void
+static void
 status_icon_changed (DBusGProxy * proxy, gchar * icon, gpointer userdata)
 {
 	return status_icon_cb(proxy, icon, NULL, NULL);
@@ -540,8 +615,8 @@ start_service (gpointer userdata)
 /* Indicator based function to get the menu for the whole
    applet.  This starts up asking for the parts of the menu
    from the various services. */
-GtkMenu *
-get_menu (void)
+static GtkMenu *
+get_menu (IndicatorObject * io)
 {
 	connection = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
 	proxy = dbus_g_proxy_new_for_name(connection, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS);