Network Menu

Merge lp:~and471/indicator-network/trivial-fixes into lp:~indicator-applet-developers/indicator-network/indicator-network

  1. trivial-fixes
  2. Merge into indicator-network
Proposed by Andrew
Status: Merged
Merged at revision: 106
Proposed branch: lp:~and471/indicator-network/trivial-fixes
Merge into: lp:~indicator-applet-developers/indicator-network/indicator-network
Diff against target: 182 lines (+12/-55)
2 files modified
src/backend/network-menu.c (+9/-52)
src/indicator/service-menuitem.c (+3/-3)
To merge this branch: bzr merge lp:~and471/indicator-network/trivial-fixes
Reviewer Review Type Date Requested Status
Kalle Valo (community) Approve
Review via email: mp+42055@code.launchpad.net

Description of the change

(see commit messages)

(sorry about double request, but I fixed another issue :] )

To post a comment you must log in.
Revision history for this message
Kalle Valo (kvalo) wrote :

Thank you for the changes! Everything looks expect the removal of the status line, but I can add it back after merging this.

Approved.

review: Approve
Revision history for this message
Kalle Valo (kvalo) wrote :

The status line is just an experiment to make it more obvious the current network state. Even it's not in the spec I don't want to remove it quite yet.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/backend/network-menu.c'
2--- src/backend/network-menu.c 2010-10-01 12:58:01 +0000
3+++ src/backend/network-menu.c 2010-11-28 17:32:31 +0000
4@@ -41,7 +41,6 @@
5 typedef struct _NetworkMenuPrivate NetworkMenuPrivate;
6
7 struct _NetworkMenuPrivate {
8- DbusmenuMenuitem *statusline;
9 DbusmenuMenuitem *wired_header;
10 DbusmenuMenuitem *wired_separator;
11 DbusmenuMenuitem *wireless_header;
12@@ -99,36 +98,6 @@
13 {
14 }
15
16-static void update_state_label(NetworkMenu *self)
17-{
18- NetworkMenuPrivate *priv = GET_PRIVATE(self);
19- ServiceManager *service_manager;
20- gchar str[200];
21- guint count;
22-
23- g_return_if_fail(IS_NETWORK_MENU(self));
24- g_return_if_fail(priv != NULL);
25- g_return_if_fail(priv->network_service != NULL);
26- g_return_if_fail(priv->statusline != NULL);
27-
28- service_manager = manager_get_service_manager(priv->network_service);
29-
30- count = service_manager_get_connected(service_manager);
31-
32- if (count > 1)
33- g_snprintf(str, sizeof(str), _("Connected (%d networks)"), count);
34- else if (count == 1)
35- g_strlcpy(str, _("Connected"), sizeof(str));
36- else if (service_manager_is_connecting(service_manager))
37- g_strlcpy(str, _("Connecting"), sizeof(str));
38- else
39- g_strlcpy(str, _("Disconnected"), sizeof(str));
40-
41- dbusmenu_menuitem_property_set(priv->statusline,
42- DBUSMENU_MENUITEM_PROP_LABEL,
43- str);
44-}
45-
46 void network_menu_disable(NetworkMenu *self)
47 {
48 NetworkMenuPrivate *priv = GET_PRIVATE(self);
49@@ -163,8 +132,6 @@
50 }
51
52 /* hide all menuitems */
53- dbusmenu_menuitem_property_set_bool(priv->statusline,
54- DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE);
55 dbusmenu_menuitem_property_set_bool(priv->wired_separator,
56 DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE);
57 dbusmenu_menuitem_property_set_bool(priv->wireless_header,
58@@ -354,8 +321,6 @@
59 return;
60
61 /* show all menuitems which should be always visible */
62- dbusmenu_menuitem_property_set_bool(priv->statusline,
63- DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE);
64 dbusmenu_menuitem_property_set_bool(priv->wireless_header,
65 DBUSMENU_MENUITEM_PROP_VISIBLE, TRUE);
66 dbusmenu_menuitem_property_set_bool(priv->wireless_list_top,
67@@ -368,8 +333,6 @@
68 dbusmenu_menuitem_property_set_bool(priv->disabled_menuitem,
69 DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE);
70
71- update_state_label(self);
72-
73 update_services(self);
74
75 priv->menu_enabled = TRUE;
76@@ -395,8 +358,7 @@
77 NetworkMenu *self = NETWORK_MENU(user_data);
78
79 g_return_if_fail(IS_NETWORK_MENU(self));
80-
81- update_state_label(self);
82+
83 }
84
85 static void tech_state_changed(Manager *manager, const gchar *tech,
86@@ -414,9 +376,9 @@
87 return;
88
89 if (state)
90- str = _("Wireless: ON");
91+ str = _("Wi-Fi: ON");
92 else
93- str = _("Wireless: OFF");
94+ str = _("Wi-Fi: OFF");
95
96 dbusmenu_menuitem_property_set(priv->wireless_header,
97 DBUSMENU_MENUITEM_PROP_LABEL,
98@@ -436,9 +398,9 @@
99 return;
100
101 /* there was an error, notify the user */
102- g_warning("Failed to enable wireless: %s", error->message);
103+ g_warning("Failed to enable wi-fi: %s", error->message);
104
105- summary = _("Wireless");
106+ summary = _("Wi-Fi");
107 msg = _("Failed to enable wireless");
108 icon = ICON_NOTIFICATION_WIFI_FULL;
109
110@@ -459,9 +421,9 @@
111 return;
112
113 /* there was an error, notify the user */
114- g_warning("Failed to disable wireless: %s", error->message);
115+ g_warning("Failed to disable wi-fi: %s", error->message);
116
117- summary = _("Wireless");
118+ summary = _("Wi-Fi:");
119 msg = _("Failed to disable wireless");
120 icon = ICON_NOTIFICATION_WIFI_FULL;
121
122@@ -514,7 +476,7 @@
123 gpointer user_data)
124 {
125 if (error) {
126- g_critical("Unable to show wireless connect dialog: %s",
127+ g_critical("Unable to show wi-fi connect dialog: %s",
128 error->message);
129 g_error_free(error);
130 return;
131@@ -567,11 +529,6 @@
132 DBUSMENU_MENUITEM_PROP_VISIBLE,
133 TRUE);
134
135- priv->statusline = dbusmenu_menuitem_new ();
136- dbusmenu_menuitem_property_set_bool(priv->statusline,
137- DBUSMENU_MENUITEM_PROP_ENABLED, FALSE);
138- dbusmenu_menuitem_child_append(DBUSMENU_MENUITEM(self), priv->statusline);
139-
140 /* Wired section of the menu */
141 priv->wired_header = dbusmenu_menuitem_new ();
142 dbusmenu_menuitem_property_set_bool(priv->wired_header,
143@@ -588,7 +545,7 @@
144 priv->wireless_header = dbusmenu_menuitem_new ();
145 dbusmenu_menuitem_property_set(priv->wireless_header,
146 DBUSMENU_MENUITEM_PROP_LABEL,
147- _("Wireless: OFF"));
148+ _("Wi-Fi: OFF"));
149 dbusmenu_menuitem_child_append(DBUSMENU_MENUITEM(self), priv->wireless_header);
150 g_signal_connect(G_OBJECT(priv->wireless_header),
151 DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
152
153=== modified file 'src/indicator/service-menuitem.c'
154--- src/indicator/service-menuitem.c 2010-10-05 12:38:40 +0000
155+++ src/indicator/service-menuitem.c 2010-11-28 17:32:31 +0000
156@@ -50,7 +50,7 @@
157 #define SERVICE_MENUITEM_GET_PRIVATE(o) \
158 (G_TYPE_INSTANCE_GET_PRIVATE ((o), SERVICE_MENUITEM_TYPE, ServiceMenuitemPrivate))
159
160-#define PROTECTED_ICON "nm-secure-lock"
161+#define PROTECTED_ICON "locked"
162
163
164 /* Prototypes */
165@@ -122,7 +122,7 @@
166 self->priv->label = gtk_label_new(NULL);
167 gtk_label_set_use_underline(GTK_LABEL(self->priv->label), TRUE);
168 gtk_misc_set_alignment(GTK_MISC(self->priv->label), 0.0, 0.5);
169- gtk_box_pack_start(GTK_BOX(hbox), self->priv->label, FALSE, FALSE,
170+ gtk_box_pack_start(GTK_BOX(hbox), self->priv->label, TRUE, TRUE,
171 get_hpadding(GTK_WIDGET(self)));
172 gtk_widget_show(self->priv->label);
173
174@@ -501,7 +501,7 @@
175 gtk_menu_item_set_label(gmi, s);
176
177 service_menuitem_set_check_type(self,
178- SERVICE_MENUITEM_CHECK_TYPE_CHECKBOX);
179+ SERVICE_MENUITEM_CHECK_TYPE_RADIO);
180
181 state = dbusmenu_menuitem_property_get_int(item,
182 DBUSMENU_MENUITEM_PROP_TOGGLE_STATE);

Subscribers

People subscribed via source and target branches