Network Menu

Merge lp:~kvalo/indicator-network/bug-735413 into lp:~indicator-applet-developers/indicator-network/indicator-network

  1. bug-735413
  2. Merge into indicator-network
Proposed by Kalle Valo
Status: Merged
Merged at revision: 171
Proposed branch: lp:~kvalo/indicator-network/bug-735413
Merge into: lp:~indicator-applet-developers/indicator-network/indicator-network
Diff against target: 216 lines (+28/-42)
12 files modified
data/indicator-network-agent.service.in (+1/-1)
data/indicator-network.service.in (+1/-1)
scripts/indicator-network-debug (+6/-6)
src/common/dbus-shared-names.h (+9/-23)
src/common/indicator-network-agent.xml (+2/-2)
src/common/indicator-network-service.xml (+1/-1)
tests/connman-mock/connman-create-service (+1/-1)
tests/connman-mock/connman-mock (+2/-2)
tests/connman-mock/connman-remove-service (+1/-1)
tests/connman-mock/ofono-create-modem (+1/-1)
tests/connman-mock/ofono-mock (+2/-2)
tests/connman-mock/ofono-remove-modem (+1/-1)
To merge this branch: bzr merge lp:~kvalo/indicator-network/bug-735413
Reviewer Review Type Date Requested Status
Mikkel Kamstrup Erlandsen (community) Approve
Review via email: mp+53749@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Mikkel Kamstrup Erlandsen (kamstrup) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/indicator-network-agent.service.in'
2--- data/indicator-network-agent.service.in 2010-07-28 19:36:57 +0000
3+++ data/indicator-network-agent.service.in 2011-03-17 07:39:48 +0000
4@@ -1,3 +1,3 @@
5 [D-BUS Service]
6-Name=org.ayatana.indicator.network.agent
7+Name=com.canonical.indicator.network.agent
8 Exec=@libexecdir@/indicator-network-agent
9
10=== modified file 'data/indicator-network.service.in'
11--- data/indicator-network.service.in 2010-05-19 07:49:00 +0000
12+++ data/indicator-network.service.in 2011-03-17 07:39:48 +0000
13@@ -1,3 +1,3 @@
14 [D-BUS Service]
15-Name=org.ayatana.indicator.network
16+Name=com.canonical.indicator.network
17 Exec=@libexecdir@/indicator-network-service
18
19=== modified file 'scripts/indicator-network-debug'
20--- scripts/indicator-network-debug 2011-01-31 08:50:13 +0000
21+++ scripts/indicator-network-debug 2011-03-17 07:39:48 +0000
22@@ -19,9 +19,9 @@
23 ;;
24 esac
25
26- dbus-send --session --dest=org.ayatana.indicator.network \
27- /org/ayatana/indicator/network/service \
28- org.ayatana.indicator.network.SetDebug int32:$level
29+ dbus-send --session --dest=com.canonical.indicator.network \
30+ /com/canonical/indicator/network/service \
31+ com.canonical.indicator.network.SetDebug int32:$level
32 }
33
34 agent_debug() {
35@@ -38,9 +38,9 @@
36 ;;
37 esac
38
39- dbus-send --session --dest=org.ayatana.indicator.network.agent \
40- /org/ayatana/indicator/network/agent \
41- org.ayatana.indicator.network.agent.SetDebug int32:$level
42+ dbus-send --session --dest=com.canonical.indicator.network.agent \
43+ /com/canonical/indicator/network/agent \
44+ com.canonical.indicator.network.agent.SetDebug int32:$level
45 }
46
47 start() {
48
49=== modified file 'src/common/dbus-shared-names.h'
50--- src/common/dbus-shared-names.h 2011-03-09 08:19:55 +0000
51+++ src/common/dbus-shared-names.h 2011-03-17 07:39:48 +0000
52@@ -21,35 +21,21 @@
53 #ifndef __DBUS_SHARED_NAMES_H__
54 #define __DBUS_SHARED_NAMES_H__ 1
55
56-#define INDICATOR_STATUS_DBUS_NAME "org.ayatana.indicator.status"
57-#define INDICATOR_STATUS_DBUS_OBJECT "/org/ayatana/indicator/status/menu"
58-#define INDICATOR_STATUS_SERVICE_DBUS_OBJECT "/org/ayatana/indicator/status/service"
59-#define INDICATOR_STATUS_SERVICE_DBUS_INTERFACE "org.ayatana.indicator.status.service"
60-
61-#define INDICATOR_USERS_DBUS_NAME "org.ayatana.indicator.users"
62-#define INDICATOR_USERS_DBUS_OBJECT "/org/ayatana/indicator/users/menu"
63-#define INDICATOR_USERS_SERVICE_DBUS_OBJECT "/org/gnome/DisplayManager/UserManager"
64-#define INDICATOR_USERS_SERVICE_DBUS_INTERFACE "org.gnome.DisplayManager.UserManager"
65-
66-#define INDICATOR_SESSION_DBUS_NAME "org.ayatana.indicator.session"
67-#define INDICATOR_SESSION_DBUS_OBJECT "/org/ayatana/indicator/session/menu"
68-#define INDICATOR_SESSION_DBUS_VERSION 0
69-
70-#define INDICATOR_NETWORK_DBUS_NAME "org.ayatana.indicator.network"
71-#define INDICATOR_NETWORK_DBUS_OBJECT "/org/ayatana/indicator/network/menu"
72+#define INDICATOR_NETWORK_DBUS_NAME "com.canonical.indicator.network"
73+#define INDICATOR_NETWORK_DBUS_OBJECT "/com/canonical/indicator/network/menu"
74 #define INDICATOR_NETWORK_SERVICE_DBUS_OBJECT "/"
75-#define INDICATOR_NETWORK_SERVICE_DBUS_INTERFACE "org.ayatana.indicator.network.BackendManager"
76+#define INDICATOR_NETWORK_SERVICE_DBUS_INTERFACE "com.canonical.indicator.network.BackendManager"
77 #define INDICATOR_NETWORK_DBUS_VERSION 0
78
79-#define INDICATOR_NETWORK_BACKEND_NAME "org.ayatana.indicator.network.backend"
80-#define INDICATOR_NETWORK_BACKEND_MANAGER_PATH "/org/ayatana/indicator/network/backend/manager"
81-#define INDICATOR_NETWORK_BACKEND_INTERFACE "org.ayatana.indicator.network.backend"
82+#define INDICATOR_NETWORK_BACKEND_NAME "com.canonical.indicator.network.backend"
83+#define INDICATOR_NETWORK_BACKEND_MANAGER_PATH "/com/canonical/indicator/network/backend/manager"
84+#define INDICATOR_NETWORK_BACKEND_INTERFACE "com.canonical.indicator.network.backend"
85 #define INDICATOR_NETWORK_BACKEND_MANAGER_INTERFACE \
86 INDICATOR_NETWORK_BACKEND_INTERFACE ".Manager"
87
88-#define INDICATOR_NETWORK_AGENT_NAME "org.ayatana.indicator.network.agent"
89-#define INDICATOR_NETWORK_AGENT_OBJECT "/org/ayatana/indicator/network/agent"
90-#define INDICATOR_NETWORK_AGENT_INTERFACE "org.ayatana.indicator.network.agent"
91+#define INDICATOR_NETWORK_AGENT_NAME "com.canonical.indicator.network.agent"
92+#define INDICATOR_NETWORK_AGENT_OBJECT "/com/canonical/indicator/network/agent"
93+#define INDICATOR_NETWORK_AGENT_INTERFACE "com.canonical.indicator.network.agent"
94
95 #define INDICATOR_NETWORK_SIGNAL_ICON_CHANGED "IconChanged"
96 #define INDICATOR_NETWORK_SIGNAL_ACCESSIBLE_DESC_CHANGED "AccessibleDescChanged"
97
98=== modified file 'src/common/indicator-network-agent.xml'
99--- src/common/indicator-network-agent.xml 2010-11-04 10:22:03 +0000
100+++ src/common/indicator-network-agent.xml 2011-03-17 07:39:48 +0000
101@@ -1,6 +1,6 @@
102 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
103-<node name="/org/ayatana/indicator/network.agent">
104- <interface name="org.ayatana.indicator.network.agent">
105+<node name="/com/canonical/indicator/network.agent">
106+ <interface name="com.canonical.indicator.network.agent">
107 <method name="Start">
108 <annotation name="org.freedesktop.DBus.GLib.CSymbol"
109 value="network_agent_start"/>
110
111=== modified file 'src/common/indicator-network-service.xml'
112--- src/common/indicator-network-service.xml 2011-02-15 06:58:05 +0000
113+++ src/common/indicator-network-service.xml 2011-03-17 07:39:48 +0000
114@@ -1,6 +1,6 @@
115 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
116 <node name="/">
117- <interface name="org.ayatana.indicator.network.backend.Manager">
118+ <interface name="com.canonical.indicator.network.backend.Manager">
119 <method name="GetIcon">
120 <annotation name="org.freedesktop.DBus.GLib.CSymbol"
121 value="manager_proxy_get_icon"/>
122
123=== modified file 'tests/connman-mock/connman-create-service'
124--- tests/connman-mock/connman-create-service 2010-11-30 07:33:12 +0000
125+++ tests/connman-mock/connman-create-service 2011-03-17 07:39:48 +0000
126@@ -40,7 +40,7 @@
127
128 bus = dbus.SystemBus()
129 manager = dbus.Interface(bus.get_object("net.connman", "/"),
130- "org.ayatana.connman.mock.Manager")
131+ "com.canonical.connman.mock.Manager")
132
133 while count > 0:
134 path = manager.CreateService(service_type)
135
136=== modified file 'tests/connman-mock/connman-mock'
137--- tests/connman-mock/connman-mock 2011-02-09 08:37:06 +0000
138+++ tests/connman-mock/connman-mock 2011-03-17 07:39:48 +0000
139@@ -440,7 +440,7 @@
140 def PropertyChanged(self, prop, val):
141 pass
142
143- @dbus.service.method("org.ayatana.connman.mock.Manager",
144+ @dbus.service.method("com.canonical.connman.mock.Manager",
145 in_signature="s", out_signature="o")
146 def CreateService(self, servicetype):
147 service_class = create_service(servicetype)
148@@ -454,7 +454,7 @@
149 self.add_service(service)
150 return service.get_path()
151
152- @dbus.service.method("org.ayatana.connman.mock.Manager",
153+ @dbus.service.method("com.canonical.connman.mock.Manager",
154 in_signature="o", out_signature="")
155 def RemoveService(self, path):
156 self.remove_service(path)
157
158=== modified file 'tests/connman-mock/connman-remove-service'
159--- tests/connman-mock/connman-remove-service 2010-11-30 07:33:12 +0000
160+++ tests/connman-mock/connman-remove-service 2011-03-17 07:39:48 +0000
161@@ -35,7 +35,7 @@
162
163 bus = dbus.SystemBus()
164 manager = dbus.Interface(bus.get_object("net.connman", "/"),
165- "org.ayatana.connman.mock.Manager")
166+ "com.canonical.connman.mock.Manager")
167 manager.RemoveService(path)
168
169 if __name__ == "__main__":
170
171=== modified file 'tests/connman-mock/ofono-create-modem'
172--- tests/connman-mock/ofono-create-modem 2010-11-04 10:48:10 +0000
173+++ tests/connman-mock/ofono-create-modem 2011-03-17 07:39:48 +0000
174@@ -33,7 +33,7 @@
175
176 bus = dbus.SystemBus()
177 manager = dbus.Interface(bus.get_object("org.ofono", "/"),
178- "org.ayatana.ofono.mock.Manager")
179+ "com.canonical.ofono.mock.Manager")
180
181 path = manager.CreateModem()
182 print path
183
184=== modified file 'tests/connman-mock/ofono-mock'
185--- tests/connman-mock/ofono-mock 2010-11-04 10:53:19 +0000
186+++ tests/connman-mock/ofono-mock 2011-03-17 07:39:48 +0000
187@@ -94,7 +94,7 @@
188
189 return result
190
191- @dbus.service.method("org.ayatana.ofono.mock.Manager",
192+ @dbus.service.method("com.canonical.ofono.mock.Manager",
193 in_signature="", out_signature="o")
194 def CreateModem(self):
195 path = "/modem" + str(self.modem_id)
196@@ -105,7 +105,7 @@
197
198 return path
199
200- @dbus.service.method("org.ayatana.ofono.mock.Manager",
201+ @dbus.service.method("com.canonical.ofono.mock.Manager",
202 in_signature="o", out_signature="")
203 def RemoveModem(self, path):
204 if path not in self.modems:
205
206=== modified file 'tests/connman-mock/ofono-remove-modem'
207--- tests/connman-mock/ofono-remove-modem 2010-11-04 10:46:39 +0000
208+++ tests/connman-mock/ofono-remove-modem 2011-03-17 07:39:48 +0000
209@@ -34,7 +34,7 @@
210
211 bus = dbus.SystemBus()
212 manager = dbus.Interface(bus.get_object("org.ofono", "/"),
213- "org.ayatana.ofono.mock.Manager")
214+ "com.canonical.ofono.mock.Manager")
215
216 manager.RemoveModem(path)
217

Subscribers

People subscribed via source and target branches