tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Unity lens: use hack to make python activate_uri half work

Browse Source
This commit is contained in:
Jean-Francois Dockes 2012-03-27 14:12:05 +02:00
parent 9e29f7d025
commit aa19a9f5b9
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/desktop/unity-lens-recoll/recollscope/rclsearch.py
View File

@ -80,14 +80,12 @@ class Scope (Unity.Scope):
search_string = self.get_search_string() search_string = self.get_search_string()
results = scope.props.results_model results = scope.props.results_model
# print "Search 4.0 changed to: '%s'" % search_string # print "Search 4.0 changed to: '%s'" % search_string
self._update_results_model (search_string, results) self._update_results_model (search_string, results)
else: else:
def _on_search_changed (self, scope, search, search_type, cancellable): def _on_search_changed (self, scope, search, search_type, cancellable):
search_string = search.props.search_string search_string = search.props.search_string
results = search.props.results_model results = search.props.results_model
# print "Search 5.0 changed to: '%s'" % search_string # print "Search 5.0 changed to: '%s'" % search_string
self._update_results_model (search_string, results) self._update_results_model (search_string, results)
def _on_global_search_changed (self, scope, param_spec): def _on_global_search_changed (self, scope, param_spec):
@ -170,8 +168,7 @@ class Scope (Unity.Scope):
mimetype = doc.mimetype mimetype = doc.mimetype
url = doc.url url = doc.url
print "Recoll Lens: Using MIMETYPE", mimetype, \ # print "Recoll Lens: Using MIMETYPE", mimetype, " URL", url
" URL", url
titleorfilename = doc.title titleorfilename = doc.title
if titleorfilename == "": if titleorfilename == "":
@ -196,6 +193,15 @@ class Scope (Unity.Scope):
break break
# If we return from here, the caller gets an error:
# Warning: g_object_get_qdata: assertion `G_IS_OBJECT (object)' failed
# Known bug, see:
# https://bugs.launchpad.net/unity/+bug/893688
# Then, the default url activation takes place
# which is not at all what we want.
# So, in the recoll case, we just exit, the lens will be restarted.
# In the regular case, we return, and activation works exactly once for
# 2 calls...
def activate_uri (self, scope, uri): def activate_uri (self, scope, uri):
"""Activation handler for uri""" """Activation handler for uri"""
@ -211,6 +217,12 @@ class Scope (Unity.Scope):
# Pass all others to recoll # Pass all others to recoll
proc = subprocess.Popen(["recoll", uri]) proc = subprocess.Popen(["recoll", uri])
print "Subprocess returned, going back to unity" print "Subprocess returned, going back to unity"
return Unity.ActivationResponse.new(Unity.HandledType.HIDE_DASH, "baduri")
scope.props.results_model.clear();
scope.props.global_results_model.clear();
sys.exit(0)
#return Unity.ActivationResponse.new(Unity.HandledType.HIDE_DASH,
# "baduri")