From: Alexander Larsson <alexl@redhat.com>
Date: Fri, 1 Feb 2008 12:02:52 +0000 (+0000)
Subject: Actually call the launch_uris method, not launch.
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=a7749bab36a79b509310baf8e479da2bf75d58a0;p=dana%2Fcg-glib.git

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 f9c5e5ec..4de9aa5a 100644
--- 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 add826b2..251ff969 100644
--- 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 fb4c1542..536a1ba6 100644
--- 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;
 }