[meld] Fix regression in new-tab opening from auto-merge changes

[Kai Willadsen <kaiw src gnome org>]

commit bca3361554b64810b8401e8ea805027c03c9d885
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Wed Sep 26 06:41:06 2012 +1000

    Fix regression in new-tab opening from auto-merge changes

 meld/meldapp.py |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/meld/meldapp.py b/meld/meldapp.py
index 4b3c8e2..7aca547 100644
--- a/meld/meldapp.py
+++ b/meld/meldapp.py
@@ -195,7 +195,9 @@ class MeldApp(gobject.GObject):
             if not dbus_app:
                 print _("D-Bus error; comparisons will open in a new window.")
             else:
-                open_paths = lambda f, x: dbus_app.OpenPaths(f, 0)
+                # Note that we deliberately discard auto-compare and -merge
+                # options here; these are not supported via dbus yet.
+                open_paths = lambda f, *x: dbus_app.OpenPaths(f, 0)
                 new_window = False
 
         for files in options.diff: