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

[Lorenzo Mattei]

Message handling updated to Unity 5 interface.

[lp:~lore-mattei/onehundredscopes/shotwell-precise]

14. By David Callé on 2012-02-27

Now works on Precise. Thanks Lorenzo\!

=== modified file 'debian/control'
--- debian/control	2012-01-08 15:28:40 +0000
+++ debian/control	2012-02-24 11:34:17 +0000
@@ -17,7 +17,7 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          ${python:Depends},
-         gir1.2-unity-4.0,
+         gir1.2-unity-5.0,
          gir1.2-dee-0.5,
          python-lxml,
          python-pyexiv2,

=== modified file 'src/unity-scope-shotwell'
--- src/unity-scope-shotwell	2012-01-12 08:54:19 +0000
+++ src/unity-scope-shotwell	2012-02-24 11:34:17 +0000
@@ -36,10 +36,8 @@
 	def __init__ (self):
 		self.scope = Unity.Scope.new ("/net/launchpad/scope/image/shotwell")
 		self.scope.search_in_global = False
-		self.scope.connect ("notify::active-search", self.on_search_changed)
-		self.scope.connect ("notify::active", self.on_search_changed)
-		self.scope.connect ("notify::active-global-search", self.on_global_search_changed)
-		self.scope.connect ("filters-changed", self.on_search_changed);
+		self.scope.connect ("search-changed", self.on_search_changed)
+		self.scope.connect ("filters-changed", self.on_search_changed)
 		self.scope.connect ("activate-uri", self.on_activate_uri);
 		self.scope.export()
 
@@ -47,31 +45,22 @@
 		GLib.spawn_command_line_async("xdg-open %s" % uri.replace(' ', '\ '))
 		return Unity.ActivationResponse(handled=Unity.HandledType.HIDE_DASH, goto_uri='')
 
-
-	def get_search_string (self):
-		search = self.scope.props.active_search
-		return search.props.search_string if search else None
 		
-	def get_global_search_string (self):
-		search = self.scope.props.active_global_search
-		return search.props.search_string if search else None
-
-	def on_search_changed (self, scope, param_spec=None):
-			search = self.get_search_string()
-			print "Search changed to: '%s'" % search
-			results = self.scope.props.results_model
-			results.clear()
-			self.update_results_model (search, results)
-			results.flush_revision_queue ()
-			
-	def on_global_search_changed (self, scope, param_spec=None):
-			search = self.get_global_search_string()
-			print "Global search changed to: '%s'" % search
-			results = self.scope.props.global_results_model
-			results.clear()
-			self.update_results_model (search, results)
-			results.flush_revision_queue ()
-
+	def on_search_changed (self, scope, search=None, search_type=0, cancellable=None):
+			if search:
+				search_string = search.props.search_string.strip()
+				print "Search changed to: '%s'" %search_string
+			else:
+				search_string=''
+			if search_type == Unity.SearchType.DEFAULT:
+				model = self.scope.props.results_model
+			else:
+				model = self.scope.props.global_results_model
+			model.clear()
+			self.update_results_model (search_string, model)
+			model.flush_revision_queue ()
+			if search:
+				search.finished()
 
 	def update_results_model(self, search, model):
 		date = self.check_filters("date")
@@ -91,8 +80,8 @@
 					icon_hint = i[2]
 					model.append (uri, icon_hint, 1,"text/html", title, comment, uri)
 
-		if self.scope.props.active_search:
-			self.scope.props.active_search.emit("finished")
+#		if self.scope.props.active_search:
+#			self.scope.props.active_search.emit("finished")
 
 	def check_filters(self, filter_name):
 		try: