wicd

Merge lp:~bkchr/wicd/appindicator-fix into lp:wicd/1.6

  1. appindicator-fix
  2. Merge into experimental
Proposed by Bastian Köcher
Status: Merged
Approved by: Pieter Leclerc
Approved revision: 946
Merged at revision: 946
Proposed branch: lp:~bkchr/wicd/appindicator-fix
Merge into: lp:wicd/1.6
Diff against target: 27 lines (+8/-2)
1 file modified
gtk/wicd-client.py (+8/-2)
To merge this branch: bzr merge lp:~bkchr/wicd/appindicator-fix
Reviewer Review Type Date Requested Status
Pieter Leclerc (community) Approve
Review via email: mp+257399@code.launchpad.net

Description of the change

IndicatorTrayIconGUI was missing the function "set_from_name" and also the icon path was wrong.

To post a comment you must log in.
Revision history for this message
Pieter Leclerc (pieterleclerc-deactivatedaccount) wrote :

Looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'gtk/wicd-client.py'
2--- gtk/wicd-client.py 2015-02-14 10:55:53 +0000
3+++ gtk/wicd-client.py 2015-04-24 14:44:20 +0000
4@@ -979,8 +979,8 @@
5 def __init__(self, parent):
6 TrayIcon.TrayIconGUI.__init__(self, parent)
7 self.ind = appindicator.Indicator(
8- "wicd", "", appindicator.CATEGORY_SYSTEM_SERVICES)
9- self.ind.set_icon(wpath.images + "no-signal.png")
10+ "wicd", "wicd-gtk", appindicator.CATEGORY_SYSTEM_SERVICES, wpath.images)
11+ self.current_icon_name = ''
12
13 # Rescaning when hovering over the net_menu doesn't work.
14 # (AFAICT, AppIndicator menus don't report PRELIGHT status.)
15@@ -1017,6 +1017,12 @@
16 if path != self.current_icon_path:
17 self.current_icon_path = path
18 self.ind.set_icon(path)
19+
20+ def set_from_name(self, name=None):
21+ """ Sets a new tray icon picture. """
22+ if name != self.current_icon_name:
23+ self.current_icon_name = name
24+ self.ind.set_icon(name)
25
26 def visible(self, val):
27 """ Set if the icon is visible or not.

Subscribers

People subscribed via source and target branches

to status/vote changes: