deskbar-applet r2157 - in branches/gnome-2-22: . deskbar/core deskbar/handlers

[sebp svn gnome org]

Author: sebp
Date: Thu May  8 13:42:14 2008
New Revision: 2157
URL: http://svn.gnome.org/viewvc/deskbar-applet?rev=2157&view=rev

Log:
Added support for iceweasel browser.
When the default browser is changed	mozilla and iceweasel are supported, too.	When Firefox is usded and the command must contain firefox instead of being exactly firefox.

Modified:
   branches/gnome-2-22/ChangeLog
   branches/gnome-2-22/deskbar/core/CoreImpl.py
   branches/gnome-2-22/deskbar/handlers/mozilla.py

Modified: branches/gnome-2-22/deskbar/core/CoreImpl.py
==============================================================================
--- branches/gnome-2-22/deskbar/core/CoreImpl.py	(original)
+++ branches/gnome-2-22/deskbar/core/CoreImpl.py	Thu May  8 13:42:14 2008
@@ -364,10 +364,11 @@
     def _on_default_browser_changed(self, gconfstore, new_browser):
         new_browser = new_browser.split(" ")[0]
         
-        if new_browser == "firefox":
+        if new_browser.find("firefox") != -1 or new_browser.find("iceweasel") != -1 \
+            or new_browser.find("iceweasel") != -1:
             new_browser = "mozilla"
         
-        if new_browser == "epiphany":
+        if new_browser.find("epiphany") != -1:
             old_browser = "mozilla"
         elif new_browser == "mozilla":
             old_browser = "epiphany"

Modified: branches/gnome-2-22/deskbar/handlers/mozilla.py
==============================================================================
--- branches/gnome-2-22/deskbar/handlers/mozilla.py	(original)
+++ branches/gnome-2-22/deskbar/handlers/mozilla.py	Thu May  8 13:42:14 2008
@@ -209,7 +209,7 @@
     def has_requirements():
         if is_preferred_browser("mozilla"):
             return True
-        elif is_preferred_browser("firefox"):
+        elif is_preferred_browser("firefox") or is_preferred_browser("iceweasel"):
             if MozillaBookmarksHandler.has_firefox_version():
                 return True
             # TODO: mark as i18n
@@ -822,7 +822,7 @@
     def has_requirements():
         if is_preferred_browser("mozilla"):
             return True
-        elif is_preferred_browser("firefox"):
+        elif is_preferred_browser("firefox") or is_preferred_browser("iceweasel"):
             if MozillaBookmarksHandler.has_firefox_version():
                 return True
             # TODO: mark as i18n