r11308 - in /desktop/unstable/deskbar-applet/debian: changelog patches/100-iceweasel-compat.patch

[rfrancoise at users.alioth.debian.org]

Author: rfrancoise
Date: Tue Jun  5 19:22:32 2007
New Revision: 11308

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11308
Log:
* debian/patches/100-iceweasel-compat.patch: New patch; look for search
  engines in Iceweasel's directories, thanks to Rene Hausleitner
  (closes: #410629).

Added:
    desktop/unstable/deskbar-applet/debian/patches/100-iceweasel-compat.patch
Modified:
    desktop/unstable/deskbar-applet/debian/changelog

Modified: desktop/unstable/deskbar-applet/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/deskbar-applet/debian/changelog?rev=11308&op=diff
==============================================================================
--- desktop/unstable/deskbar-applet/debian/changelog (original)
+++ desktop/unstable/deskbar-applet/debian/changelog Tue Jun  5 19:22:32 2007
@@ -11,10 +11,14 @@
   * debian/patches/200-use-python-2.4.diff: Dropped; upstream and Debian
     now use Python 2.4 by default.
 
+  * debian/patches/100-iceweasel-compat.patch: New patch; look for search
+    engines in Iceweasel's directories, thanks to Rene Hausleitner
+    (closes: #410629).
+
   * debian/control.in: Add dependency on python-dbus, needed by the new
     GDM actions handler.
 
- -- Romain Francoise <rfrancoise at debian.org>  Tue, 05 Jun 2007 20:33:31 +0200
+ -- Romain Francoise <rfrancoise at debian.org>  Tue, 05 Jun 2007 21:13:37 +0200
 
 deskbar-applet (2.14.2-4.2) unstable; urgency=medium
 

Added: desktop/unstable/deskbar-applet/debian/patches/100-iceweasel-compat.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/deskbar-applet/debian/patches/100-iceweasel-compat.patch?rev=11308&op=file
==============================================================================
--- desktop/unstable/deskbar-applet/debian/patches/100-iceweasel-compat.patch (added)
+++ desktop/unstable/deskbar-applet/debian/patches/100-iceweasel-compat.patch Tue Jun  5 19:22:32 2007
@@ -1,0 +1,37 @@
+--- deskbar/handlers/mozilla.py	2007-01-11 13:13:53.000000000 +0100
++++ deskbar/handlers/mozilla.py	2007-06-03 19:11:17.000000000 +0200
+@@ -20,7 +20,7 @@
+ 
+ # Whether we will index firefox or mozilla bookmarks
+ USING_FIREFOX = False
+-if is_preferred_browser("firefox"):
++if is_preferred_browser("firefox") or is_preferred_browser("iceweasel"):
+ 	USING_FIREFOX = True
+ 		
+ # File returned here should be checked for existence
+@@ -112,13 +112,13 @@
+ #	if deskbar.UNINSTALLED_DESKBAR:
+ #		return (deskbar.Handler.HANDLER_IS_HAPPY, None, None)
+ 	
+-	if is_preferred_browser("firefox") or is_preferred_browser("mozilla"):
++	if is_preferred_browser("firefox") or is_preferred_browser("mozilla") or is_preferred_browser("iceweasel"):
+ 		return (deskbar.Handler.HANDLER_IS_HAPPY, None, None)
+ 	else:
+ 		return (deskbar.Handler.HANDLER_IS_NOT_APPLICABLE, "Mozilla/Firefox is not your preferred browser, not using it.", None)
+ 		
+ def _check_requirements_search():
+-	if is_preferred_browser("firefox"):
++	if is_preferred_browser("firefox") or is_preferred_browser("iceweasel"):
+ 		return (deskbar.Handler.HANDLER_IS_CONFIGURABLE, _("You can customize which search engines are offered."), _on_handler_preferences)
+ 	elif is_preferred_browser("mozilla"):
+ 		# TODO - similar functionality for old-school mozilla (not firefox)
+@@ -211,7 +211,8 @@
+ 				"/usr/lib/firefox/searchplugins",
+ 				"/usr/local/lib/firefox/searchplugins",
+ 				"/usr/lib/mozilla-firefox/searchplugins",
+-				"/usr/local/lib/mozilla-firefox/searchplugins"]
++				"/usr/local/lib/mozilla-firefox/searchplugins",
++				"/usr/lib/iceweasel/searchplugins"]
+ 		else:
+ 			smart_dirs = [
+ 				get_mozilla_home_file("search"),