Merge lp:~submarine/unity-scope-firefoxbookmarks/new-icon into lp:unity-scope-firefoxbookmarks

[David Callé]

Use the bookmark icon and change Show to Open

Use the bookmarks icon
Change Show to Open (to match other scopes)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:29
http://jenkins.qa.ubuntu.com/job/unity-scope-firefoxbookmarks-ci/5/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-firefoxbookmarks-saucy-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-firefoxbookmarks-saucy-armhf-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-firefoxbookmarks-saucy-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-firefoxbookmarks-ci/5/rebuild

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

31 if not os.path.exists(icon):
32 - icon = 'gtk-about'
33 + icon = None

Why not DEFAULT_RESULT_ICON?

review: Needs Information

[David Callé (davidc3)]

the do_run method takes care of that later in the process.

[Paweł Stołowski (stolowski)]

Clarified on IRC. +1.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-scope-firefoxbookmarks-autolanding/4/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/206
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-firefoxbookmarks-saucy-amd64-autolanding/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-firefoxbookmarks-saucy-armhf-autolanding/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-firefoxbookmarks-saucy-i386-autolanding/1

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'data/firefoxbookmarks.scope.in'
--- data/firefoxbookmarks.scope.in	2013-05-02 16:27:55 +0000
+++ data/firefoxbookmarks.scope.in	2013-06-07 14:31:39 +0000
@@ -1,7 +1,7 @@
 [Scope]
 DBusName=com.canonical.Unity.Scope.Webhistory.Firefoxbookmarks
 DBusPath=/com/canonical/unity/scope/webhistory/firefoxbookmarks
-Icon=
+Icon=/usr/share/icons/unity-icon-theme/places/svg/group-browserbookmarks.svg
 QueryBinary=firefox
 _Keywords=firefoxbookmarks;firefox;web;bookmarks;
 RequiredMetadata=

=== modified file 'src/unity_firefoxbookmarks_daemon.py'
--- src/unity_firefoxbookmarks_daemon.py	2013-04-30 22:54:36 +0000
+++ src/unity_firefoxbookmarks_daemon.py	2013-06-07 14:31:39 +0000
@@ -35,8 +35,8 @@
 NO_RESULTS_HINT = _('Sorry, there are no Bookmarks that match your search.')
 PROVIDER_CREDITS = _('')
 SVG_DIR = '/usr/share/icons/unity-icon-theme/places/svg/'
-PROVIDER_ICON = SVG_DIR + 'service-firefoxbookmarks.svg'
-DEFAULT_RESULT_ICON = 'gtk-about'
+PROVIDER_ICON = SVG_DIR + 'group-browserbookmarks.svg'
+DEFAULT_RESULT_ICON = SVG_DIR + 'group-browserbookmarks.svg'
 DEFAULT_RESULT_MIMETYPE = 'text/html'
 DEFAULT_RESULT_TYPE = Unity.ResultType.DEFAULT
 FIREFOX_EXECUTABLE = '/usr/bin/firefox'
@@ -107,7 +107,7 @@
         path = bookmark[4].replace('places.sqlite', 'thumbnails/')
         icon = '%s%s.png' % (path, hashlib.md5(bookmark[1].encode()).hexdigest())
         if not os.path.exists(icon):
-            icon = 'gtk-about'
+            icon = None
         results.append({'uri': bookmark[1],
                         'icon': icon,
                         'category': 0,
@@ -142,7 +142,7 @@
             preview.props.image_source_uri = 'file://' + self.result.icon_hint
         else:
             preview.props.image = Gio.ThemedIcon.new('gtk-about')
-        show_action = Unity.PreviewAction.new("show", _("Show"), None)
+        show_action = Unity.PreviewAction.new("show", _("Open"), None)
         preview.add_action(show_action)
         return preview