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

Proposed by Kalle Valo on 2010-12-16
Status: Merged
Merged at revision: 125
Proposed branch: lp:~kvalo/indicator-network/bug-685494
Merge into: lp:~indicator-applet-developers/indicator-network/indicator-network
Diff against target: 34 lines (+10/-0)
1 file modified
src/backend/manager.c (+10/-0)
To merge this branch: bzr merge lp:~kvalo/indicator-network/bug-685494
Reviewer Review Type Date Requested Status
Conor Curran (community) 2010-12-16 Approve on 2010-12-16
Review via email: mp+43900@code.launchpad.net
To post a comment you must log in.
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 'src/backend/manager.c'
2--- src/backend/manager.c 2010-12-09 22:02:07 +0000
3+++ src/backend/manager.c 2010-12-16 13:41:53 +0000
4@@ -350,6 +350,7 @@
5 static void update_default_service(Manager *self)
6 {
7 ManagerPrivate *priv = GET_PRIVATE(self);
8+ const gchar *path;
9
10 g_return_if_fail(self != NULL);
11 g_return_if_fail(priv != NULL);
12@@ -368,6 +369,13 @@
13
14 done:
15 update_icon(self);
16+
17+ if (priv->default_service != NULL)
18+ path = connman_service_get_path(priv->default_service);
19+ else
20+ path = "<none>";
21+
22+ g_debug("default service %s", path);
23 }
24
25 /* FIXME: should follow priv->default_service strength */
26@@ -400,6 +408,8 @@
27 services = connman_manager_get_services(priv->connman);
28
29 service_manager_update_services(priv->service_manager, services);
30+
31+ update_icon(self);
32 }
33
34 static void connman_service_added(ConnmanManager *proxy,

Subscribers

People subscribed via source and target branches