Merge lp:~keirangtp/cardapio/web-plugins into lp:cardapio

[Paweł Bara]

Amazon plugin
Tomboy plugin

[lp:~keirangtp/cardapio/web-plugins]

336. By Pawel Bara on 2010-08-03

updated Tomboys category icon

337. By Pawel Bara on 2010-08-04

found real search method in Tomboys DBus API (d-feet for the rescue) ;)

338. By Pawel Bara on 2010-08-04

bugfix: keyword searches not working in Bing

339. By Pawel Bara on 2010-08-05

merging trunk

340. By Pawel Bara on 2010-08-07

initial eBay plugin (localization on is its way)

341. By Pawel Bara on 2010-08-07

merged trunk and localized (finished) eBay plugin

342. By Pawel Bara on 2010-08-07

deleted tomboy plugin for merging purpose (will work on it some more)

[Paweł Bara (keirangtp)]

new Amazon plugin, new eBay plugin and a thread-safe version of passing current search string to Cardapio in Bing, Yahoo, Wikipedia and YouTube plugins

[lp:~keirangtp/cardapio/web-plugins]

343. By Pawel Bara on 2010-08-07

fallback search more item in eBay when the API call totally fails + finally got Tomboy plugin working well!

344. By Pawel Bara on 2010-08-07

tomboy: return immediately after passing empty search results to Cardapio

345. By Pawel Bara on 2010-08-08

minor documentation upgrades in Tomboys plugin

346. By Pawel Bara on 2010-08-08

new finished plugin: talk to your pidgin buddies!

347. By Pawel Bara on 2010-08-11

fixes bug 614710 - a little change in API of plugins: Cardapio passes result limit (count) to them

348. By Pawel Bara on 2010-08-12

minor corrections finalizing bug 614710

[Thiago Teixeira (tvst)]

This will be in the bzr trunk and PPA later tonight. Thanks for the help!

review: Approve

=== modified file 'src/cardapio.py'
--- src/cardapio.py	2010-08-05 21:09:45 +0000
+++ src/cardapio.py	2010-08-12 17:20:35 +0000
@@ -63,7 +63,7 @@
 
 except:
 	# assume that if gnomeapplet is not found then the user is running Cardapio
-	# without Gnome (maybe with './cardapio show', for example). 
+	# without Gnome (maybe with './cardapio show', for example).
 	print('Info: gnomeapplet Python module not present')
 
 try:
@@ -136,14 +136,14 @@
 	version = '0.9.136'
 
 	core_plugins = [
-			'applications', 
-			'google', 
-			'google_localized', 
+			'applications',
+			'google',
+			'google_localized',
 			'pinned',
-			'places', 
+			'places',
 			'software_center',
-			'tracker', 
-			'tracker_fts', 
+			'tracker',
+			'tracker_fts',
 			'zg_recent_documents',
 			]
 
@@ -216,20 +216,20 @@
 		self.setup_dbus()
 		self.setup_base_ui() # must be the first ui-related method to be called
 		self.setup_plugins()
-		self.build_ui() 
-		self.setup_ui_from_all_settings() 
+		self.build_ui()
+		self.setup_ui_from_all_settings()
 
 		self.schedule_search_with_all_plugins('')
 
 		if not hidden: self.show()
 
-		# this is useful so that the user can edit the config file on first-run 
+		# this is useful so that the user can edit the config file on first-run
 		# without need to quit cardapio first:
 		self.save_config_file()
 
 		if gnome_program_init is not None:
 			gnome_program_init('', self.version) # Prints a warning to the screen. Ignore it.
-			client = gnome_ui_master_client() 
+			client = gnome_ui_master_client()
 			client.connect('save-yourself', self.quit)
 
 
@@ -262,9 +262,9 @@
 		self.bus = dbus.SessionBus()
 		dbus.service.Object.__init__(self, self.bus, Cardapio.bus_obj_str)
 
-	
+
 	def get_plugin_class(self, basename):
-		""" 
+		"""
 		Returns the CardapioPlugin class from the plugin at plugins/basename.py.
 		If it fails, it returns a string decribing the error.
 		"""
@@ -277,7 +277,7 @@
 
 		plugin_class = plugin_module.CardapioPlugin
 
-		if plugin_class.plugin_api_version != CardapioPluginInterface.plugin_api_version: 
+		if plugin_class.plugin_api_version != CardapioPluginInterface.plugin_api_version:
 			return 'Incorrect API version'
 
 		return plugin_class
@@ -325,7 +325,7 @@
 				}
 
 		plugin_dirs = [
-			os.path.join(cardapio_path, 'plugins'), 
+			os.path.join(cardapio_path, 'plugins'),
 			os.path.join(DesktopEntry.xdg_config_home, 'Cardapio', 'plugins')
 			]
 
@@ -374,7 +374,7 @@
 			basename = str(basename)
 			plugin_class = self.get_plugin_class(basename)
 
-			if type(plugin_class) is str: 
+			if type(plugin_class) is str:
 				logging.error('[plugin: %s] %s' % (basename, plugin_class))
 				self.settings['active plugins'].remove(basename)
 				continue
@@ -425,7 +425,7 @@
 		levels of messages can be used by setting one of is_debug, is_warning, is_error:
 
 		debug       - Used for any debugging message, including any messages that may
-		              be privacy sensitive. Messages set with the flag is_debug=True 
+		              be privacy sensitive. Messages set with the flag is_debug=True
 		              will *not* be logged unless the user enters debug mode.
 
 		info        - This is the default level when you don't set any of the flags.
@@ -438,13 +438,13 @@
 		              allow the plugin to function at all.
 		"""
 
-		if is_error: 
+		if is_error:
 			write = logging.error
 
-		elif is_warning: 
+		elif is_warning:
 			write = logging.warning
 
-		elif is_debug: 
+		elif is_debug:
 			write = logging.debug
 
 		else:
@@ -494,7 +494,7 @@
 
 		self.config_folder_path = os.path.join(DesktopEntry.xdg_config_home, 'Cardapio')
 
-		if not os.path.exists(self.config_folder_path): 
+		if not os.path.exists(self.config_folder_path):
 			os.mkdir(self.config_folder_path)
 
 		elif not os.path.isdir(self.config_folder_path):
@@ -537,14 +537,14 @@
 		self.settings = {}
 		s = {}
 
-		try: 
+		try:
 			s = json.load(config_file)
 
 		except Exception, exception:
 			logging.error('Could not read config file:')
 			logging.error(exception)
 
-		finally: 
+		finally:
 			config_file.close()
 
 		default_side_pane_items = []
@@ -552,20 +552,20 @@
 		if os.path.exists(path):
 			default_side_pane_items.append(
 				{
-					'name'      : _('Ubuntu Software Center'), 
+					'name'      : _('Ubuntu Software Center'),
 					'icon name' : 'softwarecenter',
-					'tooltip'   : _('Lets you choose from thousands of free applications available for Ubuntu'), 
+					'tooltip'   : _('Lets you choose from thousands of free applications available for Ubuntu'),
 					'type'      : 'raw',
-					'command'   : 'software-center', 
+					'command'   : 'software-center',
 				})
 
 		default_side_pane_items.append(
 			{
-				'name'      : _('Help and Support'), 
+				'name'      : _('Help and Support'),
 				'icon name' : 'help-contents',
-				'tooltip'   : _('Get help with %(distro_name)s') % {'distro_name':Cardapio.distro_name}, 
+				'tooltip'   : _('Get help with %(distro_name)s') % {'distro_name':Cardapio.distro_name},
 				'type'      : 'raw',
-				'command'   : 'gnome-help', 
+				'command'   : 'gnome-help',
 			})
 
 		self.read_config_option(s, 'window size'                , None                     ) # format: [px, px]
@@ -585,10 +585,10 @@
 		self.read_config_option(s, 'keybinding'                 , '<Super>space'           ) # the user should use gtk.accelerator_parse('<Super>space') to see if the string is correct!
 		self.read_config_option(s, 'applet label'               , Cardapio.distro_name     ) # string
 		self.read_config_option(s, 'applet icon'                , 'start-here'             , override_empty_str = True) # string (either a path to the icon, or an icon name)
-		self.read_config_option(s, 'pinned items'               , []                       ) 
+		self.read_config_option(s, 'pinned items'               , []                       )
 		self.read_config_option(s, 'side pane items'            , default_side_pane_items  )
-		self.read_config_option(s, 'active plugins'             , ['pinned', 'places', 'applications', 'tracker', 'google', 'software_center']) 
-		self.read_config_option(s, 'plugin settings'            , {}                       ) 
+		self.read_config_option(s, 'active plugins'             , ['pinned', 'places', 'applications', 'tracker', 'google', 'software_center'])
+		self.read_config_option(s, 'plugin settings'            , {}                       )
 
 		# these are a bit of a hack:
 		self.read_config_option(s, 'handler for ftp paths'      , r"nautilus '%s'"         ) # a command line using %s
@@ -635,7 +635,7 @@
 				self.settings[key] = val
 			else:
 				self.settings[key] = user_settings[key]
-		else: 
+		else:
 			self.settings[key] = val
 
 		if force_update_from_version is not None:
@@ -709,12 +709,12 @@
 		self.plugin_checkbox_column    = self.get_object('PluginCheckboxColumn')
 		self.view_mode_button          = self.get_object('ViewModeButton')
 
-		# HACK: fix names of widgets to allow theming 
+		# HACK: fix names of widgets to allow theming
 		# (glade doesn't seem to properly add names to widgets anymore...)
 		for widget in self.builder.get_objects():
 
 			# skip the about dialog or the app name will be overwritten!
-			if widget == self.about_dialog: continue 
+			if widget == self.about_dialog: continue
 
 			if 'set_name' in dir(widget):
 				widget.set_name(gtk.Buildable.get_name(widget))
