[empathy] update gnome-contacts's desktop file
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] update gnome-contacts's desktop file
- Date: Thu, 28 Aug 2014 09:59:18 +0000 (UTC)
commit 994c6fe2f4bb5f86204dea109821de3cd7d611ad
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Thu Aug 28 11:13:27 2014 +0200
update gnome-contacts's desktop file
https://bugzilla.gnome.org/show_bug.cgi?id=735575
.../empathy-individual-information-dialog.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/libempathy-gtk/empathy-individual-information-dialog.c
b/libempathy-gtk/empathy-individual-information-dialog.c
index 2b8d64b..22bdb91 100644
--- a/libempathy-gtk/empathy-individual-information-dialog.c
+++ b/libempathy-gtk/empathy-individual-information-dialog.c
@@ -370,7 +370,11 @@ start_gnome_contacts (FolksIndividual *individual,
args = g_strdup_printf ("-i %s", folks_individual_get_id (individual));
- if (!empathy_launch_external_app ("gnome-contacts.desktop", args, &error))
+ /* First try the old desktop name */
+ if (empathy_launch_external_app ("gnome-contacts.desktop", args, &error))
+ goto out;
+
+ if (!empathy_launch_external_app ("org.gnome.Contacts.desktop", args, &error))
{
if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND))
{
@@ -390,6 +394,7 @@ start_gnome_contacts (FolksIndividual *individual,
}
}
+out:
g_free (args);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]