diff options
-rw-r--r-- | data/icons/Makefile.am | 1 | ||||
-rw-r--r-- | data/icons/activity-journal.svg | 11 | ||||
-rw-r--r-- | src/jarabe/model/shell.py | 9 |
3 files changed, 8 insertions, 13 deletions
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am index ccf049a..e1f8fa7 100644 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -1,7 +1,6 @@ sugardir = $(pkgdatadir)/data/icons sugar_DATA = \ - activity-journal.svg \ module-about_me.svg \ module-about_my_computer.svg \ module-date_and_time.svg \ diff --git a/data/icons/activity-journal.svg b/data/icons/activity-journal.svg deleted file mode 100644 index 1ae35db..0000000 --- a/data/icons/activity-journal.svg +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" ?><!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [ - <!ENTITY stroke_color "#666666"> - <!ENTITY fill_color "#ffffff"> -]><svg enable-background="new 0 0 55 55" height="55px" id="Layer_1" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="activity-journal"> - <path d="M45.866,44.669 c0,2.511-1.528,4.331-4.332,4.331H12.077V6h29.458c2.15,0,4.332,2.154,4.332,4.33L45.866,44.669L45.866,44.669z" fill="&fill_color;" stroke="&stroke_color;" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.5"/> - - <line fill="none" stroke="&stroke_color;" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.5" x1="21.341" x2="21.341" y1="6.121" y2="48.881"/> - <path d="M7.384,14.464 c0,0,2.084,0.695,4.17,0.695c2.086,0,4.173-0.695,4.173-0.695" fill="none" stroke="&stroke_color;" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.5"/> - <path d="M7.384,28.021 c0,0,1.912,0.695,4.345,0.695s3.999-0.695,3.999-0.695" fill="none" stroke="&stroke_color;" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.5"/> - <path d="M7.384,41.232 c0,0,1.736,0.695,4.518,0.695c2.781,0,3.825-0.695,3.825-0.695" fill="none" stroke="&stroke_color;" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.5"/> -</g></svg>
\ No newline at end of file diff --git a/src/jarabe/model/shell.py b/src/jarabe/model/shell.py index 9f6a51f..c418935 100644 --- a/src/jarabe/model/shell.py +++ b/src/jarabe/model/shell.py @@ -124,7 +124,14 @@ class Activity(gobject.GObject): def get_icon_path(self): """Retrieve the activity's icon (file) name""" if self.is_journal(): - return os.path.join(config.data_path, 'icons/activity-journal.svg') + icon_theme = gtk.icon_theme_get_default() + info = icon_theme.lookup_icon('activity-journal', + gtk.ICON_SIZE_SMALL_TOOLBAR, 0) + if not info: + return None + fname = info.get_filename() + del info + return fname elif self._activity_info: return self._activity_info.get_icon() else: |