aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTed Gould <ted@canonical.com>2009-06-09 17:00:07 -0500
committerTed Gould <ted@canonical.com>2009-06-09 17:00:07 -0500
commitb00bec83c75676a02eb6bebc2c51d5f0376dcf34 (patch)
tree855cd519f17672d1450335900d19f040ba5554ee /src
parent21cc4e9079d0cf6b13f8232f10a265ce64fd260c (diff)
downloadayatana-indicator-session-b00bec83c75676a02eb6bebc2c51d5f0376dcf34.tar.gz
ayatana-indicator-session-b00bec83c75676a02eb6bebc2c51d5f0376dcf34.tar.bz2
ayatana-indicator-session-b00bec83c75676a02eb6bebc2c51d5f0376dcf34.zip
Copying that code into the other two services. Now we're dbus-y.
Diffstat (limited to 'src')
-rw-r--r--src/session-service.c37
-rw-r--r--src/status-service.c37
2 files changed, 72 insertions, 2 deletions
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;
}
+