[gwget] 2009-05-31 David Sedeño <david alderia com>

[David Sedeño Fernández <davidsf src gnome org>]

commit b34d1bfffda43ab32f472a8264db8d90dfe13929
Author: David Sedeño <david alderia com>
Date:   Sun May 31 20:24:20 2009 +0200

    2009-05-31  David Sedeño <david alderia com>
    
            * src/main.c, src/gwget-application-service.xml: Add OpenURIDest call to
            Dbus so that OpenURI doesn't break external programs that use Dbus API.
            Fix: #583929
---
 ChangeLog                         |    6 ++++++
 src/gwget-application-service.xml |    6 ++++++
 src/main.c                        |    6 +++---
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 441fd24..deed64b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-05-31  David Sedeño <david alderia com>
+
+	* src/main.c, src/gwget-application-service.xml: Add OpenURIDest call to 
+	Dbus so that OpenURI doesn't break external programs that use Dbus API. 
+	Fix: #583929
+  
 2009-02-18  David Sedeño <david alderia com>
 
 	* configure.ac: Fix typo for epiphany version 2.26 (Götz Waschk).
diff --git a/src/gwget-application-service.xml b/src/gwget-application-service.xml
index b168e65..53ef589 100644
--- a/src/gwget-application-service.xml
+++ b/src/gwget-application-service.xml
@@ -13,6 +13,12 @@
     <method name="OpenURI">
       <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="gwget_application_open_uri"/>
       <arg type="s" name="uri" direction="in"/>
+      <arg type="u" name="timestamp" direction="in"/>
+    </method>
+
+    <method name="OpenURIDest">
+      <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="gwget_application_open_uri"/>
+      <arg type="s" name="uri" direction="in"/>
       <arg type="s" name="destination_dir" direction="in"/>
       <arg type="u" name="timestamp" direction="in"/>
     </method>
diff --git a/src/main.c b/src/main.c
index b44c668..314f56b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -173,7 +173,7 @@ connection = dbus_g_bus_get (DBUS_BUS_STARTER, &error);
         		dest_dir = destination_dir;
         	} 
 #if DBUS_VERSION <= 33
-		call = dbus_g_proxy_begin_call (remote_object, "OpenURI",
+		call = dbus_g_proxy_begin_call (remote_object, "OpenURIDest",
 						DBUS_TYPE_STRING, &uri,
 						DBUS_TYPE_STRING, &dest_dir,
 						DBUS_TYPE_UINT32, &timestamp,
@@ -186,7 +186,7 @@ connection = dbus_g_bus_get (DBUS_BUS_STARTER, &error);
 			continue;
 		}
 #elif DBUS_VERSION == 34
-		call = dbus_g_proxy_begin_call (remote_object, "OpenURI",
+		call = dbus_g_proxy_begin_call (remote_object, "OpenURIDest",
 						G_TYPE_STRING, uri,
 						G_TYPE_STRING, dest_dir,
 						G_TYPE_UINT, timestamp,
@@ -199,7 +199,7 @@ connection = dbus_g_bus_get (DBUS_BUS_STARTER, &error);
 			continue;
 		}
 #else
-		if (!dbus_g_proxy_call (remote_object, "OpenURI", &error,
+		if (!dbus_g_proxy_call (remote_object, "OpenURIDest", &error,
 					G_TYPE_STRING, uri,
 					G_TYPE_STRING, dest_dir,
 					G_TYPE_UINT, timestamp,