@@ -767,10 +767,10 @@
 				<menuitem name="Item 5" verb="AboutDistro" label="%s" pixtype="none"/>
 			</popup>
 			''' % (
-				_('_Properties'), 
-				_('_Edit Menus'), 
-				_('_About Cardapio'), 
-				_('_About Gnome'), 
+				_('_Properties'),
+				_('_Edit Menus'),
+				_('_About Cardapio'),
+				_('_About Gnome'),
 				_('_About %(distro_name)s') % {'distro_name' : Cardapio.distro_name}
 			)
 
@@ -799,7 +799,7 @@
 		self.safe_cardapio_proxy.handle_search_error = self.plugin_handle_search_error
 		self.safe_cardapio_proxy.ask_for_reload_permission = self.plugin_ask_for_reload_permission
 
-		self.build_plugin_database() 
+		self.build_plugin_database()
 		self.activate_plugins_from_settings()
 
 
@@ -810,7 +810,7 @@
 
 		panel = self.panel_button.get_toplevel().window
 
-		if panel is None: 
+		if panel is None:
 			return gtk.icon_size_lookup(gtk.ICON_SIZE_LARGE_TOOLBAR)[0]
 
 		panel_width, panel_height = panel.get_size()
@@ -836,7 +836,7 @@
 
 	def setup_panel_button(self):
 		"""
-		Sets up the look and feel of the Cardapio applet button 
+		Sets up the look and feel of the Cardapio applet button
 		"""
 
 		self.panel_button.set_label(self.settings['applet label'])
@@ -923,13 +923,13 @@
 
 		button = self.add_button(_('All'), None, self.category_pane, tooltip = _('Show all categories'), button_type = Cardapio.CATEGORY_BUTTON)
 		button.connect('clicked', self.on_all_sections_sidebar_button_clicked)
-		self.all_sections_sidebar_button = button 
+		self.all_sections_sidebar_button = button
 		self.set_sidebar_button_active(button, True)
 		self.all_sections_sidebar_button.set_sensitive(False)
 
 		button = self.add_button(_('All'), None, self.system_category_pane, tooltip = _('Show all categories'), button_type = Cardapio.CATEGORY_BUTTON)
 		button.connect('clicked', self.on_all_sections_sidebar_button_clicked)
-		self.all_system_sections_sidebar_button = button 
+		self.all_system_sections_sidebar_button = button
 		self.set_sidebar_button_active(button, True)
 		self.all_system_sections_sidebar_button.set_sensitive(False)
 
@@ -1076,7 +1076,7 @@
 			is_core     = (basename in self.core_plugins)
 			is_required = (basename in self.required_plugins)
 
-			if is_required : title = '<b>%s</b>' % name 
+			if is_required : title = '<b>%s</b>' % name
 
 			icon_pixbuf = self.get_icon_pixbuf(plugin_info['category icon'], icon_size, 'package-x-generic')
 
@@ -1085,7 +1085,7 @@
 		self.update_plugin_description()
 		self.options_dialog.show()
 
-	
+
 	def close_options_dialog(self, *dummy):
 		"""
 		Hides the Options Dialog
@@ -1118,7 +1118,7 @@
 
 		model, iter_ = self.get_object('PluginTreeView').get_selection().get_selected()
 
-		if iter_ is None: 
+		if iter_ is None:
 			is_core = True
 			plugin_info = {'name': '', 'version': '', 'author': '', 'description': ''}
 
@@ -1137,7 +1137,7 @@
 
 		# make sure the label doesn't resize the window!
 		if width > 1:
-			label.set_size_request(width - self.scrollbar_width - 20, -1) 
+			label.set_size_request(width - self.scrollbar_width - 20, -1)
 
 		# The -20 is a hack because some themes add extra padding that I need to
 		# account for. Since I don't know where that padding is comming from, I
@@ -1181,13 +1181,13 @@
 
 		pthinfo = treeview.get_path_at_pos(int(event.x), int(event.y))
 
-		if pthinfo is None: 
+		if pthinfo is None:
 			treeview.window.set_cursor(None)
 			return
 
 		path, col, cellx, celly = pthinfo
 
-		if col == self.plugin_checkbox_column: 
+		if col == self.plugin_checkbox_column:
 			treeview.window.set_cursor(None)
 		else:
 			treeview.window.set_cursor(self.drag_allowed_cursor)
@@ -1205,7 +1205,7 @@
 
 		if basename in self.required_plugins: return
 
-		self.plugin_tree_model.set_value(iter_, 3, not cell.get_active())	
+		self.plugin_tree_model.set_value(iter_, 3, not cell.get_active())
 		self.apply_plugins_from_option_window()
 
 
@@ -1231,7 +1231,7 @@
 		y = event.y_root - window_y
 		window_width, window_height = self.window.get_size()
 		resize_margin = 10
-		
+
 		if x < resize_margin:
 
 			if y < resize_margin:
@@ -1260,7 +1260,7 @@
 
 			else:
 				edge = gtk.gdk.WINDOW_EDGE_SOUTH
-		
+
 		x = int(event.x_root)
 		y = int(event.y_root)
 
@@ -1336,7 +1336,7 @@
 			# So by ignoring this focus-out we actually make sure that Cardapio
 			# will be hidden after all. Silly.
 
-			if self.panel_applet is not None and (0 <= cursor_x <= applet_w and 0 <= cursor_y <= applet_h): 
+			if self.panel_applet is not None and (0 <= cursor_x <= applet_w and 0 <= cursor_y <= applet_h):
 				return
 
 		# If the last app was opened in the background, make sure Cardapio
@@ -1364,7 +1364,7 @@
 
 	def on_mainwindow_delete_event(self, widget, event):
 		"""
-		What happens when the user presses Alt-F4? If in panel mode, 
+		What happens when the user presses Alt-F4? If in panel mode,
 		nothing. If in launcher mode, this terminates Cardapio.
 		"""
 
@@ -1591,7 +1591,7 @@
 			button = self.add_app_button(filename, icon_name, self.subfolders_section_contents, 'xdg', command, tooltip = command, app_list = None)
 
 		if count:
-			self.subfolders_section_slab.show() 
+			self.subfolders_section_slab.show()
 			self.set_section_has_entries(self.subfolders_section_slab)
 			self.no_results_to_show = False
 
@@ -1628,7 +1628,7 @@
 
 		for plugin_keyword in self.keyword_to_plugin_mapping:
 			if plugin_keyword.find(keyword) == 0:
-				keyword_exists = True	
+				keyword_exists = True
 				keyword = plugin_keyword
 				break
 
@@ -1695,7 +1695,7 @@
 			try:
 				# TODO: make plugins run in a separate thread
 				self.show_plugin_loading_text(plugin)
-				plugin.search(text, long_search = True)
+				plugin.search(text, self.settings['long search results limit'])
 
 			except Exception, exception:
 				self.plugin_write_to_log(plugin, 'Plugin search query failed to execute', is_error = True)
@@ -1705,7 +1705,7 @@
 
 		for plugin in self.active_plugin_instances:
 
-			if plugin.search_delay_type != delay_type or plugin.show_only_with_keyword: 
+			if plugin.search_delay_type != delay_type or plugin.show_only_with_keyword:
 				continue
 
 			if plugin.hide_from_sidebar and len(text) < self.settings['min search string length']:
@@ -1716,7 +1716,7 @@
 			try:
 				# TODO: make plugins run in a separate thread
 				self.show_plugin_loading_text(plugin)
-				plugin.search(text)
+				plugin.search(text, self.settings['search results limit'])
 
 			except Exception, exception:
 				self.plugin_write_to_log(plugin, 'Plugin search query failed to execute', is_error = True)
@@ -1944,7 +1944,7 @@
 
 		if self.is_search_entry_empty():
 			self.hide_all_transitory_sections()
-			return 
+			return
 
 		first_app_widget = self.get_first_visible_app()
 		if first_app_widget is not None:
@@ -1973,9 +1973,9 @@
 
 			else:
 				first_app_widget = self.get_first_visible_app()
-				if first_app_widget is not None: 
+				if first_app_widget is not None:
 					self.window.set_focus(first_app_widget)
-				
+
 
 		elif event.keyval == gtk.gdk.keyval_from_name('Escape'):
 
@@ -2095,7 +2095,7 @@
 		if orientation == gnomeapplet.ORIENT_DOWN:
 			window_x = panel_x + applet_x
 			window_y = panel_y + applet_y + applet_height
-			
+
 		# bottom
 		elif orientation == gnomeapplet.ORIENT_UP:
 			window_x = panel_x + applet_x
@@ -2105,7 +2105,7 @@
 		elif orientation == gnomeapplet.ORIENT_RIGHT:
 			window_x = panel_x + applet_x + applet_width
 			window_y = panel_y + applet_y
-		
+
 		# right
 		elif orientation == gnomeapplet.ORIENT_LEFT:
 			window_x = panel_x + applet_x - window_width
@@ -2131,7 +2131,7 @@
 		Resize Cardapio according to the user preferences
 		"""
 
-		if self.settings['window size'] is not None: 
+		if self.settings['window size'] is not None:
 			self.window.resize(*self.settings['window size'])
 
 		if self.settings['splitter position'] > 0:
@@ -2282,7 +2282,7 @@
 		window.present_with_time(int(time.time()))
 
 		# for metacity, this is required!!
-		window.window.focus() 
+		window.window.focus()
 
 
 	def on_panel_button_pressed(self, widget, event):
@@ -2504,13 +2504,13 @@
 
 	def on_volume_monitor_changed(self, drive):
 		"""
-		Handler for when volumes are mounted or ejected 
+		Handler for when volumes are mounted or ejected
 		"""
 
 		self.clear_pane(self.places_section_contents)
 		self.build_places_list()
 
-	
+
 	def get_folder_name_and_path(self, folder_path):
 		"""
 		Returns a folder's name and path from its full filename
@@ -2519,12 +2519,12 @@
 		path = folder_path.strip(' \n\r\t')
 
 		res = folder_path.split(os.path.sep)
-		if res: 
+		if res:
 			name = res[-1].strip(' \n\r\t').replace('%20', ' ')
 			if name: return name, path
 
 		# TODO: handle remote folders like nautilus does (i.e. '/home on ftp.myserver.net')
-		name = path.replace('%20', ' ')	
+		name = path.replace('%20', ' ')
 		return name, path
 
 
@@ -2535,7 +2535,7 @@
 		"""
 
 		res = folder_path.split(' ')
-		if len(res) > 1: 
+		if len(res) > 1:
 			name = ' '.join(res[1:]).strip(' \n\r\t')
 			path = res[0]
 			return name, path
@@ -2568,8 +2568,8 @@
 
 		text = self.search_entry.get_text().strip().lower()
 
-		no_results = True 
-		
+		no_results = True
+
 		for app in self.settings[list_name]:
 
 			# fixing a misspelling from the old config files...
@@ -2626,7 +2626,7 @@
 			[
 				_('Log Out...'),
 				_('Log out of this session to log in as a different user'),
-				'system-log-out', 
+				'system-log-out',
 				'gnome-session-save --logout-dialog',
 				self.right_session_pane,
 			],
@@ -2688,18 +2688,18 @@
 			sidebar_button.hide()
 			section_slab.hide()
 			self.section_list[section_slab] = {
-					'has entries': False, 
-					'category': sidebar_button, 
-					'contents': section_contents, 
+					'has entries': False,
+					'category': sidebar_button,
+					'contents': section_contents,
 					'name': title_str,
 					'is system section': system_menu,
 					}
 
 		else:
 			self.section_list[section_slab] = {
-					'has entries': True, 
-					'category': sidebar_button, 
-					'contents': section_contents, 
+					'has entries': True,
+					'category': sidebar_button,
+					'contents': section_contents,
 					'name': title_str,
 					'is system section': system_menu,
 					}
@@ -2810,7 +2810,7 @@
 				self.add_session_slab()
 				self.add_system_slab()
 				#self.build_system_list() # TODO: use gnomecc.menu
-                                           
+
 			elif basename == 'places':
 				self.add_places_slab()
 
@@ -2863,15 +2863,15 @@
 
 		if command_type != 'callback' and command_type != 'raw':
 
-			if command_type == 'app': 
+			if command_type == 'app':
 				button.drag_source_set(
-						gtk.gdk.BUTTON1_MASK, 
-						[('text/uri-list', 0, 0)], 
+						gtk.gdk.BUTTON1_MASK,
+						[('text/uri-list', 0, 0)],
 						gtk.gdk.ACTION_COPY)
-			else: 
+			else:
 				button.drag_source_set(
-						gtk.gdk.BUTTON1_MASK, 
-						[('text/uri-list', 0, 0)], 
+						gtk.gdk.BUTTON1_MASK,
+						[('text/uri-list', 0, 0)],
 						gtk.gdk.ACTION_LINK)
 
 			button.connect('drag-begin', self.on_app_button_drag_begin)
@@ -2934,7 +2934,7 @@
 		align = gtk.Alignment(0, 0.5)
 		align.add(hbox)
 
-		if tooltip: 
+		if tooltip:
 			tooltip = self.unescape(tooltip)
 			button.set_tooltip_text(tooltip)
 
@@ -2988,7 +2988,7 @@
 
 		# TODO: speed this up!
 
-		if not icon_value: 
+		if not icon_value:
 			icon_value = fallback_icon
 
 		icon_pixbuf = None
@@ -3037,7 +3037,7 @@
 		# try generic mimetype
 		gen_type = icon_name.split('-')[0]
 		icon_name = gen_type + '-x-generic'
-		if self.icon_theme.has_icon(icon_name):	
+		if self.icon_theme.has_icon(icon_name):
 			return icon_name
 
 		return None
@@ -3064,7 +3064,7 @@
 			for icon_name in icons:
 				if self.icon_theme.has_icon(icon_name):
 					return icon_name
-			
+
 		return None
 
 
@@ -3087,7 +3087,7 @@
 
 	def read_gtk_theme_info(self):
 		"""
-		Reads colors and other info from the GTK theme so that the app better 
+		Reads colors and other info from the GTK theme so that the app better
 		adapt to any custom theme
 		"""
 
@@ -3201,8 +3201,8 @@
 		"""
 
 		self.clicked_app = widget.app_info
-		
-		if widget.app_info['type'] == 'callback': 
+
+		if widget.app_info['type'] == 'callback':
 			self.pin_menuitem.hide()
 			self.unpin_menuitem.hide()
 			self.add_side_pane_menuitem.hide()
@@ -3217,12 +3217,12 @@
 		self.app_menu_separator.show()
 
 		for command in [app['command'] for app in self.settings['pinned items']]:
-			if command == widget.app_info['command']: 
+			if command == widget.app_info['command']:
 				already_pinned = True
 				break
 
 		for command in [app['command'] for app in self.settings['side pane items']]:
-			if command == widget.app_info['command']: 
+			if command == widget.app_info['command']:
 				already_on_side_pane = True
 				break
 
@@ -3288,7 +3288,7 @@
 
 		i = 0
 
-		for item_info in self.clicked_app['context menu']:	
+		for item_info in self.clicked_app['context menu']:
 
 			menu_item = gtk.ImageMenuItem(item_info['name'], True)
 			menu_item.set_tooltip_text(item_info['tooltip'])
@@ -3322,7 +3322,7 @@
 		elif alloc.y + alloc.height > scroller_position + page_size:
 			self.scroll_adjustment.set_value(alloc.y + alloc.height - page_size)
 
-	
+
 	def on_app_button_drag_begin(self, button, drag_context):
 		"""
 		Set up drag action (not much goes on here...)
@@ -3335,7 +3335,7 @@
 	def on_app_button_data_get(self, button, drag_context, selection_data, info, time):
 		"""
 		Prepare the data that will be sent to the other app when the drag-and-drop
-		operation is done	
+		operation is done
 		"""
 
 		command = button.app_info['command']
@@ -3344,7 +3344,7 @@
 		if command_type == 'app':
 			command = 'file://' + command
 
-		elif command_type == 'xdg': 
+		elif command_type == 'xdg':
 
 			path_type, dummy = urllib2.splittype(command)
 			if path_type is None: command = 'file://' + command
@@ -3400,7 +3400,7 @@
 			path = DesktopEntry.DesktopEntry(command).getExec()
 
 			# Strip parts of the path that contain %<a-Z>
-			
+
 			path_parts = path.split()
 
 			for i in xrange(len(path_parts)):
@@ -3439,11 +3439,11 @@
 				response = self.show_executable_file_dialog(path)
 
 				# if "Run in Terminal"
-				if response == 1: 
+				if response == 1:
 					return self.launch_raw_in_terminal(path, hide)
 
 				# if "Display"
-				elif response == 2: 
+				elif response == 2:
 					pass
 
 				# if "Run"
@@ -3451,7 +3451,7 @@
 					return self.launch_raw(path, hide)
 
 				# if "Cancel"
-				else: 
+				else:
 					return
 
 		elif path_type in ['ftp', 'sftp', 'smb']:
@@ -3540,7 +3540,7 @@
 		else:
 			widget = self.all_sections_sidebar_button
 
-		self.set_sidebar_button_active(widget, True) 
+		self.set_sidebar_button_active(widget, True)
 
 		if self.is_search_entry_empty():
 			widget.set_sensitive(False)
@@ -3604,11 +3604,11 @@
 			if self.plugins_still_searching > 0:
 				return
 
-			if self.no_results_to_show: 
+			if self.no_results_to_show:
 				self.show_no_results_text()
 
-			return 
-			
+			return
+
 		if self.section_list[self.selected_section]['has entries']:
 			self.selected_section.show()
 			self.hide_no_results_text()
@@ -3629,7 +3629,7 @@
 		self.hide_section(self.system_section_slab, fully_hide)
 		self.hide_section(self.sidepane_section_slab, fully_hide)
 		self.hide_section(self.uncategorized_section_slab, fully_hide)
-		
+
 		self.hide_transitory_plugin_sections(fully_hide)
 
 
@@ -3713,7 +3713,7 @@
 
 
 class CardapioPluginInterface:
-	# for documentation, see: https://answers.launchpad.net/cardapio/+faq/1172 
+	# for documentation, see: https://answers.launchpad.net/cardapio/+faq/1172
 
 	author      = ''
 	name        = ''
@@ -3724,7 +3724,7 @@
 	help_text   = ''
 	version     = ''
 
-	plugin_api_version = 1.37
+	plugin_api_version = 1.38
 
 	search_delay_type = 'local search update delay'
 
@@ -3749,7 +3749,7 @@
 		For example, the Tracker plugin sets self.loaded to False if Tracker is not
 		installed in the system.
 
-		The constructor is given a single parameter, which is an object used to 
+		The constructor is given a single parameter, which is an object used to
 		communicate with Cardapio. This object has the following members:
 
 		   - settings - this is a dict containing the same things that you will
@@ -3759,17 +3759,17 @@
 		     log file, like this: write_to_log(self, 'hi there')
 
 		   - handle_search_result - a function to which you should pass the
-		     search results when you have them (see more info below, in the 
+		     search results when you have them (see more info below, in the
 			 search() method)
 
 		   - handle_search_error - a function to which you should pass an error
-		     message if the search fails (see more info below, in the 
+		     message if the search fails (see more info below, in the
 			 search() method)
 
 		   - ask_for_reload_permission - a function that should be used whenever
 			 the plugin wants to reload its database. Not all plugins have
 			 internal databases, though, so this is not always applicable. This
-			 is used, for example, with the software_center plugin. (see 
+			 is used, for example, with the software_center plugin. (see
  		     on_reload_permission_granted below for more info)
 
 		Note: DO NOT WRITE ANYTHING IN THE settings DICT!!
@@ -3787,44 +3787,38 @@
 		pass
 
 
-	def search(self, text, long_search = False):
+	def search(self, text, result_limit):
 		"""
 		REQUIRED
 
 		This method gets called when a new text string is entered in the search
-		field. It also takes an argument indicating whether this is a "long search" or
-		not. This indicates the amount of items that the plugin should return to 
-		Cardapio:
+		field. It also takes an argument indicating the maximum number of
+		results Cardapio's expecting. The plugin should always provide as many
+		results as it can but their number cannot exceed the given limit!
 
-		   * if long_search == True:
-		   --> # of items = cardapio_proxy.settings['search results limit']
-		
-		   * if long_search == False:
-		   --> # of items = cardapio_proxy.settings['long search results limit']
-		
 		One of the following functions should be called from this method
 		(of from a thread spawned by this method):
 
 		   * if all goes well:
-		   --> handle_search_result(plugin, results, original_query) 
+		   --> handle_search_result(plugin, results, original_query)
 
 		   * if there is an error
-		   --> handle_search_error(plugin, text)     
+		   --> handle_search_error(plugin, text)
 
 		The arguments to these functions are:
 
-		   * plugin          - this plugin instance (that is, it should always 
+		   * plugin          - this plugin instance (that is, it should always
 		                       be "self", without quotes)
 		   * text            - some text to be inserted in Cardapio's log.
 		   * results         - an array of dict items as described below.
 		   * original_query  - the search query that this corresponds to. The
-		                       plugin should save the query received by the 
+		                       plugin should save the query received by the
 							   search() method and pass it back to Cardapio.
 
 		item = {
 		  'name'         : _('Music'),
 		  'tooltip'      : _('Show your Music folder'),
-		  'icon name'    : 'text-x-generic', 
+		  'icon name'    : 'text-x-generic',
 		  'type'         : 'xdg',
 		  'command'      : '~/Music',
 		  'context menu' : None
@@ -3860,9 +3854,9 @@
 	def on_reload_permission_granted(self):
 		"""
 		NOT REQUIRED
-		
+
 		Whenever a plugin wishes to rebuild some sort of internal database,
-		if this takes more than a couple of milliseconds it is advisable to 
+		if this takes more than a couple of milliseconds it is advisable to
 		first ask Cardapio for permission. This is how this works:
 
 		1) Plugin calls cardapio_proxy.ask_for_reload_permission(self)
@@ -3870,11 +3864,11 @@
 		Cardapio then decides at what time it is best to give the plugin the
 		reload permission. Usually this can take up to 10s, to allow several
 		plugins to reload at the same time. Then, Cardapio shows the "Data has
-		changed" window.  
-		
+		changed" window.
+
 		2) Cardapio calls on_reload_permission_granted to tell the plugin that
-		it can reload its database 
-		
+		it can reload its database
+
 		When done, the "Data has changed" window is hidden.
 		"""
 		pass

=== added file 'src/plugins/amazon.py'
--- src/plugins/amazon.py	1970-01-01 00:00:00 +0000
+++ src/plugins/amazon.py	2010-08-12 17:20:35 +0000
@@ -0,0 +1,268 @@
+import json
+import gio
+import urllib
+
+import base64
+import hashlib
+import hmac
+import time
+
+from xml.etree import ElementTree
+
+from locale import getdefaultlocale
+
+class CardapioPlugin(CardapioPluginInterface):
+
+	"""
+	Amazon plugin based on it's Product Advertising API. We provide
+	results from all of the shop's categories.
+
+	API's documentation can be found at:
+	http://docs.amazonwebservices.com/AWSECommerceService/2009-11-01/DG/
+
+	If there's a localized API version, the plugin will use it. Amazon includes
+	CA, GB, JP, FR and DE versions.
+	As a fallback strategy, we use the United States version.
+
+	The Cardapio's result limit is not fully respected. Amazon always
+	returns paginated results with 10 elements per page. Because of the
+	asynchronous nature of Cardapio's searching, we cannot use the
+	pagination feature. We need to stick to the first page of results
+	and that's why this plugin will always return at most 10 items.
+
+	All of the plugin's web requests are asynchronous and cancellable.
+	"""
+
+	# Cardapio's variables
+	author = 'Pawel Bara'
+	name = _('Amazon')
+	description = _('Search for results in Amazon')
+	version = '0.9b'
+
+	url = ''
+	help_text = ''
+
+	default_keyword = 'amazon'
+
+	plugin_api_version = 1.38
+
+	search_delay_type = 'remote search update delay'
+
+	category_name = _('Amazon Results')
+	category_tooltip = _('Results found in Amazon')
+
+	category_icon = 'system-search'
+	fallback_icon = ''
+
+	hide_from_sidebar = True
+
+	def __init__(self, cardapio_proxy):
+		cardapio_proxy.write_to_log(self, 'initializing Amazon plugin')
+
+		self.cardapio = cardapio_proxy
+
+		self.cancellable = gio.Cancellable()
+
+		# my API keys
+		self.aws_access_key = 'AKIAIW35CYEJ653CJJHQ'
+		self.aws_secret_access_key = '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'
+
+		# basic API's arguments (search in all categories)
+		self.api_base_args = {
+			'Service'       : 'AWSECommerceService',
+			'Version'       : '2009-11-01',
+			'Operation'     : 'ItemSearch',
+			'SearchIndex'   : 'All',
+			'ResponseGroup' : 'Small',
+ 			'AWSAccessKeyId': self.aws_access_key
+		}
+
+		# try to get a locale specific URL for Amazon
+		self.locale_url = self.get_locale_url()
+
+		# Amazon's base URLs (search and search more variations)
+		self.api_base_url = 'http://' + self.locale_url + '/onca/xml?{0}'
+		self.web_base_url = 'http://www.amazon.com/s?url=search-alias%3Daps&{0}'
+
+		self.loaded = True
+
+	def get_locale_url(self):
+		"""
+		Tries to get a locale specific base URL for Amazon's API according to
+		http://docs.amazonwebservices.com/AWSECommerceService/2009-11-01/DG/
+
+		If there's none, uses ".com" as a fallback strategy.
+		"""
+
+		locale_dict = {
+			'ca' : 'ecs.amazonaws.ca',
+			'de' : 'ecs.amazonaws.de',
+			'fr' : 'ecs.amazonaws.fr',
+			'jp' : 'ecs.amazonaws.jp',
+			'uk' : 'ecs.amazonaws.co.uk'
+		}
+
+		default = 'ecs.amazonaws.com'
+
+		# get and parse the language code
+		lang_code = getdefaultlocale()[0]
+
+		if lang_code is None:
+			return default
+
+		lang = lang_code[:2].lower()
+		dialect = lang_code[3:].lower()
+
+		# try to find a mapping...
+		key = None
+		if lang == 'en':
+			if dialect == 'gb':
+				key = 'uk'
+			elif dialect == 'ca':
+				key = 'ca'
+		elif lang == 'fr':
+			key = 'fr'
+		elif lang == 'de':
+			key = 'de'
+		elif lang == 'ja':
+			key = 'jp'
+
+		return locale_dict.get(key, default)
+
+	def search(self, text, result_limit):
+		if len(text) == 0:
+			return
+
+		self.cardapio.write_to_log(self, 'searching for {0} using Amazon'.format(text), is_debug = True)
+
+		self.cancellable.reset()
+
+		# prepare final API URL
+		final_url = self.api_base_url.format(self.prepare_amazon_rest_url(text))
+
+		self.cardapio.write_to_log(self, 'final API URL: {0}'.format(final_url), is_debug = True)
+
+		# asynchronous and cancellable IO call
+		self.current_stream = gio.File(final_url)
+		self.current_stream.load_contents_async(self.show_search_results,
+			cancellable = self.cancellable,
+			user_data = (text, result_limit))
+
+	def prepare_amazon_rest_url(self, text):
+		"""
+		Prepares a RESTful URL according to Amazon's strict querying policies.
+		Deals with the variable part of the URL only (the one after the '?').
+		"""
+
+		# additional required API arguments
+		copy_args = self.api_base_args.copy()
+		copy_args['Keywords'] = text
+		copy_args['Timestamp'] = time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime())
+
+		# turn the argument map into a list of encoded request parameter strings
+		query_list = map(
+			lambda (k, v): (k + "=" + urllib.quote(v)),
+			copy_args.items()
+		)
+
+		# sort the list (by parameter name)
+		query_list.sort()
+
+		# turn the list into a partial URL string
+		query_string = "&".join(query_list)
+
+		# prepare a string on which we will base the AWS signature
+		string_to_sign = """GET
+{0}
+/onca/xml
+{1}""".format(self.locale_url, query_string)
+
+		# create HMAC for the string (using SHA-256 and our secret API key)
+		hm = hmac.new(key = self.aws_secret_access_key,
+       		msg = string_to_sign,
+         	digestmod = hashlib.sha256)
+		# final step... convert the HMAC to base64, then encode it
+		signature = urllib.quote(base64.b64encode(hm.digest()))
+
+		return query_string + '&Signature=' + signature
+
+	def show_search_results(self, gdaemonfile, result, user_data):
+		"""
+		Callback to asynchronous IO (Amazon's API call).
+		"""
+
+		text = user_data[0]
+		result_limit = user_data[1]
+
+		# watch out for connection problems
+		try:
+			xml_body = self.current_stream.load_contents_finish(result)[0]
+
+			# watch out for empty input
+			if len(xml_body) == 0:
+				return
+
+			root = ElementTree.fromstring(xml_body)
+
+			# strip the namespaces from all the parsed items
+			for el in root.getiterator():
+				ns_pos = el.tag.find('}')
+				if ns_pos != -1:
+					el.tag = el.tag[(ns_pos + 1):]
+		except Exception as ex:
+			self.cardapio.handle_search_error(self, 'error while obtaining data: {0}'.format(str(ex)))
+			return
+
+		# decode the result
+		try:
+			items = []
+
+			is_valid = root.find('Items/Request/IsValid')
+			total_results = root.find('Items/TotalResults')
+
+			# if we have a valid response with any results...
+			if (not is_valid is None) and is_valid != 'False' and (not total_results is None) and total_results != '0':
+				# remember them all
+				for i, item in enumerate(root.findall('Items/Item')):
+
+					# the number of results cannot be limited using Amazon's API...
+					if i == result_limit:
+						break
+
+					i_attributes = item.find('ItemAttributes')
+					url = item.find('DetailPageURL').text
+
+					items.append({
+						'name'         : i_attributes.find('Title').text + ' [' + i_attributes.find('ProductGroup').text + ']',
+						'tooltip'      : url,
+						'icon name'    : 'text-html',
+						'type'         : 'xdg',
+						'command'      : url,
+						'context menu' : None
+					})
+
+			# always add 'Search more...' item
+			search_more_args = { 'field-keywords' : text }
+
+			items.append({
+				'name'         : _('Show additional results'),
+				'tooltip'      : _('Show additional search results in your web browser'),
+				'icon name'    : 'system-search',
+				'type'         : 'xdg',
+				# TODO: cardapio later unquotes this and then quotes it again;
+				# it's screwing my quotation
+				'command'      : self.web_base_url.format(urllib.urlencode(search_more_args)),
+				'context menu' : None
+			})
+
+			# pass the results to Cardapio
+			self.cardapio.handle_search_result(self, items, text)
+
+		except KeyError:
+			self.cardapio.handle_search_error(self, "Incorrect Amazon's JSON structure")
+
+	def cancel(self):
+		self.cardapio.write_to_log(self, 'cancelling a recent Amazon search (if any)', is_debug = True)
+
+		if not self.cancellable.is_cancelled():
+			self.cancellable.cancel()

=== modified file 'src/plugins/bing.py'
--- src/plugins/bing.py	2010-08-04 20:24:22 +0000
+++ src/plugins/bing.py	2010-08-12 17:20:35 +0000
@@ -22,7 +22,7 @@
 	url = ''
 	help_text = ''
 
-	plugin_api_version = 1.37
+	plugin_api_version = 1.38
 
 	search_delay_type = 'remote search update delay'
 
@@ -43,18 +43,10 @@
 
 		self.cancellable = gio.Cancellable()
 
-		# Bing's API arguments (my AppID and a request for a web search with
-		# maximum four results)
+		# Bing's API arguments (my AppID and a request for a web search)
 		self.api_base_args = {
 			'Appid'    : '237CBC82BB8C3F7F5F19F6A77B0D38A59E8F8C2C',
-			'sources'  : 'web',
-			'web.count': self.cardapio.settings['search results limit'],
-		}
-
-		self.api_base_args_long = {
-			'Appid'    : '237CBC82BB8C3F7F5F19F6A77B0D38A59E8F8C2C',
-			'sources'  : 'web',
-			'web.count': self.cardapio.settings['long search results limit'],
+			'sources'  : 'web'
 		}
 
 		# Bing's base URLs (search and search more variations)
@@ -63,22 +55,18 @@
 
 		self.loaded = True
 
-	def search(self, text, long_search = False):
+	def search(self, text, result_limit):
 
 		if len(text) == 0:
 			return
 
-		self.current_query = text
-
 		self.cardapio.write_to_log(self, 'searching for {0} using Bing'.format(text), is_debug = True)
 
 		self.cancellable.reset()
 
 		# prepare final API URL
-		if long_search:
-			current_args = self.api_base_args_long.copy()
-		else:
-			current_args = self.api_base_args.copy()
+		current_args = self.api_base_args.copy()
+		current_args['web.count'] = result_limit
 
 		current_args['query'] = text
 		final_url = self.api_base_url.format(urllib.urlencode(current_args))
@@ -143,7 +131,7 @@
 			})
 
 			# pass the results to Cardapio
-			self.cardapio.handle_search_result(self, items, self.current_query)
+			self.cardapio.handle_search_result(self, items, text)
 
 		except KeyError:
 			self.cardapio.handle_search_error(self, "Incorrect Bing's JSON structure")

=== added file 'src/plugins/ebay.py'
--- src/plugins/ebay.py	1970-01-01 00:00:00 +0000
+++ src/plugins/ebay.py	2010-08-12 17:20:35 +0000
@@ -0,0 +1,251 @@
+import json
+import gio
+import urllib
+
+from glib import GError
+from locale import getdefaultlocale
+
+class CardapioPlugin(CardapioPluginInterface):
+	"""
+	eBay search plugin based on it's Finding API documented at:
+	http://developer.ebay.com/products/finding/
+
+	Please note, that this API limits the number of calls to 5000 per IP
+	and day.
+
+	All calls are localized, meaning that they are using eBay version local
+	to the user. The specific version being used is derived from the user's
+	computer locale.
+
+	For a list of locale supported by eBay check:
+	http://developer.ebay.com/DevZone/finding/Concepts/SiteIDToGlobalID.html
+	The listing there means that the plugin is localized for more than 20
+	countries. :) Nevertheless, we must have a fallback strategy and we use
+	the US version in this role.
+
+	All of the plugin's web requests are asynchronous and cancellable.
+	"""
+
+	# Cardapio's variables
+	author = 'Pawel Bara'
+	name = _('eBay')
+	description = _('Search for items on eBay')
+	version = '0.9b'
+
+	url = ''
+	help_text = ''
+
+	plugin_api_version = 1.38
+
+	search_delay_type = 'remote search update delay'
+
+	default_keyword = 'ebay'
+
+	category_name = _('eBay Results')
+	category_tooltip = _('Items found on eBay')
+
+	category_icon = 'system-search'
+	fallback_icon = ''
+
+	hide_from_sidebar = True
+
+	def __init__(self, cardapio_proxy):
+		cardapio_proxy.write_to_log(self, 'initializing eBay plugin')
+
+		self.cardapio = cardapio_proxy
+
+		self.cancellable = gio.Cancellable()
+
+		# eBay's API arguments (my API key, 'find' operation, JSON response format,
+		# and locale information)
+		self.api_base_args = {
+			'SECURITY-APPNAME'     : 'Cardapio-9704-40b3-8e17-cfad62dd6c45',
+			'OPERATION-NAME'       : 'findItemsByKeywords',
+			'RESPONSE-DATA-FORMAT' : 'JSON',
+			'GLOBAL-ID'            : self.get_global_id()
+		}
+
+		# eBay's base URLs (search and a fallback search more variations)
+		self.api_base_url = 'http://svcs.ebay.com/services/search/FindingService/v1?{0}'
+		self.web_base_url = 'http://shop.ebay.com/?{0}'
+
+		self.loaded = True
+
+	def get_global_id(self):
+		"""
+		Tries to get a locale specific GLOBAL-ID argument for eBay's API.
+		For more information check those two websites:
+		http://developer.ebay.com/DevZone/finding/Concepts/SiteIDToGlobalID.html
+		http://developer.ebay.com/DevZone/finding/CallRef/Enums/GlobalIdList.html
+
+		We use 'EBAY-US' as a fallback strategy.
+		"""
+
+		default = 'EBAY-US'
+
+		# get and parse the language code
+		lang_code = getdefaultlocale()[0]
+
+		if lang_code is None:
+			return default
+
+		lang = lang_code[:2].lower()
+		dialect = lang_code[3:].lower()
+
+		# try to find a mapping...
+		result = None
+		if lang == 'en':
+			if dialect == 'gb':
+				result = 'EBAY-GB'
+			elif dialect == 'ca':
+				result = 'EBAY-ENCA'
+			elif dialect == 'ie':
+				result = 'EBAY-IE'
+			elif dialect == 'in':
+				result = 'EBAY-IN'
+			elif dialect == 'my':
+				result = 'EBAY-MY'
+			elif dialect == 'ph':
+				result = 'EBAY-PH'
+			elif dialect == 'sg':
+				result = 'EBAY-SG'
+			elif dialect == 'au':
+				result = 'EBAY-AU'
+		elif lang == 'fr':
+			if dialect == 'be':
+				result = 'EBAY-FRBE'
+			elif dialect == 'ca':
+				result = 'EBAY-FRCA'
+			else:
+				result = 'EBAY-FR'
+		elif lang == 'de':
+			if dialect == 'at':
+				result = 'EBAY-AT'
+			elif dialect == 'ch':
+				result = 'EBAY-CH'
+			else:
+				result = 'EBAY-DE'
+		elif lang == 'it':
+			result = 'EBAY-IT'
+		elif lang == 'pl':
+			result = 'EBAY-PL'
+		elif lang == 'es':
+			result = 'EBAY-ES'
+		elif lang == 'nl':
+			if dialect == 'be':
+				result = 'EBAY-NLBE'
+			else:
+				result = 'EBAY-NL'
+		elif lang == 'zh':
+			result = 'EBAY-HK'
+		elif lang == 'sv':
+			result = 'EBAY-SE'
+
+		return default if result is None else result
+
+	def search(self, text, result_limit):
+		if len(text) == 0:
+			return
+
+		self.cardapio.write_to_log(self, 'searching for {0} on eBay'.format(text), is_debug = True)
+
+		self.cancellable.reset()
+
+		# prepare final API URL (items per page and search keyword)
+		current_args = self.api_base_args.copy()
+		current_args['paginationInput.entriesPerPage'] = result_limit
+		current_args['keywords'] = text
+
+		final_url = self.api_base_url.format(urllib.urlencode(current_args))
+
+		self.cardapio.write_to_log(self, 'final API URL: {0}'.format(final_url), is_debug = True)
+
+		# asynchronous and cancellable IO call
+		self.current_stream = gio.File(final_url)
+		self.current_stream.load_contents_async(self.show_search_results,
+			cancellable = self.cancellable,
+			user_data = text)
+
+	def show_search_results(self, gdaemonfile, result, text):
+		"""
+		Callback to asynchronous IO (eBay's API call).
+		"""
+
+		# watch out for connection problems
+		try:
+			json_body = self.current_stream.load_contents_finish(result)[0]
+
+			# watch out for empty input
+			if len(json_body) == 0:
+				return
+
+			response = json.loads(json_body)
+		except (ValueError, GError) as ex:
+			self.cardapio.handle_search_error(self, 'error while obtaining data: {0}'.format(str(ex)))
+			return
+
+		# decode the result
+		try:
+			items = []
+
+			response_body = response['findItemsByKeywordsResponse'][0]
+
+			# if we made a successful call...
+			if response_body['ack'][0] == 'Success':
+				search_result = response_body['searchResult'][0]
+
+				# and we have any results...
+				if int(search_result['@count']) > 0:
+
+					# remember them all
+					for ebay_item in search_result['item']:
+						ebay_item_url = ebay_item['viewItemURL'][0]
+
+						items.append({
+							'name'         : ebay_item['title'][0],
+							'tooltip'      : ebay_item_url,
+							'icon name'    : 'text-html',
+							'type'         : 'xdg',
+							'command'      : ebay_item_url,
+							'context menu' : None
+							})
+
+				# on a succesful call, add the 'Search more...' item (URL from the response)
+				items.append({
+					'name'	       : _('Show additional results'),
+					'tooltip'      : _('Show additional search results in your web browser'),
+					'icon name'    : 'system-search',
+					'type'         : 'xdg',
+					'command'      : response_body['itemSearchURL'][0],
+					'context menu' : None
+				})
+
+			# if the API call failed, add the generic 'search more' item
+			if len(items) == 0:
+				search_more_args = {
+					'_nkw'   : text,
+					'_sacat' : 'See-All-Categories'
+				}
+
+				items.append({
+					'name'	       : _('Show additional results'),
+					'tooltip'      : _('Show additional search results in your web browser'),
+					'icon name'    : 'system-search',
+					'type'         : 'xdg',
+					# TODO: cardapio later unquotes this and then quotes it again;
+					# it's screwing my quotation
+					'command'      : self.web_base_url.format(urllib.urlencode(search_more_args)),
+					'context menu' : None
+				})
+
+			# pass the results to Cardapio
+			self.cardapio.handle_search_result(self, items, text)
+
+		except KeyError:
+			self.cardapio.handle_search_error(self, "Incorrect eBay's JSON structure")
+
+	def cancel(self):
+		self.cardapio.write_to_log(self, 'cancelling a recent eBay search (if any)', is_debug = True)
+
+		if not self.cancellable.is_cancelled():
+			self.cancellable.cancel()

=== modified file 'src/plugins/google.py'
--- src/plugins/google.py	2010-08-04 20:24:22 +0000
+++ src/plugins/google.py	2010-08-12 17:20:35 +0000
@@ -12,7 +12,7 @@
 	help_text          = ''
 	version            = '1.37'
 
-	plugin_api_version = 1.37
+	plugin_api_version = 1.38
 
 	search_delay_type  = 'remote search update delay'
 
@@ -42,20 +42,7 @@
 		if google_interface_language_format == 'zh-HK':
 			google_interface_language_format = 'zh-CN'
 
-		# The google search API only supports two sizes for the result list,
-		# that is: small (4 results) or large (8 results). So this plugin
-		# chooses the most appropriate given the 'search results limit' user
-		# preference.
-
-		if self.c.settings['search results limit'] >= 8:
-			self.query_url = r'http://ajax.googleapis.com/ajax/services/search/web?v=1.0&rsz=large&q=%s'
-		else:
-			self.query_url = r'http://ajax.googleapis.com/ajax/services/search/web?v=1.0&rsz=small&q=%s'
-
-		if self.c.settings['long search results limit'] >= 8:
-			self.query_url_long = r'http://ajax.googleapis.com/ajax/services/search/web?v=1.0&rsz=large&q=%s'
-		else:
-			self.query_url_long = r'http://ajax.googleapis.com/ajax/services/search/web?v=1.0&rsz=small&q=%s'
+		self.query_url = r'http://ajax.googleapis.com/ajax/services/search/web?v=1.0&rsz={0}&q={1}'
 
 		self.search_controller = gio.Cancellable()
 
@@ -72,7 +59,7 @@
 		self.loaded = True
 
 
-	def search(self, text, long_search = False):
+	def search(self, text, result_limit):
 
 		# TODO: I'm sure this is not the best way of doing remote procedure
 		# calls, but I can't seem to find anything that is this easy to use and
@@ -84,10 +71,12 @@
 		self.current_query = text
 		text = urllib2.quote(text)
 
-		if long_search:
-			query = self.query_url_long % text
-		else:
-			query = self.query_url % text
+		# The google search API only supports two sizes for the result list,
+		# that is: small (4 results) or large (8 results). So this plugin
+		# chooses the most appropriate given the 'search results limit' user
+		# preference.
+
+		query = self.query_url.format('large' if result_limit >= 8 else 'small', text)
 
 		self.stream = gio.File(query)
 

=== modified file 'src/plugins/google_localized.py'
--- src/plugins/google_localized.py	2010-08-04 20:24:22 +0000
+++ src/plugins/google_localized.py	2010-08-12 17:20:35 +0000
@@ -12,7 +12,7 @@
 	help_text          = ''
 	version            = '1.37'
 
-	plugin_api_version = 1.37
+	plugin_api_version = 1.38
 
 	search_delay_type  = 'remote search update delay'
 
@@ -46,21 +46,7 @@
 		if google_interface_language_format[:2] == 'zh':
 			google_results_language_format = google_interface_language_format
 
-
-		# The google search API only supports two sizes for the result list,
-		# that is: small (4 results) or large (8 results). So this plugin
-		# chooses the most appropriate given the 'search results limit' user
-		# preference.
-
-		if self.c.settings['search results limit'] >= 8:
-			self.query_url = 'http://ajax.googleapis.com/ajax/services/search/web?v=1.0&rsz=large&lr=lang_%s&q=%%s' % google_results_language_format
-		else:
-			self.query_url = 'http://ajax.googleapis.com/ajax/services/search/web?v=1.0&rsz=small&lr=lang_%s&q=%%s' % google_results_language_format
-
-		if self.c.settings['long search results limit'] >= 8:
-			self.query_url_long = 'http://ajax.googleapis.com/ajax/services/search/web?v=1.0&rsz=large&lr=lang_%s&q=%%s' % google_results_language_format
-		else:
-			self.query_url_long = 'http://ajax.googleapis.com/ajax/services/search/web?v=1.0&rsz=small&lr=lang_%s&q=%%s' % google_results_language_format
+		self.query_url = 'http://ajax.googleapis.com/ajax/services/search/web?v=1.0&rsz={0}&lr=lang_%s&q={1}' % google_results_language_format
 
 		self.search_controller = gio.Cancellable()
 
@@ -77,7 +63,7 @@
 		self.loaded = True
 
 
-	def search(self, text, long_search = False):
+	def search(self, text, result_limit):
 
 		# TODO: I'm sure this is not the best way of doing remote procedure
 		# calls, but I can't seem to find anything that is this easy to use and
@@ -89,10 +75,12 @@
 		self.current_query = text
 		text = urllib2.quote(text)
 
-		if long_search:
-			query = self.query_url_long % text
-		else:
-			query = self.query_url % text
+		# The google search API only supports two sizes for the result list,
+		# that is: small (4 results) or large (8 results). So this plugin
+		# chooses the most appropriate given the 'search results limit' user
+		# preference.
+
+		query = self.query_url.format('large' if result_limit >= 8 else 'small', text)
 
 		self.stream = gio.File(query)
 

=== added file 'src/plugins/pidgin.py'
--- src/plugins/pidgin.py	1970-01-01 00:00:00 +0000
+++ src/plugins/pidgin.py	2010-08-12 17:20:35 +0000
@@ -0,0 +1,218 @@
+from dbus.exceptions import DBusException
+
+class CardapioPlugin(CardapioPluginInterface):
+
+	"""
+	Pidgin plugin based on it's D-Bus interface. Documentation:
+	http://developer.pidgin.im/wiki/DbusHowto
+
+	The plugin looks for online buddies and provides the user with
+	possibility to start a conversation with any of them. All active
+	accounts are considered. We match buddies by their alias (case
+	insensitive).
+
+	Please note that the plugin only works when Pidgin is on. You don't
+	need to turn Pidgin on before starting Cardapio or before initializing
+	the plugin. You just need to turn it on before performing a Cardapio
+	search.
+	"""
+
+	# Cardapio's variables
+	author = 'Pawel Bara'
+	name = _('Pidgin')
+	description = _('Search for online Pidgin buddies')
+	version = '0.9b'
+
+	url = ''
+	help_text = ''
+
+	default_keyword = 'pidgin'
+
+	plugin_api_version = 1.38
+
+	search_delay_type = 'local search update delay'
+
+	category_name = _('Pidgin Buddies')
+	category_tooltip = _('Your online Pidgin buddies')
+
+	category_icon = 'pidgin'
+	fallback_icon = ''
+
+	hide_from_sidebar = True
+
+	def __init__(self, cardapio_proxy):
+		cardapio_proxy.write_to_log(self, 'initializing Pidgin plugin')
+
+		self.cardapio = cardapio_proxy
+
+		# Pidgin's D-Bus constants
+		self.dpidgin_bus_name = 'im.pidgin.purple.PurpleService'
+		self.dpidgin_object_path = '/im/pidgin/purple/PurpleObject'
+		self.dpidgin_iface_name = 'im.pidgin.purple.PurpleInterface'
+
+		try:
+			self.bus = dbus.SessionBus()
+			# we track Pidgin's on / off status
+			self.bus.watch_name_owner(self.dpidgin_bus_name, self.on_dbus_name_change)
+
+			self.loaded = True
+
+		except DBusException as ex:
+			self.cardapio.write_to_log(self, 'Pidgin plugin initialization error: {0}'.format(str(ex)), is_error = True)
+			self.loaded = False
+
+	def on_dbus_name_change(self, connection_name):
+		"""
+		This method effectively tracks down the events of Pidgin app starting
+		and shutting down. When the app shuts down, this callback nullifies our
+		Pidgin's proxy and when the app starts, this callback sets the valid
+		proxy again.
+		"""
+
+		if len(connection_name) == 0:
+			self.pidgin = None
+		else:
+			bus_object = self.bus.get_object(connection_name, self.dpidgin_object_path)
+			self.pidgin = dbus.Interface(bus_object, self.dpidgin_iface_name)
+
+	def search(self, text, result_limit):
+		if len(text) == 0:
+			return
+
+		# send empty results to Cardapio if Pidgin's off
+		if self.pidgin is None:
+			self.cardapio.handle_search_result(self, [], text)
+			return
+
+		self.cardapio.write_to_log(self, 'searching for Pidgin buddies with name like {0}'.format(text), is_debug = True)
+
+		# prepare a parametrized callback that remembers the current search text and
+		# the result limit
+		callback = DBusGatherBuddiesCallback(self.pidgin, self.finalize_search,
+			text, result_limit)
+
+		# let's start by getting all of the user's active accounts
+		self.pidgin.PurpleAccountsGetAllActive(reply_handler = callback.handle_search_result,
+			error_handler = self.handle_search_error)
+
+	def finalize_search(self, buddies, text):
+		"""
+		DBusGatherBuddiesCallback invokes this when it finishes gathering
+		single search results. This method finalizes the search, then
+		passes the result to Cardapio.
+		"""
+
+		items = []
+
+		# for every buddy...
+		for buddy in buddies:
+
+			# 'start conversation' callback wrapper
+			conversation_callback = DBusTalkToBuddyCallback(self.pidgin, buddy[0], buddy[1])
+
+			# add 'talk to this buddy' item
+			items.append({
+				'name'         : buddy[2] + ' ({0})'.format(buddy[1]),
+				'tooltip'      : _('Talk to this buddy'),
+				'icon name'    : 'pidgin',
+				'type'         : 'callback',
+				'command'      : conversation_callback.start_conversation,
+				'context menu' : None
+			})
+
+		self.cardapio.handle_search_result(self, items, text)
+
+	def handle_search_error(self, error):
+		"""
+		Error callback to asynchronous Pidgin's D-Bus call.
+		"""
+
+		self.cardapio.handle_search_error(self, 'Pidgin search error: {0}'.format(str(error)))
+
+class DBusGatherBuddiesCallback:
+	"""
+	DBusGatherBuddiesCallback serves as a parametrized wrapper over
+	the asynchronous callback to Pidgin's PurpleAccountsGetAllActive
+	call.
+	"""
+
+	def __init__(self, pidgin, result_callback, text, result_limit):
+		self.pidgin = pidgin
+		self.result_callback = result_callback
+
+		self.text = text
+		self.result_limit = result_limit
+
+	def handle_search_result(self, accounts):
+		"""
+		Callback to asynchronous Pidgin's PurpleAccountsGetAllActive
+		call. It gathers results and then passes those back to the
+		main plugin class through the result_callback method.
+		"""
+
+		# gather all online buddies
+		self.result_callback(self.gather_buddies(accounts), self.text)
+
+	def gather_buddies(self, accounts):
+		"""
+		Gathers all of the user's online Pidgin buddies in a form of list
+		containing tuples.
+		"""
+
+		# return empty results if Pidgin's off
+		if self.pidgin is None:
+			return []
+
+		buddies = []
+
+		# for every active account...
+		for account in accounts:
+
+			# and every buddy associated with this active account...
+			for buddy in self.pidgin.PurpleFindBuddies(account, ''):
+
+				# obey the result limit!
+				if len(buddies) == self.result_limit:
+					return buddies
+
+				# we remember only those buddies who are online now
+				if self.pidgin.PurpleBuddyIsOnline(buddy):
+
+					buddy_alias = self.pidgin.PurpleBuddyGetAlias(buddy)
+					buddy_name = self.pidgin.PurpleBuddyGetName(buddy)
+
+					# if buddies alias contains (case insensitive) the search
+					# keyword, add him to the result list
+					if buddy_alias.lower().count(self.text.lower()) > 0:
+						buddies.append((account, buddy_name, buddy_alias))
+
+		return buddies
+
+
+class DBusTalkToBuddyCallback:
+	"""
+	DBusTalkToBuddyCallback serves as a parametrized wrapper over
+	the asynchronous callback to Pidgin's PurpleConversationNew
+	call.
+	"""
+
+	def __init__(self, pidgin, account, buddy):
+		self.pidgin = pidgin
+
+		self.account = account
+		self.buddy = buddy
+
+	def start_conversation(self, search_text):
+		"""
+		Starts a conversation for the account and buddy name with which this
+		callback was created. Ignores the callback parameter (search_text)
+		from Cardapio.
+		"""
+
+		# try to avoid errors if Pidgin's off
+		if self.pidgin is None:
+			return
+
+		# starting a conversation... the number 1 means 'InstantMessage
+		# conversation'
+		self.pidgin.PurpleConversationNew(1, self.account, self.buddy)
\ No newline at end of file

=== modified file 'src/plugins/software_center.py'
--- src/plugins/software_center.py	2010-08-02 07:22:55 +0000
+++ src/plugins/software_center.py	2010-08-12 17:20:35 +0000
@@ -32,7 +32,7 @@
 	help_text          = ''
 	version            = '1.12'
 
-	plugin_api_version = 1.37
+	plugin_api_version = 1.38
 
 	search_delay_type  = 'local search update delay'
 	default_keyword    = 'softwarecenter'
@@ -53,9 +53,6 @@
 		
 		self.c = cardapio_proxy
 		self.loaded = False
-
-		self.num_search_results = self.c.settings['search results limit']
-		self.num_search_results_long = self.c.settings['long search results limit']
 		
 		if import_error:
 			self.c.write_to_log(self, 'Could not import certain modules', is_error = True)
@@ -103,7 +100,7 @@
 		self.loaded = True # set to true if everything goes well
 
 
-	def search(self, text, long_search = False):
+	def search(self, text, result_limit):
  
 		self.current_query = text
 
@@ -116,14 +113,9 @@
 		enquire.set_sort_by_value_then_relevance(XAPIAN_VALUE_POPCON)
 		matches = enquire.get_mset(0, len(self.db))
 
-		if long_search:
-			num_search_results = self.num_search_results_long
-		else:
-			num_search_results = self.num_search_results
-
 		i = 0
 		for m in matches:
-			if not i < num_search_results : break
+			if not i < result_limit : break
 			
 			doc = m[xapian.MSET_DOCUMENT]
 			pkgname = self.db.get_pkgname(doc)

=== added file 'src/plugins/tomboy.py'
--- src/plugins/tomboy.py	1970-01-01 00:00:00 +0000
+++ src/plugins/tomboy.py	2010-08-12 17:20:35 +0000
@@ -0,0 +1,206 @@
+from dbus.exceptions import DBusException
+
+class CardapioPlugin(CardapioPluginInterface):
+
+	"""
+	Tomboy plugin based on it's D-Bus interface. Documentation:
+	http://arstechnica.com/open-source/news/2007/09/using-the-tomboy-d-bus-interface.ars
+
+	The plugin looks for notes with titles and contents similar to the search string.
+	If it can't find any, it provides user with the handy 'create a note with this
+	title' link.
+
+	Please note that the plugin only works when Tomboy is on. You don't need to
+	turn Tomboy on before starting Cardapio or before initializing the plugin.
+	You just need to turn it on before performing a Cardapio search.
+	"""
+
+	# Cardapio's variables
+	author = 'Pawel Bara'
+	name = _('Tomboy')
+	description = _('Search for Tomboy notes')
+	version = '0.9b'
+
+	url = ''
+	help_text = ''
+
+	default_keyword = 'tomboy'
+
+	plugin_api_version = 1.38
+
+	search_delay_type = 'local search update delay'
+
+	category_name = _('Tomboy Results')
+	category_tooltip = _('Your Tomboy notes')
+
+	category_icon = 'tomboy'
+	fallback_icon = ''
+
+	hide_from_sidebar = True
+
+	def __init__(self, cardapio_proxy):
+		cardapio_proxy.write_to_log(self, 'initializing Tomboy plugin')
+
+		self.cardapio = cardapio_proxy
+
+		# Tomboy's D-Bus constants
+		self.dtomboy_bus_name = 'org.gnome.Tomboy'
+		self.dtomboy_object_path = '/org/gnome/Tomboy/RemoteControl'
+		self.dtomboy_iface_name = 'org.gnome.Tomboy.RemoteControl'
+
+		try:
+			self.bus = dbus.SessionBus()
+			# we track Tomboy's on / off status
+			self.bus.watch_name_owner(self.dtomboy_bus_name, self.on_dbus_name_change)
+
+			self.loaded = True
+
+		except DBusException as ex:
+			self.cardapio.write_to_log(self, 'Tomboy plugin initialization error: {0}'.format(str(ex)), is_error = True)
+			self.loaded = False
+
+	def on_dbus_name_change(self, connection_name):
+		"""
+		This method effectively tracks down the events of Tomboy app starting
+		and shutting down. When the app shuts down, this callback nullifies our
+		Tomboy's proxy and when the app starts, the callback sets the valid
+		proxy again.
+		"""
+
+		if len(connection_name) == 0:
+			self.tomboy = None
+		else:
+			bus_object = self.bus.get_object(connection_name, self.dtomboy_object_path)
+			self.tomboy = dbus.Interface(bus_object, self.dtomboy_iface_name)
+
+	def search(self, text, result_limit):
+		if len(text) == 0:
+			return
+
+		# send empty results to Cardapio if Tomboy's off
+		if self.tomboy is None:
+			self.cardapio.handle_search_result(self, [], text)
+			return
+
+		self.cardapio.write_to_log(self, 'searching for Tomboy notes with topic like {0}'.format(text), is_debug = True)
+
+		# prepare a parametrized callback that remembers the current search text and
+		# the result limit
+		callback = DBusSearchNotesCallback(self.tomboy, self.finalize_search,
+			text, result_limit)
+
+		# we ask for a case insensitive search
+		self.tomboy.SearchNotes(text.lower(), False, reply_handler = callback.handle_search_result,
+			error_handler = self.handle_search_error)
+
+	def finalize_search(self, items, text):
+		"""
+		DBusSearchNotesCallback invokes this when it finishes gathering
+		single search results. This method finalizes the search, then
+		passes the results to Cardapio.
+		"""
+
+		# if there are no results, we'll add the 'create a note with this
+		# title' link
+		if len(items) == 0:
+			items.append({
+				'name'         : _('Create this note'),
+				'tooltip'      : _('Create a new note with this title in Tomboy'),
+				'icon name'    : 'tomboy',
+				'type'         : 'callback',
+				'command'      : self.tomboy_create_note,
+				'context menu' : None
+			})
+
+		# the 'search more' option is always present
+		items.append({
+			'name'         : _('Show additional notes'),
+			'tooltip'      : _('Show additional notes in Tomboy'),
+			'icon name'    : 'tomboy',
+			'type'         : 'callback',
+			'command'      : self.tomboy_find_more,
+			'context menu' : None
+		})
+
+		self.cardapio.handle_search_result(self, items, text)
+
+	def handle_search_error(self, error):
+		"""
+		Error callback to asynchronous Tomboy's D-Bus call.
+		"""
+
+		self.cardapio.handle_search_error(self, 'Tomboy search error: {0}'.format(str(error)))
+
+	def tomboy_create_note(self, text):
+		"""
+		Creates a new note with the given title, then displays it to
+		the user.
+		"""
+
+		# try to avoid errors if Tomboy's off
+		if self.tomboy is None:
+			return
+
+		new_note = self.tomboy.CreateNamedNote(text)
+		self.tomboy.DisplayNote(new_note)
+
+	def tomboy_find_more(self, text):
+		"""
+		Opens Tomboy's 'Search more' window.
+		"""
+
+		# try to avoid errors if Tomboy's off
+		if self.tomboy is None:
+			return
+
+		self.tomboy.DisplaySearchWithText(text)
+
+class DBusSearchNotesCallback:
+	"""
+	DBusSearchNotesCallback serves as a parametrized wrapper over
+	the asynchronous callback to Tomboy's SearchNotes call.
+	"""
+
+	def __init__(self, tomboy, result_callback, text, result_limit):
+		self.tomboy = tomboy
+		self.result_callback = result_callback
+
+		self.text = text
+		self.result_limit = result_limit
+
+	def handle_search_result(self, result):
+		"""
+		Callback to asynchronous Tomboy's SearchNotes call. It gathers
+		results and then passes those back to the main plugin class
+		through the result_callback method.
+		"""
+
+		# pass empty results to the main class if Tomboy's off
+		if self.tomboy is None:
+			self.result_callback([], self.text)
+			return
+
+		items = []
+
+		# if we have any results...
+		i = 0
+		for note in result:
+
+			# exit after gathering enough results
+			if i == self.result_limit:
+				break
+			i += 1
+
+			# add 'open this note' item
+			items.append({
+				'name'         : self.tomboy.GetNoteTitle(note),
+				'tooltip'      : _('Open this note'),
+				'icon name'    : 'tomboy',
+				'type'         : 'xdg',
+				'command'      : note,
+				'context menu' : None
+			})
+
+		# pass all of the gathered items and the current search
+		# text to the main plugin class
+		self.result_callback(items, self.text)

=== modified file 'src/plugins/tracker.py'
--- src/plugins/tracker.py	2010-08-02 07:22:55 +0000
+++ src/plugins/tracker.py	2010-08-12 17:20:35 +0000
@@ -10,7 +10,7 @@
 	help_text          = ''
 	version            = '1.37'
 
-	plugin_api_version = 1.37
+	plugin_api_version = 1.38
 
 	search_delay_type  = 'local search update delay'
 
@@ -37,9 +37,6 @@
 			self.loaded = False
 			return 
 
-		self.search_results_limit = self.c.settings['search results limit']
-		self.search_results_limit_long = self.c.settings['long search results limit']
-
 		self.action_command = r"tracker-search-tool '%s'"
 		self.action = {
 			'name'         : _('Show additional results'),
@@ -53,16 +50,11 @@
 		self.loaded = True
 
 
-	def search(self, text, long_search = False):
+	def search(self, text, result_limit):
 
 		self.current_query = text
 		text = urllib2.quote(text).lower()
 
-		if long_search:
-			search_results_limit = self.search_results_limit_long
-		else:
-			search_results_limit = self.search_results_limit
-
 		self.tracker.SparqlQuery(
 			"""
 				SELECT ?uri ?mime
@@ -76,7 +68,7 @@
 				ORDER BY ASC(?uri)
 				LIMIT %d
 			""" 
-			% (text, search_results_limit),
+			% (text, result_limit),
 			dbus_interface='org.freedesktop.Tracker1.Resources',
 			reply_handler=self.prepare_and_handle_search_result,
 			error_handler=self.handle_search_error

=== modified file 'src/plugins/tracker_fts.py'
--- src/plugins/tracker_fts.py	2010-08-04 17:04:13 +0000
+++ src/plugins/tracker_fts.py	2010-08-12 17:20:35 +0000
@@ -10,7 +10,7 @@
 	help_text          = ''
 	version            = '1.371'
 
-	plugin_api_version = 1.37
+	plugin_api_version = 1.38
 
 	search_delay_type  = 'local search update delay'
 
@@ -22,7 +22,7 @@
 	hide_from_sidebar  = True
 
 
-	def __init__(self, cardapio_proxy): 
+	def __init__(self, cardapio_proxy):
 
 		self.c = cardapio_proxy
 
@@ -31,13 +31,10 @@
 
 		if bus.request_name('org.freedesktop.Tracker1') == dbus.bus.REQUEST_NAME_REPLY_IN_QUEUE:
 			tracker_object = bus.get_object('org.freedesktop.Tracker1', '/org/freedesktop/Tracker1/Resources')
-			self.tracker = dbus.Interface(tracker_object, 'org.freedesktop.Tracker1.Resources') 
+			self.tracker = dbus.Interface(tracker_object, 'org.freedesktop.Tracker1.Resources')
 		else:
 			self.loaded = False
-			return 
-
-		self.search_results_limit = self.c.settings['search results limit']
-		self.search_results_limit_long = self.c.settings['long search results limit']
+			return
 
 		self.action_command = r'tracker-search-tool %s'
 		self.action = {
@@ -52,20 +49,15 @@
 		self.loaded = True
 
 
-	def search(self, text, long_search = False):
+	def search(self, text, result_limit):
 
 		self.current_query = text
 		text = urllib2.quote(text).lower()
 
-		if long_search:
-			search_results_limit = self.search_results_limit_long
-		else:
-			search_results_limit = self.search_results_limit
-
 		self.tracker.SparqlQuery(
 			"""
 				SELECT ?uri ?mime
-				WHERE { 
+				WHERE {
 					?item a nie:InformationElement;
 						fts:match "%s";
 						nie:url ?uri;
@@ -73,8 +65,8 @@
 						tracker:available true.
 					}
 				LIMIT %d
-			""" 
-			% (text, search_results_limit),
+			"""
+			% (text, result_limit),
 			dbus_interface='org.freedesktop.Tracker1.Resources',
 			reply_handler=self.prepare_and_handle_search_result,
 			error_handler=self.handle_search_error
@@ -90,10 +82,10 @@
 
 	def prepare_and_handle_search_result(self, results):
 
-		formatted_results = []	
+		formatted_results = []
 
 		for result in results:
-			
+
 			dummy, canonical_path = urllib2.splittype(result[0])
 			parent_name, child_name = os.path.split(canonical_path)
 			icon_name = result[1]

=== modified file 'src/plugins/virtualbox.py'
--- src/plugins/virtualbox.py	2010-08-02 07:22:55 +0000
+++ src/plugins/virtualbox.py	2010-08-12 17:20:35 +0000
@@ -19,7 +19,7 @@
 	help_text = ''
 	version = '1.22'
 
-	plugin_api_version = 1.37
+	plugin_api_version = 1.38
 
 	search_delay_type = None
 
@@ -70,8 +70,8 @@
 			
 		self.loaded = True
 
-
-	def search(self, text, long_search = False):
+	# TODO: DOES NOT RESPECT result_limit's AUTHORITA'!
+	def search(self, text, result_limit):
   
 		self.current_query = text
 

=== modified file 'src/plugins/wikipedia.py'
--- src/plugins/wikipedia.py	2010-08-02 07:22:55 +0000
+++ src/plugins/wikipedia.py	2010-08-12 17:20:35 +0000
@@ -29,7 +29,7 @@
 	url = ''
 	help_text = ''
 
-	plugin_api_version = 1.37
+	plugin_api_version = 1.38
 
 	search_delay_type = 'remote search update delay'
 
@@ -54,13 +54,7 @@
 		# maximum four results, formatted as json)
 		self.api_base_args = {
 			'action': 'opensearch',
-			'format': 'json',
-			'limit' : str(self.cardapio.settings['search results limit']),
-		}
-		self.api_base_args_long = {
-			'action': 'opensearch',
-			'format': 'json',
-			'limit' : str(self.cardapio.settings['long search results limit']),
+			'format': 'json'
 		}
 
 		# Wikipedia's base URLs (search and show details variations)
@@ -69,23 +63,19 @@
 
 		self.loaded = True
 
-	def search(self, text, long_search = False):
+	def search(self, text, result_limit):
 		if len(text) == 0:
 			return
 
-		self.current_query = text
-
 		self.cardapio.write_to_log(self, 'searching for {0} in Wikipedia'.format(text), is_debug = True)
 
 		self.cancellable.reset()
 
 		# prepare final API URL
-		if long_search:
-			current_args = self.api_base_args_long.copy()
-		else:
-			current_args = self.api_base_args.copy()
-
+		current_args = self.api_base_args.copy()
+		current_args['limit'] = result_limit
 		current_args['search'] = text
+
 		final_url = self.api_base_url.format(urllib.urlencode(current_args))
 
 		self.cardapio.write_to_log(self, 'final API URL: {0}'.format(final_url), is_debug = True)
@@ -93,9 +83,10 @@
 		# asynchronous and cancellable IO call
 		self.current_stream = gio.File(final_url)
 		self.current_stream.load_contents_async(self.show_search_results,
-			cancellable = self.cancellable)
+			cancellable = self.cancellable,
+			user_data = text)
 
-	def show_search_results(self, gdaemonfile, result):
+	def show_search_results(self, gdaemonfile, result, text):
 		"""
 		Callback to asynchronous IO (Wikipedia's API call).
 		"""
@@ -120,6 +111,11 @@
 			# response[1] because the response looks like: [text, [result_list]]
 			# append results (if any)
 			for item in response[1]:
+				# TODO: wikipedia sometimes returns item names encoded in unicode (try
+				# searching for 'aaaaaaaaaaaaa' for example); we use those names as part
+				# of a URL so we need to encode the special characters; unfortunately,
+				# Python's 2.* urllib.quote throws an exception when it's given unicode
+				# argument - what now?
 				item_url = self.web_base_url.format(urllib.quote(item))
 				items.append({
 					'name'         : item,
@@ -131,7 +127,7 @@
 				})
 
 			# pass the results to Cardapio
-			self.cardapio.handle_search_result(self, items, self.current_query)
+			self.cardapio.handle_search_result(self, items, text)
 
 		except KeyError:
 			self.cardapio.handle_search_error(self, "Incorrect Wikipedia's JSON structure")

=== modified file 'src/plugins/yahoo.py'
--- src/plugins/yahoo.py	2010-08-02 07:22:55 +0000
+++ src/plugins/yahoo.py	2010-08-12 17:20:35 +0000
@@ -31,7 +31,7 @@
 	url = ''
 	help_text = ''
 
-	plugin_api_version = 1.37
+	plugin_api_version = 1.38
 
 	search_delay_type = 'remote search update delay'
 
@@ -66,44 +66,30 @@
 			'appid'    : 'TuNKmOzV34GRC9mrBNZMgr.vY1xPMLMH9U3PsOYkg8WvYnFawnB5gKd4GsrUbqluzg--',
 			'format'   : 'json',
 			'style'    : 'raw',
-			'count'    : self.cardapio.settings['search results limit'],
-			'lang'     : language,
-			'region'   : region
-		}
-
-		self.api_base_args_long = {
-			'appid'    : 'TuNKmOzV34GRC9mrBNZMgr.vY1xPMLMH9U3PsOYkg8WvYnFawnB5gKd4GsrUbqluzg--',
-			'format'   : 'json',
-			'style'    : 'raw',
-			'count'    : self.cardapio.settings['long search results limit'],
 			'lang'     : language,
 			'region'   : region
 		}
 
 		# Yahoo's base URLs (search and search more variations)
-		self.api_base_url = 'http://boss.yahooapis.com/ysearch/web/v1/{0}?' + urllib.urlencode(self.api_base_args)
-		self.api_base_url_long = 'http://boss.yahooapis.com/ysearch/web/v1/{0}?' + urllib.urlencode(self.api_base_args_long)
+		self.api_base_url = 'http://boss.yahooapis.com/ysearch/web/v1/{0}?{1}'
 		self.web_base_url = 'http://search.yahoo.com/search?{0}'
 
 		self.loaded = True
 
-	def search(self, text, long_search = False):
+	def search(self, text, result_limit):
 		if len(text) == 0:
 			return
 
-		self.current_query = text
-
 		self.cardapio.write_to_log(self, 'searching for {0} using Yahoo'.format(text), is_debug = True)
 
 		self.cancellable.reset()
 
 		# prepare final API URL
-		if long_search:
-			api_base_url = self.api_base_url_long
-		else:
-			api_base_url = self.api_base_url
-
-		final_url = api_base_url.format(urllib.quote(text, ''))
+		current_args = self.api_base_args.copy()
+		current_args['count'] = result_limit
+
+		final_url = self.api_base_url.format(urllib.quote(text, ''), urllib.urlencode(current_args))
+
 		self.cardapio.write_to_log(self, 'final API URL: {0}'.format(final_url), is_debug = True)
 
 		# asynchronous and cancellable IO call
@@ -164,7 +150,7 @@
 			})
 
 			# pass the results to Cardapio
-			self.cardapio.handle_search_result(self, items, self.current_query)
+			self.cardapio.handle_search_result(self, items, text)
 
 		except KeyError:
 			self.cardapio.handle_search_error(self, "Incorrect Yahoo's JSON structure")

=== modified file 'src/plugins/you_tube.py'
--- src/plugins/you_tube.py	2010-08-02 07:22:55 +0000
+++ src/plugins/you_tube.py	2010-08-12 17:20:35 +0000
@@ -22,7 +22,7 @@
 	url = ''
 	help_text = ''
 
-	plugin_api_version = 1.37
+	plugin_api_version = 1.38
 
 	search_delay_type = 'remote search update delay'
 
@@ -45,12 +45,7 @@
 
 		# YouTube's API arguments (format and maximum result count)
 		self.api_base_args = {
-			'alt'        : 'json',
-			'max-results': self.cardapio.settings['search results limit'],
-		}
-		self.api_base_args_long = {
-			'alt'        : 'json',
-			'max-results': self.cardapio.settings['long search results limit'],
+			'alt'        : 'json'
 		}
 
 		# YouTube's base URLs (search and search more variations)
@@ -59,25 +54,20 @@
 
 		self.loaded = True
 
-	def search(self, text, long_search = False):
+	def search(self, text, result_limit):
 
 		if len(text) == 0:
 			return
 
-		self.current_query = text
-
 		self.cardapio.write_to_log(self, 'searching for {0} using YouTube'.format(text), is_debug = True)
 
 		self.cancellable.reset()
 
 		# prepare final API URL
-		if long_search:
-			api_base_args = self.api_base_args_long
-		else:
-			api_base_args = self.api_base_args
-
-		current_args = api_base_args.copy()
+		current_args = self.api_base_args.copy()
+		current_args['max-results'] = result_limit
 		current_args['q'] = text
+		
 		final_url = self.api_base_url.format(urllib.urlencode(current_args))
 
 		self.cardapio.write_to_log(self, 'final API URL: {0}'.format(final_url), is_debug = True)
@@ -150,7 +140,7 @@
 			})
 
 			# pass the results to Cardapio
-			self.cardapio.handle_search_result(self, items, self.current_query)
+			self.cardapio.handle_search_result(self, items, text)
 
 		except KeyError:
 			self.cardapio.handle_search_error(self, "Incorrect YouTube's JSON structure")

=== modified file 'src/plugins/zg_recent_documents.py'
--- src/plugins/zg_recent_documents.py	2010-08-02 07:22:55 +0000
+++ src/plugins/zg_recent_documents.py	2010-08-12 17:20:35 +0000
@@ -21,7 +21,7 @@
 	help_text          = ''
 	version            = '0.97b'
 
-	plugin_api_version = 1.37
+	plugin_api_version = 1.38
 
 	search_delay_type  = 'local search update delay'
 
@@ -40,8 +40,6 @@
 		self.c = cardapio_proxy
 
 		self.loaded = False
-		self.num_search_results = self.c.settings['search results limit']
-		self.num_search_results_long = self.c.settings['long search results limit']
 
 		if 'ZeitgeistClient' not in globals():
 			self.c.write_to_log(self, 'Could not import Zeitgeist', is_error = True)
@@ -89,33 +87,26 @@
 		self.loaded = True
 
 
-	def __del__(self):
-
-		pass
-
-
-	def search(self, text, long_search = False):
+	def search(self, text, result_limit):
 
 		self.current_query = text
 
 		text = text.lower()
 		self.search_query = text
+		# TODO: this is thread unsafe. correct this using a wrapper like
+		# for example Tomboy's plugin does
+		self.result_limit = result_limit
 
 		if text:
 			self.event_template.actor = 'application://' + text + '*'
 		else:
 			self.event_template.actor = ''
 
-		if long_search:
-			num_search_results = self.num_search_results_long
-		else:
-			num_search_results = self.num_search_results
-
 		self.zg.find_events_for_templates(
 				[self.event_template],
 				self.handle_search_result, 
 				timerange = self.time_range, 
-				num_events = num_search_results, 
+				num_events = result_limit,
 				result_type = datamodel.ResultType.MostRecentSubjects
 				)
 
@@ -133,7 +124,7 @@
 				fts_results, count = self.fts.Search(
 						self.search_query + '*', 
 						self.time_range, 
-						[], 0, self.num_search_results, 2)
+						[], 0, self.result_limit, 2)
 
 			except Exception, exception:
 				print exception
@@ -148,14 +139,14 @@
 
 		for event in all_events:
 
-			if len(urls_seen) >= self.num_search_results: break
+			if len(urls_seen) >= self.result_limit: break
 
 			for subject in event.get_subjects():
 
 				dummy, canonical_path = urllib2.splittype(subject.uri)
 				parent_name, child_name = os.path.split(canonical_path)
 
-				if len(urls_seen) >= self.num_search_results: break
+				if len(urls_seen) >= self.result_limit: break
 				if canonical_path in urls_seen: continue
 				urls_seen.add(canonical_path)