Remove the "Tor disabled" status area icon

To save space in the status area, only show an icon when Tor is
connecting/connected.

diff --git a/Makefile.am b/Makefile.am
index 0439fca..b155995 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,6 @@ icon48_DATA = \
        data/tor_onion.png
 
 icon18_DATA = \
-       data/tor_status_disabled.png \
        data/tor_status_connected.png \
        data/tor_status_connecting.png
 

diff --git a/data/tor_status_disabled.png b/data/tor_status_disabled.png
deleted file mode 100644 (file)
index 30e71ca..0000000
Binary files a/data/tor_status_disabled.png and /dev/null differ

diff --git a/src/status-area-applet-tor.vala b/src/status-area-applet-tor.vala
index 24c577a..62a18c9 100644 (file)
--- a/src/status-area-applet-tor.vala
+++ b/src/status-area-applet-tor.vala
@@ -53,7 +53,6 @@ class TorStatusMenuItem : HD.StatusMenuItem {
        Hildon.Button button;
 
        // Icons
-       Gdk.Pixbuf icon_disabled;
        Gdk.Pixbuf icon_connecting;
        Gdk.Pixbuf icon_connected;
 
@@ -87,15 +86,6 @@ class TorStatusMenuItem : HD.StatusMenuItem {
                } catch (Error e) {
                        error (e.message);
                }
-               if (!tor_enabled && icon_disabled == null) try {
-                       icon_theme = Gtk.IconTheme.get_default ();
-                       pixbuf = icon_theme.load_icon ("tor_status_disabled",
-                                                      STATUS_AREA_ICON_SIZE,
-                                                      Gtk.IconLookupFlags.NO_SVG);
-                       icon_disabled = pixbuf;
-               } catch (Error e) {
-                       error (e.message);
-               }
                if (tor_enabled && !tor_connected && icon_connecting == null) try {
                        icon_theme = Gtk.IconTheme.get_default ();
                        pixbuf = icon_theme.load_icon ("tor_status_connecting",
@@ -110,7 +100,7 @@ class TorStatusMenuItem : HD.StatusMenuItem {
                        pixbuf = tor_connected ? icon_connected : icon_connecting;
                        button.set_value (tor_connected ? _("Connected") : _("Connecting ..."));
                } else {
-                       pixbuf = conic_connected ? icon_disabled : null;
+                       pixbuf = null;
                        button.set_value (tor_enabled ? _("Disconnected") : _("Disabled"));
                }
                set_status_area_icon (pixbuf);