Merge lp:~david4dev/dmedia/fix-indicator-icons into lp:dmedia

[David Green]

Fixes the icon problem. I've been unable to test this properly (explained on the bug) but after searching through the code there's nothing to suggest that the small change made could cause any problems or errors.

[Jason Gerard DeRose (jderose)]

Yep, that fixed it. Thanks, David!

review: Approve

=== modified file 'dmedia/service.py'
--- dmedia/service.py	2011-02-21 10:11:32 +0000
+++ dmedia/service.py	2011-02-22 22:04:33 +0000
@@ -1,6 +1,7 @@
 # Authors:
 #   Jason Gerard DeRose <[e-mail]>
 #   Manish SInha <[e-mail]>
+#   David Green <[e-mail]>
 #
 # dmedia: distributed media library
 # Copyright (C) 2010 Jason Gerard DeRose <[e-mail]>
@@ -53,8 +54,8 @@
 log = logging.getLogger()
 
 
-ICON = '/usr/share/pixmaps/dmedia/indicator-rendermenu.svg'
-ICON_ATT = '/usr/share/pixmaps/dmedia/indicator-rendermenu-att.svg'
+ICON = 'indicator-rendermenu'
+ICON_ATT = 'indicator-rendermenu-att'
 
 
 class DMedia(dbus.service.Object):

=== modified file 'setup.py'
--- setup.py	2011-02-21 10:11:32 +0000
+++ setup.py	2011-02-22 22:04:33 +0000
@@ -149,6 +149,12 @@
                 'data/indicator-rendermenu-att.svg',
             ]
         ),
+        ('share/icons/hicolor/scalable/status/',
+            [
+                'data/indicator-rendermenu.svg',
+                'data/indicator-rendermenu-att.svg',
+            ]
+        ), #enables status icons to be referenced by icon name
         ('share/dbus-1/services', ['data/org.freedesktop.DMedia.service']),
         ('lib/dmedia', ['dmedia-service']),
     ],