Merge lp:~lore-mattei/onehundredscopes/shotwell-precise into lp:~davidc3/onehundredscopes/shotwell

Proposed by Lorenzo Mattei on 2012-03-02
Status: Merged
Merged at revision: 17
Proposed branch: lp:~lore-mattei/onehundredscopes/shotwell-precise
Merge into: lp:~davidc3/onehundredscopes/shotwell
Diff against target: 22 lines (+7/-1)
1 file modified
src/unity-scope-shotwell (+7/-1)
To merge this branch: bzr merge lp:~lore-mattei/onehundredscopes/shotwell-precise
Reviewer Review Type Date Requested Status
David Callé 2012-03-02 Pending
Review via email: mp+95601@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/unity-scope-shotwell'
--- src/unity-scope-shotwell 2012-02-27 18:28:54 +0000
+++ src/unity-scope-shotwell 2012-03-02 16:10:22 +0000
@@ -37,11 +37,17 @@
37 self.scope = Unity.Scope.new ("/net/launchpad/scope/image/shotwell")37 self.scope = Unity.Scope.new ("/net/launchpad/scope/image/shotwell")
38 self.scope.search_in_global = False38 self.scope.search_in_global = False
39 self.scope.connect ("search-changed", self.on_search_changed)39 self.scope.connect ("search-changed", self.on_search_changed)
40 self.scope.connect ("filters-changed", self.on_search_changed)40 self.scope.connect ("filters-changed", self.on_filtering_changed)
41 self.scope.connect ("activate-uri", self.on_activate_uri);41 self.scope.connect ("activate-uri", self.on_activate_uri);
42 self.scope.connect("notify::active", self.on_lens_active)42 self.scope.connect("notify::active", self.on_lens_active)
43 self.scope.props.sources.connect("notify::filtering",
44 self.on_filtering_changed)
43 self.scope.export()45 self.scope.export()
4446
47 def on_filtering_changed(self, *_):
48 """Run another search when a filter change is notified."""
49 self.scope.queue_search_changed(Unity.SearchType.DEFAULT)
50
45 def on_activate_uri (self, scope, uri):51 def on_activate_uri (self, scope, uri):
46 GLib.spawn_command_line_async("xdg-open %s" % uri.replace(' ', '\ '))52 GLib.spawn_command_line_async("xdg-open %s" % uri.replace(' ', '\ '))
47 return Unity.ActivationResponse(handled=Unity.HandledType.HIDE_DASH, goto_uri='')53 return Unity.ActivationResponse(handled=Unity.HandledType.HIDE_DASH, goto_uri='')

Subscribers

People subscribed via source and target branches

to all changes: