Actually call the launch_uris method, not launch.

2008-02-01  Alexander Larsson  <alexl@redhat.com>

	* gappinfo.c (g_app_info_launch_uris):
	Actually call the launch_uris method, not
	launch.

2008-02-01  Alexander Larsson  <alexl@redhat.com>

	* gdesktopappinfo.c (g_desktop_app_info_equal):
	Ensure appinfos with no id but same pointer value
	compare equal

svn path=/trunk/; revision=6440

diff --git a/gio/ChangeLog b/gio/ChangeLog
index f9c5e5ec07ac895bd2763c6e14216fcf32aa4130..4de9aa5a19a95c96eabb2f326733b46b16ffcc5e 100644 (file)
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,15 @@
+2008-02-01  Alexander Larsson  <alexl@redhat.com>
+
+       * gappinfo.c (g_app_info_launch_uris):
+       Actually call the launch_uris method, not
+       launch.
+
+2008-02-01  Alexander Larsson  <alexl@redhat.com>
+
+       * gdesktopappinfo.c (g_desktop_app_info_equal):
+       Ensure appinfos with no id but same pointer value
+       compare equal
+
 2008-02-01  Alexander Larsson  <alexl@redhat.com>
 
        * gappinfo.c (g_app_info_launch_default_for_uri): 

diff --git a/gio/gappinfo.c b/gio/gappinfo.c
index add826b2076d5f546fe55174d8ca650eabf33271..251ff969b1fd809d75873a9917dd8d28f689b835 100644 (file)
--- a/gio/gappinfo.c
+++ b/gio/gappinfo.c
@@ -504,7 +504,7 @@ g_app_info_launch_uris (GAppInfo           *appinfo,
 
   iface = G_APP_INFO_GET_IFACE (appinfo);
 
-  return (* iface->launch) (appinfo, uris, launch_context, error);
+  return (* iface->launch_uris) (appinfo, uris, launch_context, error);
 }
 
 

diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
index fb4c154208faa5fa6273e6b4942b4ae035eee909..536a1ba6bae5c65837781c0668553b1c7f8e65f6 100644 (file)
--- a/gio/gdesktopappinfo.c
+++ b/gio/gdesktopappinfo.c
@@ -388,7 +388,7 @@ g_desktop_app_info_equal (GAppInfo *appinfo1,
 
   if (info1->desktop_id == NULL ||
       info2->desktop_id == NULL)
-    return FALSE;
+    return info1 == info2;
 
   return strcmp (info1->desktop_id, info2->desktop_id) == 0;
 }