From a7749bab36a79b509310baf8e479da2bf75d58a0 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Fri, 1 Feb 2008 12:02:52 +0000 Subject: [PATCH] Actually call the launch_uris method, not launch. 2008-02-01 Alexander Larsson * gappinfo.c (g_app_info_launch_uris): Actually call the launch_uris method, not launch. 2008-02-01 Alexander Larsson * gdesktopappinfo.c (g_desktop_app_info_equal): Ensure appinfos with no id but same pointer value compare equal svn path=/trunk/; revision=6440 --- gio/ChangeLog | 12 ++++++++++++ gio/gappinfo.c | 2 +- gio/gdesktopappinfo.c | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/gio/ChangeLog b/gio/ChangeLog index f9c5e5e..4de9aa5 100644 --- a/gio/ChangeLog +++ b/gio/ChangeLog @@ -1,5 +1,17 @@ 2008-02-01 Alexander Larsson + * gappinfo.c (g_app_info_launch_uris): + Actually call the launch_uris method, not + launch. + +2008-02-01 Alexander Larsson + + * gdesktopappinfo.c (g_desktop_app_info_equal): + Ensure appinfos with no id but same pointer value + compare equal + +2008-02-01 Alexander Larsson + * gappinfo.c (g_app_info_launch_default_for_uri): Don't leak appinfo. diff --git a/gio/gappinfo.c b/gio/gappinfo.c index add826b..251ff96 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 fb4c154..536a1ba 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; } -- 2.7.4