--- deskbar-applet-2.17.2/deskbar/handlers/mozilla.py.firefox 2006-11-07 12:04:27.000000000 +0100 +++ deskbar-applet-2.17.2/deskbar/handlers/mozilla.py 2006-12-07 15:05:32.000000000 +0100 @@ -110,7 +110,7 @@ # 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("seamonkey"): 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) @@ -118,7 +118,7 @@ def _check_requirements_search(): if is_preferred_browser("firefox"): return (deskbar.Handler.HANDLER_IS_CONFIGURABLE, _("You can customize which search engines are offered."), _on_handler_preferences) - elif is_preferred_browser("mozilla"): + elif is_preferred_browser("seamonkey"): # TODO - similar functionality for old-school mozilla (not firefox) return (deskbar.Handler.HANDLER_IS_HAPPY, None, None) else: @@ -206,7 +206,10 @@ get_firefox_home_file("searchplugins"), get_firefox_home_file("search"), expanduser("~/.mozilla/searchplugins"), - "/usr/lib/firefox/searchplugins", + "/usr/lib/firefox-MOZILLA_FIREFOX_VERSION/searchplugins", + "/usr/lib64/firefox-MOZILLA_FIREFOX_VERSION/searchplugins", + "/usr/lib/mozilla-firefox-MOZILLA_FIREFOX_VERSION/searchplugins", + "/usr/lib64/mozilla-firefox-MOZILLA_FIREFOX_VERSION/searchplugins", "/usr/local/lib/firefox/searchplugins", "/usr/lib/mozilla-firefox/searchplugins", "/usr/local/lib/mozilla-firefox/searchplugins"] @@ -215,6 +218,8 @@ get_mozilla_home_file("search"), expanduser("~/.mozilla/searchplugins"), "/usr/lib/mozilla/searchplugins", + "/usr/lib/seamonkey-SEAMONKEY_VERSION/searchplugins", + "/usr/lib64/seamonkey-SEAMONKEY_VERSION/searchplugins", "/usr/local/lib/mozilla/searchplugins"] if not hasattr(self, 'watcher'):