ayatana-commits team mailing list archive

[Ted Gould <ted@xxxxxxxx>]

Ted Gould has proposed merging lp:~ted/libindicate/com-canonical into lp:libindicate with lp:~ted/libindicate/gdbus-port-away as a prerequisite.

Requested reviews:
  Indicator Applet Developers (indicator-applet-developers)

For more details, see:
https://code.launchpad.net/~ted/libindicate/com-canonical/+merge/46204

com.canonical
-- 
https://code.launchpad.net/~ted/libindicate/com-canonical/+merge/46204
Your team ayatana-commits is subscribed to branch lp:libindicate.

=== modified file 'libindicate/dbus-shared.h'
--- libindicate/dbus-shared.h	2011-01-13 22:58:55 +0000
+++ libindicate/dbus-shared.h	2011-01-13 22:58:56 +0000
@@ -28,8 +28,8 @@
 #ifndef INDICATE_DBUS_SHARED
 #define INDICATE_DBUS_SHARED
 
-#define  INDICATE_DBUS_IFACE            "org.ayatana.indicate"
-#define  INDICATE_LISTENER_DBUS_IFACE   "org.ayatana.indicate.listener"
-#define  INDICATE_LISTENER_OBJ_PATH     "/org/ayatana/indicate/listener"
+#define  INDICATE_DBUS_IFACE            "com.canonical.indicate"
+#define  INDICATE_LISTENER_DBUS_IFACE   "com.canonical.indicate.listener"
+#define  INDICATE_LISTENER_OBJ_PATH     "/com/canonical/indicate/listener"
 
 #endif /* INDICATE_DBUS_SHARED */

=== modified file 'libindicate/indicate-interface.xml'
--- libindicate/indicate-interface.xml	2010-02-04 22:41:43 +0000
+++ libindicate/indicate-interface.xml	2011-01-13 22:58:56 +0000
@@ -28,7 +28,7 @@
 <http://www.gnu.org/licenses/>
 -->
 <node name="/">
-	<interface name="org.ayatana.indicate">
+	<interface name="com.canonical.indicate">
 
 <!-- Properties -->
 		<property name="desktop" type="s" access="read" />

=== modified file 'libindicate/indicate-listener.xml'
--- libindicate/indicate-listener.xml	2010-02-03 06:25:49 +0000
+++ libindicate/indicate-listener.xml	2011-01-13 22:58:56 +0000
@@ -28,7 +28,7 @@
 <http://www.gnu.org/licenses/>
 -->
 <node name="/">
-	<interface name="org.ayatana.indicate.listener">
+	<interface name="com.canonical.indicate.listener">
 
 <!-- Functions -->
 		<method name="GetIndicatorServers">

=== modified file 'libindicate/server.c'
--- libindicate/server.c	2011-01-13 22:58:55 +0000
+++ libindicate/server.c	2011-01-13 22:58:56 +0000
@@ -484,7 +484,7 @@
 
 	IndicateServerPrivate * priv = INDICATE_SERVER_GET_PRIVATE(server);
 
-	priv->path = g_strdup("/org/ayatana/indicate");
+	priv->path = g_strdup("/com/canonical/indicate");
 	priv->indicators = NULL;
 	priv->num_hidden = 0;
 	priv->visible = FALSE;