deskbar-applet r1975 - in trunk: . deskbar/handlers
- From: sebp svn gnome org
- To: svn-commits-list gnome org
- Subject: deskbar-applet r1975 - in trunk: . deskbar/handlers
- Date: Fri, 29 Feb 2008 11:37:27 +0000 (GMT)
Author: sebp
Date: Fri Feb 29 11:37:27 2008
New Revision: 1975
URL: http://svn.gnome.org/viewvc/deskbar-applet?rev=1975&view=rev
Log:
Added firefox version check to MozillaSearchHandler.has_requirements method
Modified:
trunk/ChangeLog
trunk/deskbar/handlers/mozilla.py
Modified: trunk/deskbar/handlers/mozilla.py
==============================================================================
--- trunk/deskbar/handlers/mozilla.py (original)
+++ trunk/deskbar/handlers/mozilla.py Fri Feb 29 11:37:27 2008
@@ -290,6 +290,12 @@
@staticmethod
def has_requirements():
if is_preferred_browser("firefox") or is_preferred_browser("iceweasel"):
+ if is_preferred_browser("firefox") and not MozillaBookmarksHandler.has_firefox_version():
+ # TODO: mark as i18n
+ MozillaSearchHandler.INSTRUCTIONS = "Firefox version must be between 2.0.0.0 and 3.0.0.0"
+ return False
+
+ # Correct firefox version or iceweasel
MozillaSearchHandler.INSTRUCTIONS = _("You can customize which search engines are offered.")
return True
elif is_preferred_browser("mozilla"):
@@ -813,5 +819,15 @@
@staticmethod
def has_requirements():
- return MozillaBookmarksHandler.has_requirements()
+ if is_preferred_browser("mozilla"):
+ return True
+ elif is_preferred_browser("firefox"):
+ if MozillaBookmarksHandler.has_firefox_version():
+ return True
+ # TODO: mark as i18n
+ MozillaHistoryHandler.INSTRUCTIONS = "Firefox version must be between 2.0.0.0 and 3.0.0.0"
+ return False
+ else:
+ MozillaHistoryHandler.INSTRUCTIONS = _("Mozilla/Firefox is not your preferred browser.")
+ return False
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]