deskbar-applet r1954 - in trunk: . deskbar/handlers

[sebp svn gnome org]

Author: sebp
Date: Fri Feb 22 12:53:50 2008
New Revision: 1954
URL: http://svn.gnome.org/viewvc/deskbar-applet?rev=1954&view=rev

Log:
Previous version check didn't word correctly.

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 22 12:53:50 2008
@@ -68,12 +68,14 @@
 def get_firefox_version():
     browser = get_preferred_browser ()
     process = subprocess.Popen(browser + " -version", stdout=subprocess.PIPE, shell=True)
-    info = process.stdout.readline()
-    pattern = re.compile("([0-9]+?)\.([0-9]+?)(\.([0-9]+?))*")
+    info = process.stdout.readline().split(" ")
+    pattern = re.compile("([0-9]+?)\.([0-9]+?)(\.([0-9]+))*")
     version = None
-    if (pattern.match(info)):
-        match = pattern.match(info)
-        version = info[match.start():match.end()]
+    for word in info:
+        if pattern.match(word):
+            match = pattern.match(word)
+            version = word[match.start():match.end()]
+    
     if version != None:
         # Convert to integers
         version = [int(i) for i in version.split(".")]
@@ -81,6 +83,7 @@
         if len(version) < 4:
             while (len(version) < 4):
                 version.append(0)
+        return version
     else:
         return None
 
@@ -219,6 +222,7 @@
     @staticmethod
     def has_firefox_version():
         version = get_firefox_version()
+        print "==============", version
         if version != None:
             return (version >= MIN_FF_VERSION and version < MAX_FF_VERSION)
         return False