From b00bec83c75676a02eb6bebc2c51d5f0376dcf34 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Tue, 9 Jun 2009 17:00:07 -0500
Subject: Copying that code into the other two services.  Now we're dbus-y.

---
 src/session-service.c | 37 ++++++++++++++++++++++++++++++++++++-
 src/status-service.c  | 37 ++++++++++++++++++++++++++++++++++++-
 2 files changed, 72 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/session-service.c b/src/session-service.c
index 63590c7..7a2ad27 100644
--- a/src/session-service.c
+++ b/src/session-service.c
@@ -1,7 +1,42 @@
 
+#include <dbus/dbus-glib.h>
+#include <dbus/dbus-glib-bindings.h>
+
+#include <libdbusmenu-glib/server.h>
+#include <libdbusmenu-glib/menuitem.h>
+
+#include "dbus-shared-names.h"
+
+static DbusmenuMenuitem * root_menuitem = NULL;
+static GMainLoop * mainloop = NULL;
+
 int
 main (int argc, char ** argv)
 {
+    g_type_init();
+
+    DBusGConnection * connection = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
+    DBusGProxy * bus_proxy = dbus_g_proxy_new_for_name(connection, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS);
+    GError * error = NULL;
+    guint nameret = 0;
 
-	return 0;
+    if (!org_freedesktop_DBus_request_name(bus_proxy, INDICATOR_SESSION_DBUS_NAME, 0, &nameret, &error)) {
+        g_error("Unable to call to request name");
+        return 1;
+    }   
+
+    if (nameret != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
+        g_error("Unable to get name");
+        return 1;
+    }   
+
+    root_menuitem = dbusmenu_menuitem_new();
+    DbusmenuServer * server = dbusmenu_server_new(INDICATOR_SESSION_DBUS_OBJECT);
+    dbusmenu_server_set_root(server, root_menuitem);
+
+    mainloop = g_main_loop_new(NULL, FALSE);
+    g_main_loop_run(mainloop);
+
+    return 0;
 }
+
diff --git a/src/status-service.c b/src/status-service.c
index 63590c7..19bee49 100644
--- a/src/status-service.c
+++ b/src/status-service.c
@@ -1,7 +1,42 @@
 
+#include <dbus/dbus-glib.h>
+#include <dbus/dbus-glib-bindings.h>
+
+#include <libdbusmenu-glib/server.h>
+#include <libdbusmenu-glib/menuitem.h>
+
+#include "dbus-shared-names.h"
+
+static DbusmenuMenuitem * root_menuitem = NULL;
+static GMainLoop * mainloop = NULL;
+
 int
 main (int argc, char ** argv)
 {
+    g_type_init();
+
+    DBusGConnection * connection = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
+    DBusGProxy * bus_proxy = dbus_g_proxy_new_for_name(connection, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS);
+    GError * error = NULL;
+    guint nameret = 0;
 
-	return 0;
+    if (!org_freedesktop_DBus_request_name(bus_proxy, INDICATOR_STATUS_DBUS_NAME, 0, &nameret, &error)) {
+        g_error("Unable to call to request name");
+        return 1;
+    }   
+
+    if (nameret != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
+        g_error("Unable to get name");
+        return 1;
+    }   
+
+    root_menuitem = dbusmenu_menuitem_new();
+    DbusmenuServer * server = dbusmenu_server_new(INDICATOR_STATUS_DBUS_OBJECT);
+    dbusmenu_server_set_root(server, root_menuitem);
+
+    mainloop = g_main_loop_new(NULL, FALSE);
+    g_main_loop_run(mainloop);
+
+    return 0;
 }
+
-- 
cgit v1.2.3