Commits

Damián Nohales  committed 7290db2 Merge

Oops, now yes... merge vkolev changes.

  • Participants
  • Parent commits 742b3e7, 1259cda

Comments (0)

Files changed (3)

File gsharkdown.py

 by the grooveshark.com service
 """
 
+import os
+import sys
+
 # Imports with dependency check
 # Imports PyGtk
 try:
     HAVE_INDICATOR = False
     
 # Common imports
-import os
-import sys
 import dbus
 import dbus.service
 import dbus.glib

File lib/AbstractSongList.py

File contents unchanged.

File lib/guihelpers.py

         so we can access the gSharkDown methods.
         """
         if env().HAVE_INDICATOR == True:
-            if os.path.exists('/usr/share/pixmaps/gsharkdown'):
-                icons_path = '/usr/share/pixmaps/gsharkdown'
-            else:
-                icons_path = "%s/_pixmaps/gsharkdown" % env().BASEPATH
+            #if os.path.exists('/usr/share/pixmaps/gsharkdown'):
+            #    icons_path = '/usr/share/pixmaps/gsharkdown'
+            #else:
+            #    icons_path = "%s/_pixmaps/gsharkdown" % env().BASEPATH
+            #print icons_path
             self.ind = appindicator.Indicator("gsharkdown-client",
-                                    "gsharkdown-messages",
-                                    appindicator.CATEGORY_APPLICATION_STATUS,
-                                    icons_path)
+                                   "gsharkdown_16",
+                                    appindicator.CATEGORY_APPLICATION_STATUS)
             self.ind.set_status(appindicator.STATUS_ACTIVE)
             self.ind.set_attention_icon("gsharkdown_16_playing")
             self.ind.set_icon("gsharkdown_16")