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
=== modified file 'data/indicator-network-agent.service.in'
--- data/indicator-network-agent.service.in 2010-07-28 19:36:57 +0000
+++ data/indicator-network-agent.service.in 2011-03-17 07:39:48 +0000
@@ -1,3 +1,3 @@
1[D-BUS Service]1[D-BUS Service]
2Name=org.ayatana.indicator.network.agent2Name=com.canonical.indicator.network.agent
3Exec=@libexecdir@/indicator-network-agent3Exec=@libexecdir@/indicator-network-agent
44
=== modified file 'data/indicator-network.service.in'
--- data/indicator-network.service.in 2010-05-19 07:49:00 +0000
+++ data/indicator-network.service.in 2011-03-17 07:39:48 +0000
@@ -1,3 +1,3 @@
1[D-BUS Service]1[D-BUS Service]
2Name=org.ayatana.indicator.network2Name=com.canonical.indicator.network
3Exec=@libexecdir@/indicator-network-service3Exec=@libexecdir@/indicator-network-service
44
=== modified file 'scripts/indicator-network-debug'
--- scripts/indicator-network-debug 2011-01-31 08:50:13 +0000
+++ scripts/indicator-network-debug 2011-03-17 07:39:48 +0000
@@ -19,9 +19,9 @@
19 ;;19 ;;
20 esac20 esac
2121
22 dbus-send --session --dest=org.ayatana.indicator.network \22 dbus-send --session --dest=com.canonical.indicator.network \
23 /org/ayatana/indicator/network/service \23 /com/canonical/indicator/network/service \
24 org.ayatana.indicator.network.SetDebug int32:$level24 com.canonical.indicator.network.SetDebug int32:$level
25}25}
2626
27agent_debug() {27agent_debug() {
@@ -38,9 +38,9 @@
38 ;;38 ;;
39 esac39 esac
4040
41 dbus-send --session --dest=org.ayatana.indicator.network.agent \41 dbus-send --session --dest=com.canonical.indicator.network.agent \
42 /org/ayatana/indicator/network/agent \42 /com/canonical/indicator/network/agent \
43 org.ayatana.indicator.network.agent.SetDebug int32:$level43 com.canonical.indicator.network.agent.SetDebug int32:$level
44}44}
4545
46start() {46start() {
4747
=== modified file 'src/common/dbus-shared-names.h'
--- src/common/dbus-shared-names.h 2011-03-09 08:19:55 +0000
+++ src/common/dbus-shared-names.h 2011-03-17 07:39:48 +0000
@@ -21,35 +21,21 @@
21#ifndef __DBUS_SHARED_NAMES_H__21#ifndef __DBUS_SHARED_NAMES_H__
22#define __DBUS_SHARED_NAMES_H__ 122#define __DBUS_SHARED_NAMES_H__ 1
2323
24#define INDICATOR_STATUS_DBUS_NAME "org.ayatana.indicator.status"24#define INDICATOR_NETWORK_DBUS_NAME "com.canonical.indicator.network"
25#define INDICATOR_STATUS_DBUS_OBJECT "/org/ayatana/indicator/status/menu"25#define INDICATOR_NETWORK_DBUS_OBJECT "/com/canonical/indicator/network/menu"
26#define INDICATOR_STATUS_SERVICE_DBUS_OBJECT "/org/ayatana/indicator/status/service"
27#define INDICATOR_STATUS_SERVICE_DBUS_INTERFACE "org.ayatana.indicator.status.service"
28
29#define INDICATOR_USERS_DBUS_NAME "org.ayatana.indicator.users"
30#define INDICATOR_USERS_DBUS_OBJECT "/org/ayatana/indicator/users/menu"
31#define INDICATOR_USERS_SERVICE_DBUS_OBJECT "/org/gnome/DisplayManager/UserManager"
32#define INDICATOR_USERS_SERVICE_DBUS_INTERFACE "org.gnome.DisplayManager.UserManager"
33
34#define INDICATOR_SESSION_DBUS_NAME "org.ayatana.indicator.session"
35#define INDICATOR_SESSION_DBUS_OBJECT "/org/ayatana/indicator/session/menu"
36#define INDICATOR_SESSION_DBUS_VERSION 0
37
38#define INDICATOR_NETWORK_DBUS_NAME "org.ayatana.indicator.network"
39#define INDICATOR_NETWORK_DBUS_OBJECT "/org/ayatana/indicator/network/menu"
40#define INDICATOR_NETWORK_SERVICE_DBUS_OBJECT "/"26#define INDICATOR_NETWORK_SERVICE_DBUS_OBJECT "/"
41#define INDICATOR_NETWORK_SERVICE_DBUS_INTERFACE "org.ayatana.indicator.network.BackendManager"27#define INDICATOR_NETWORK_SERVICE_DBUS_INTERFACE "com.canonical.indicator.network.BackendManager"
42#define INDICATOR_NETWORK_DBUS_VERSION 028#define INDICATOR_NETWORK_DBUS_VERSION 0
4329
44#define INDICATOR_NETWORK_BACKEND_NAME "org.ayatana.indicator.network.backend"30#define INDICATOR_NETWORK_BACKEND_NAME "com.canonical.indicator.network.backend"
45#define INDICATOR_NETWORK_BACKEND_MANAGER_PATH "/org/ayatana/indicator/network/backend/manager"31#define INDICATOR_NETWORK_BACKEND_MANAGER_PATH "/com/canonical/indicator/network/backend/manager"
46#define INDICATOR_NETWORK_BACKEND_INTERFACE "org.ayatana.indicator.network.backend"32#define INDICATOR_NETWORK_BACKEND_INTERFACE "com.canonical.indicator.network.backend"
47#define INDICATOR_NETWORK_BACKEND_MANAGER_INTERFACE \33#define INDICATOR_NETWORK_BACKEND_MANAGER_INTERFACE \
48 INDICATOR_NETWORK_BACKEND_INTERFACE ".Manager"34 INDICATOR_NETWORK_BACKEND_INTERFACE ".Manager"
4935
50#define INDICATOR_NETWORK_AGENT_NAME "org.ayatana.indicator.network.agent"36#define INDICATOR_NETWORK_AGENT_NAME "com.canonical.indicator.network.agent"
51#define INDICATOR_NETWORK_AGENT_OBJECT "/org/ayatana/indicator/network/agent"37#define INDICATOR_NETWORK_AGENT_OBJECT "/com/canonical/indicator/network/agent"
52#define INDICATOR_NETWORK_AGENT_INTERFACE "org.ayatana.indicator.network.agent"38#define INDICATOR_NETWORK_AGENT_INTERFACE "com.canonical.indicator.network.agent"
5339
54#define INDICATOR_NETWORK_SIGNAL_ICON_CHANGED "IconChanged"40#define INDICATOR_NETWORK_SIGNAL_ICON_CHANGED "IconChanged"
55#define INDICATOR_NETWORK_SIGNAL_ACCESSIBLE_DESC_CHANGED "AccessibleDescChanged"41#define INDICATOR_NETWORK_SIGNAL_ACCESSIBLE_DESC_CHANGED "AccessibleDescChanged"
5642
=== modified file 'src/common/indicator-network-agent.xml'
--- src/common/indicator-network-agent.xml 2010-11-04 10:22:03 +0000
+++ src/common/indicator-network-agent.xml 2011-03-17 07:39:48 +0000
@@ -1,6 +1,6 @@
1<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">1<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
2<node name="/org/ayatana/indicator/network.agent">2<node name="/com/canonical/indicator/network.agent">
3 <interface name="org.ayatana.indicator.network.agent">3 <interface name="com.canonical.indicator.network.agent">
4 <method name="Start">4 <method name="Start">
5 <annotation name="org.freedesktop.DBus.GLib.CSymbol"5 <annotation name="org.freedesktop.DBus.GLib.CSymbol"
6 value="network_agent_start"/>6 value="network_agent_start"/>
77
=== modified file 'src/common/indicator-network-service.xml'
--- src/common/indicator-network-service.xml 2011-02-15 06:58:05 +0000
+++ src/common/indicator-network-service.xml 2011-03-17 07:39:48 +0000
@@ -1,6 +1,6 @@
1<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">1<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
2<node name="/">2<node name="/">
3 <interface name="org.ayatana.indicator.network.backend.Manager">3 <interface name="com.canonical.indicator.network.backend.Manager">
4 <method name="GetIcon">4 <method name="GetIcon">
5 <annotation name="org.freedesktop.DBus.GLib.CSymbol"5 <annotation name="org.freedesktop.DBus.GLib.CSymbol"
6 value="manager_proxy_get_icon"/>6 value="manager_proxy_get_icon"/>
77
=== modified file 'tests/connman-mock/connman-create-service'
--- tests/connman-mock/connman-create-service 2010-11-30 07:33:12 +0000
+++ tests/connman-mock/connman-create-service 2011-03-17 07:39:48 +0000
@@ -40,7 +40,7 @@
4040
41 bus = dbus.SystemBus()41 bus = dbus.SystemBus()
42 manager = dbus.Interface(bus.get_object("net.connman", "/"),42 manager = dbus.Interface(bus.get_object("net.connman", "/"),
43 "org.ayatana.connman.mock.Manager")43 "com.canonical.connman.mock.Manager")
4444
45 while count > 0:45 while count > 0:
46 path = manager.CreateService(service_type)46 path = manager.CreateService(service_type)
4747
=== modified file 'tests/connman-mock/connman-mock'
--- tests/connman-mock/connman-mock 2011-02-09 08:37:06 +0000
+++ tests/connman-mock/connman-mock 2011-03-17 07:39:48 +0000
@@ -440,7 +440,7 @@
440 def PropertyChanged(self, prop, val):440 def PropertyChanged(self, prop, val):
441 pass441 pass
442442
443 @dbus.service.method("org.ayatana.connman.mock.Manager",443 @dbus.service.method("com.canonical.connman.mock.Manager",
444 in_signature="s", out_signature="o")444 in_signature="s", out_signature="o")
445 def CreateService(self, servicetype):445 def CreateService(self, servicetype):
446 service_class = create_service(servicetype)446 service_class = create_service(servicetype)
@@ -454,7 +454,7 @@
454 self.add_service(service)454 self.add_service(service)
455 return service.get_path()455 return service.get_path()
456456
457 @dbus.service.method("org.ayatana.connman.mock.Manager",457 @dbus.service.method("com.canonical.connman.mock.Manager",
458 in_signature="o", out_signature="")458 in_signature="o", out_signature="")
459 def RemoveService(self, path):459 def RemoveService(self, path):
460 self.remove_service(path)460 self.remove_service(path)
461461
=== modified file 'tests/connman-mock/connman-remove-service'
--- tests/connman-mock/connman-remove-service 2010-11-30 07:33:12 +0000
+++ tests/connman-mock/connman-remove-service 2011-03-17 07:39:48 +0000
@@ -35,7 +35,7 @@
3535
36 bus = dbus.SystemBus()36 bus = dbus.SystemBus()
37 manager = dbus.Interface(bus.get_object("net.connman", "/"),37 manager = dbus.Interface(bus.get_object("net.connman", "/"),
38 "org.ayatana.connman.mock.Manager")38 "com.canonical.connman.mock.Manager")
39 manager.RemoveService(path)39 manager.RemoveService(path)
4040
41if __name__ == "__main__":41if __name__ == "__main__":
4242
=== modified file 'tests/connman-mock/ofono-create-modem'
--- tests/connman-mock/ofono-create-modem 2010-11-04 10:48:10 +0000
+++ tests/connman-mock/ofono-create-modem 2011-03-17 07:39:48 +0000
@@ -33,7 +33,7 @@
3333
34 bus = dbus.SystemBus()34 bus = dbus.SystemBus()
35 manager = dbus.Interface(bus.get_object("org.ofono", "/"),35 manager = dbus.Interface(bus.get_object("org.ofono", "/"),
36 "org.ayatana.ofono.mock.Manager")36 "com.canonical.ofono.mock.Manager")
3737
38 path = manager.CreateModem()38 path = manager.CreateModem()
39 print path39 print path
4040
=== modified file 'tests/connman-mock/ofono-mock'
--- tests/connman-mock/ofono-mock 2010-11-04 10:53:19 +0000
+++ tests/connman-mock/ofono-mock 2011-03-17 07:39:48 +0000
@@ -94,7 +94,7 @@
9494
95 return result95 return result
9696
97 @dbus.service.method("org.ayatana.ofono.mock.Manager",97 @dbus.service.method("com.canonical.ofono.mock.Manager",
98 in_signature="", out_signature="o")98 in_signature="", out_signature="o")
99 def CreateModem(self):99 def CreateModem(self):
100 path = "/modem" + str(self.modem_id)100 path = "/modem" + str(self.modem_id)
@@ -105,7 +105,7 @@
105105
106 return path106 return path
107107
108 @dbus.service.method("org.ayatana.ofono.mock.Manager",108 @dbus.service.method("com.canonical.ofono.mock.Manager",
109 in_signature="o", out_signature="")109 in_signature="o", out_signature="")
110 def RemoveModem(self, path):110 def RemoveModem(self, path):
111 if path not in self.modems:111 if path not in self.modems:
112112
=== modified file 'tests/connman-mock/ofono-remove-modem'
--- tests/connman-mock/ofono-remove-modem 2010-11-04 10:46:39 +0000
+++ tests/connman-mock/ofono-remove-modem 2011-03-17 07:39:48 +0000
@@ -34,7 +34,7 @@
3434
35 bus = dbus.SystemBus()35 bus = dbus.SystemBus()
36 manager = dbus.Interface(bus.get_object("org.ofono", "/"),36 manager = dbus.Interface(bus.get_object("org.ofono", "/"),
37 "org.ayatana.ofono.mock.Manager")37 "com.canonical.ofono.mock.Manager")
3838
39 manager.RemoveModem(path)39 manager.RemoveModem(path)
4040

Subscribers

People subscribed via source and target branches