libindicate

Merge lp:~ted/libindicate/com-canonical into lp:libindicate/0.6

  1. com-canonical
  2. Merge into trunk
Proposed by Ted Gould
Status: Merged
Merged at revision: 397
Proposed branch: lp:~ted/libindicate/com-canonical
Merge into: lp:libindicate/0.6
Prerequisite: lp:~ted/libindicate/gdbus-port-away
Diff against target: 54 lines (+6/-6)
4 files modified
libindicate/dbus-shared.h (+3/-3)
libindicate/indicate-interface.xml (+1/-1)
libindicate/indicate-listener.xml (+1/-1)
libindicate/server.c (+1/-1)
To merge this branch: bzr merge lp:~ted/libindicate/com-canonical
Reviewer Review Type Date Requested Status
Conor Curran (community) Approve
Review via email: mp+46204@code.launchpad.net

Description of the change

com.canonical

To post a comment you must log in.
Revision history for this message
Conor Curran (cjcurran) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libindicate/dbus-shared.h'
2--- libindicate/dbus-shared.h 2011-01-13 22:58:55 +0000
3+++ libindicate/dbus-shared.h 2011-01-13 22:58:56 +0000
4@@ -28,8 +28,8 @@
5 #ifndef INDICATE_DBUS_SHARED
6 #define INDICATE_DBUS_SHARED
7
8-#define INDICATE_DBUS_IFACE "org.ayatana.indicate"
9-#define INDICATE_LISTENER_DBUS_IFACE "org.ayatana.indicate.listener"
10-#define INDICATE_LISTENER_OBJ_PATH "/org/ayatana/indicate/listener"
11+#define INDICATE_DBUS_IFACE "com.canonical.indicate"
12+#define INDICATE_LISTENER_DBUS_IFACE "com.canonical.indicate.listener"
13+#define INDICATE_LISTENER_OBJ_PATH "/com/canonical/indicate/listener"
14
15 #endif /* INDICATE_DBUS_SHARED */
16
17=== modified file 'libindicate/indicate-interface.xml'
18--- libindicate/indicate-interface.xml 2010-02-04 22:41:43 +0000
19+++ libindicate/indicate-interface.xml 2011-01-13 22:58:56 +0000
20@@ -28,7 +28,7 @@
21 <http://www.gnu.org/licenses/>
22 -->
23 <node name="/">
24- <interface name="org.ayatana.indicate">
25+ <interface name="com.canonical.indicate">
26
27 <!-- Properties -->
28 <property name="desktop" type="s" access="read" />
29
30=== modified file 'libindicate/indicate-listener.xml'
31--- libindicate/indicate-listener.xml 2010-02-03 06:25:49 +0000
32+++ libindicate/indicate-listener.xml 2011-01-13 22:58:56 +0000
33@@ -28,7 +28,7 @@
34 <http://www.gnu.org/licenses/>
35 -->
36 <node name="/">
37- <interface name="org.ayatana.indicate.listener">
38+ <interface name="com.canonical.indicate.listener">
39
40 <!-- Functions -->
41 <method name="GetIndicatorServers">
42
43=== modified file 'libindicate/server.c'
44--- libindicate/server.c 2011-01-13 22:58:55 +0000
45+++ libindicate/server.c 2011-01-13 22:58:56 +0000
46@@ -484,7 +484,7 @@
47
48 IndicateServerPrivate * priv = INDICATE_SERVER_GET_PRIVATE(server);
49
50- priv->path = g_strdup("/org/ayatana/indicate");
51+ priv->path = g_strdup("/com/canonical/indicate");
52 priv->indicators = NULL;
53 priv->num_hidden = 0;
54 priv->visible = FALSE;

Subscribers

People subscribed via source and target branches

to all changes: