[meld] melddoc: Update open-external action to use GTK helper (bgo#698518)

[Kai Willadsen <kaiw src gnome org>]

commit 69835069d13b7e2aa1514d1fd8b41b77b43e7470
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Mon Jun 9 08:10:56 2014 +1000

    melddoc: Update open-external action to use GTK helper (bgo#698518)
    
    Gtk.show_uri() now appears to do the right thing as far as focus
    stealing prevention goes, so we'll use that instead of launching
    xdg-open.

 meld/melddoc.py |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/meld/melddoc.py b/meld/melddoc.py
index b7a78eb..60f3a30 100644
--- a/meld/melddoc.py
+++ b/meld/melddoc.py
@@ -20,6 +20,7 @@ import string
 import subprocess
 import sys
 
+from gi.repository import Gdk
 from gi.repository import GLib
 from gi.repository import GObject
 from gi.repository import Gio
@@ -95,7 +96,7 @@ class MeldDoc(GObject.GObject):
         query_attrs = ",".join((Gio.FILE_ATTRIBUTE_STANDARD_TYPE,
                                 Gio.FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE))
 
-        def os_open(path):
+        def os_open(path, uri):
             if not path:
                 return
             if sys.platform == "win32":
@@ -103,16 +104,17 @@ class MeldDoc(GObject.GObject):
             elif sys.platform == "darwin":
                 subprocess.Popen(["open", path])
             else:
-                subprocess.Popen(["xdg-open", path])
+                Gtk.show_uri(Gdk.Screen.get_default(), uri,
+                             Gtk.get_current_event_time())
 
         def open_cb(source, result, *data):
             info = source.query_info_finish(result)
             file_type = info.get_file_type()
+            path, uri = source.get_path(), source.get_uri()
             if file_type == Gio.FileType.DIRECTORY:
-                os_open(source.get_path())
+                os_open(path, uri)
             elif file_type == Gio.FileType.REGULAR:
                 content_type = info.get_content_type()
-                path = source.get_path()
                 # FIXME: Content types are broken on Windows with current gio
                 if Gio.content_type_is_a(content_type, "text/plain") or \
                         sys.platform == "win32":
@@ -127,9 +129,9 @@ class MeldDoc(GObject.GObject):
                             # silently
                             subprocess.Popen(editor)
                         else:
-                            os_open(path)
+                            os_open(path, uri)
                 else:
-                    os_open(path)
+                    os_open(path, uri)
             else:
                 # TODO: Add some kind of 'failed to open' notification
                 pass