deskbar-applet r2057 - in trunk: . deskbar/handlers deskbar/handlers/actions

[sebp svn gnome org]

Author: sebp
Date: Sun Mar 30 18:06:35 2008
New Revision: 2057
URL: http://svn.gnome.org/viewvc/deskbar-applet?rev=2057&view=rev

Log:
2008-03-30  Sebastian PÃlsterl  <sebp cvs gnome org>

    * deskbar/handlers/beagle-live.py:
    Escape regex markup from query string

2008-03-30  Sebastian PÃlsterl  <sebp cvs gnome org>

    * deskbar/handlers/actions/ActionsFactory.py:
    When a command to open a file has arguments itsself
    move them over to the arguments list

Modified:
   trunk/ChangeLog
   trunk/deskbar/handlers/actions/ActionsFactory.py
   trunk/deskbar/handlers/beagle-live.py

Modified: trunk/deskbar/handlers/actions/ActionsFactory.py
==============================================================================
--- trunk/deskbar/handlers/actions/ActionsFactory.py	(original)
+++ trunk/deskbar/handlers/actions/ActionsFactory.py	Sun Mar 30 18:06:35 2008
@@ -54,7 +54,15 @@
         # 4: expects_uri (int)
         # 5: supported uri schemes (list)
         if (mime_default_cmd == None or app[2] != mime_default_cmd) and app[2] != None:
-            actions.append( OpenWithApplicationAction(display_name, app[2], [path],
+            cmd = app[2]
+            args = [path]
+            
+            cmd_args = cmd.split(" ")
+            if len(cmd_args) > 0:
+                cmd = cmd_args[0]
+                args = cmd_args[1:] + args
+            
+            actions.append( OpenWithApplicationAction(display_name, cmd, args,
                     display_program_name=app[1]) )
     
     actions.append( GoToLocationAction(display_name, uri) )

Modified: trunk/deskbar/handlers/beagle-live.py
==============================================================================
--- trunk/deskbar/handlers/beagle-live.py	(original)
+++ trunk/deskbar/handlers/beagle-live.py	Sun Mar 30 18:06:35 2008
@@ -495,7 +495,7 @@
                     tmp = re.sub(r"</.*?>", "", tmp)
                     result["snippet"] = cgi.escape(tmp)
                     
-                    result["snippet"] = re.sub(qstring, "<span weight='bold'>"+qstring+"</span>", result["snippet"], re.IGNORECASE)
+                    result["snippet"] = re.sub(re.escape(qstring), "<span weight='bold'>"+qstring+"</span>", result["snippet"], re.IGNORECASE)
                 else:
                     result["snippet"] = ""
             else: