Merge lp:~ted/indicator-applet/messages-dbusmenu into lp:indicator-applet/messages0.2

[Ted Gould]

=== modified file '.bzrignore'
--- .bzrignore	2009-05-26 12:46:56 +0000
+++ .bzrignore	2009-05-28 15:29:41 +0000
@@ -18,3 +18,4 @@
 src/libmessaging_la-app-menu-item.lo
 data/indicator-messages.service
 indicator-messages-service
+indicator-messages-service-activate
 
=== modified file 'data/Makefile.am'
--- data/Makefile.am	2009-05-26 12:37:53 +0000
+++ data/Makefile.am	2009-05-27 10:51:24 +0000
@@ -1,4 +1,4 @@
 SUBDIRS = icons
 
-dbus_servicesdir = $(dbusservicedir)
+dbus_servicesdir = $(DBUSSERVICEDIR)
 dbus_services_DATA = indicator-messages.service
 
=== modified file 'data/indicator-messages.service.in'
--- data/indicator-messages.service.in	2009-05-26 12:24:24 +0000
+++ data/indicator-messages.service.in	2009-05-28 15:33:26 +0000
@@ -1,3 +1,3 @@
-[Indicator Messages]
+[D-BUS Service]
 Name=com.ubuntu.indicator.messages
 Exec=@prefix@/bin/indicator-messages-service
 
=== modified file 'src/Makefile.am'
--- src/Makefile.am	2009-05-26 12:46:56 +0000
+++ src/Makefile.am	2009-05-28 15:19:48 +0000
@@ -4,10 +4,10 @@
 messaginglibdir = $(INDICATORDIR)
 messaginglib_LTLIBRARIES = libmessaging.la
 libmessaging_la_SOURCES = indicator-messages.c im-menu-item.c im-menu-item.h app-menu-item.c app-menu-item.h
-libmessaging_la_CFLAGS = $(APPLET_CFLAGS) -Wall -Wl,-Bsymbolic-functions -Wl,-z,defs -Wl,--as-needed
+libmessaging_la_CFLAGS = $(APPLET_CFLAGS) -Wall -Wl,-Bsymbolic-functions -Wl,-z,defs -Wl,--as-needed -Werror
 libmessaging_la_LIBADD = $(APPLET_LIBS)
 libmessaging_la_LDFLAGS = -module -avoid-version
 
 indicator_messages_service_SOURCES = indicator-service.c im-menu-item.c im-menu-item.h app-menu-item.c app-menu-item.h
-indicator_messages_service_CFLAGS = $(APPLET_CFLAGS) -Wall -Wl,-Bsymbolic-functions -Wl,-z,defs -Wl,--as-needed
+indicator_messages_service_CFLAGS = $(APPLET_CFLAGS) -Wall -Wl,-Bsymbolic-functions -Wl,-z,defs -Wl,--as-needed -Werror
 indicator_messages_service_LDADD = $(APPLET_LIBS)
 
=== modified file 'src/indicator-messages.c'
--- src/indicator-messages.c	2009-05-25 22:43:17 +0000
+++ src/indicator-messages.c	2009-05-28 15:20:23 +0000
@@ -23,6 +23,8 @@
 #include <string.h>
 #include <gtk/gtk.h>
 #include <libdbusmenu-gtk/menu.h>
+#include <dbus/dbus-glib.h>
+#include <dbus/dbus-glib-bindings.h>
 
 #include <libindicator/indicator.h>
 INDICATOR_SET_VERSION
@@ -57,6 +59,23 @@
 GtkMenu *
 get_menu (void)
 {
+	guint returnval = 0;
+	GError * error = NULL;
+
+	DBusGConnection * connection = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
+	DBusGProxy * proxy = dbus_g_proxy_new_for_name(connection, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS);
+
+	if (!org_freedesktop_DBus_start_service_by_name (proxy, INDICATOR_MESSAGES_DBUS_NAME, 0, &returnval, &error)) {
+		g_error("Unable to send message to DBus to start service: %s", error != NULL ? error->message : "(NULL error)" );
+		g_error_free(error);
+		return NULL;
+	}
+
+	if (returnval != DBUS_START_REPLY_SUCCESS && returnval != DBUS_START_REPLY_ALREADY_RUNNING) {
+		g_error("Return value isn't indicative of success: %d", returnval);
+		return NULL;
+	}
+
 	return GTK_MENU(dbusmenu_gtkmenu_new(INDICATOR_MESSAGES_DBUS_NAME, INDICATOR_MESSAGES_DBUS_OBJECT));
 }
 
 
=== modified file 'src/indicator-service.c'
--- src/indicator-service.c	2009-05-26 16:05:48 +0000
+++ src/indicator-service.c	2009-05-27 08:44:37 +0000
@@ -21,6 +21,7 @@
 */
 
 #include <string.h>
+#include <dbus/dbus-glib-bindings.h>
 #include <libindicate/listener.h>
 
 #include <libdbusmenu-glib/server.h>
@@ -292,14 +293,6 @@
 }
 
 static void
-dbusmenu_menuitem_child_reorder(DbusmenuMenuitem * base, DbusmenuMenuitem * child, guint position)
-{
-	dbusmenu_menuitem_child_delete(base, child);
-	dbusmenu_menuitem_child_add_position(base, child, position);
-	return;
-}
-
-static void
 reconsile_list_and_menu (GList * serverlist, DbusmenuMenuitem * menushell)
 {
 	guint position = 0;
@@ -477,6 +470,21 @@
 {
 	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;
+
+	if (!org_freedesktop_DBus_request_name(bus_proxy, INDICATOR_MESSAGES_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;
+	}
+
 	listener = indicate_listener_ref_default();
 	serverList = NULL;
 
 
=== added directory 'test'
=== added file 'test/indicator-messages-service-activate.build.sh'
--- test/indicator-messages-service-activate.build.sh	1970-01-01 00:00:00 +0000
+++ test/indicator-messages-service-activate.build.sh	2009-05-28 15:29:41 +0000
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+gcc -o indicator-messages-service-activate indicator-messages-service-activate.c `pkg-config --cflags --libs dbus-1 dbus-glib-1`
 
=== added file 'test/indicator-messages-service-activate.c'
--- test/indicator-messages-service-activate.c	1970-01-01 00:00:00 +0000
+++ test/indicator-messages-service-activate.c	2009-05-28 15:29:41 +0000
@@ -0,0 +1,53 @@
+/*
+An indicator to show information that is in messaging applications
+that the user is using.
+
+Copyright 2009 Canonical Ltd.
+
+Authors:
+    Ted Gould <[e-mail]>
+
+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/>.
+*/
+
+#include <string.h>
+#include <dbus/dbus-glib.h>
+#include <dbus/dbus-glib-bindings.h>
+#include "../src/dbus-data.h"
+
+int
+main (int argc, char ** argv)
+{
+	g_type_init();
+
+	guint returnval = 0;
+	GError * error = NULL;
+
+	DBusGConnection * connection = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
+	DBusGProxy * proxy = dbus_g_proxy_new_for_name(connection, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS);
+
+	g_debug("Activating service: %s", INDICATOR_MESSAGES_DBUS_NAME);
+	if (!org_freedesktop_DBus_start_service_by_name (proxy, INDICATOR_MESSAGES_DBUS_NAME, 0, &returnval, &error)) {
+		g_error("Unable to send message to DBus to start service: %s", error != NULL ? error->message : "(NULL error)" );
+		g_error_free(error);
+		return 1;
+	}
+
+	if (returnval != DBUS_START_REPLY_SUCCESS && returnval != DBUS_START_REPLY_ALREADY_RUNNING) {
+		g_error("Return value isn't indicative of success: %d", returnval);
+		return 1;
+	}
+
+	return 0;
+}
+