aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2014-08-28 17:13:27 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2014-08-28 17:58:19 +0800
commit994c6fe2f4bb5f86204dea109821de3cd7d611ad (patch)
tree8c259028005c334e3d81bad95de8708e6d378365
parent39a9e7b9ec898ef699086505ce6734a5f0edd309 (diff)
downloadgsoc2013-empathy-994c6fe2f4bb5f86204dea109821de3cd7d611ad.tar
gsoc2013-empathy-994c6fe2f4bb5f86204dea109821de3cd7d611ad.tar.gz
gsoc2013-empathy-994c6fe2f4bb5f86204dea109821de3cd7d611ad.tar.bz2
gsoc2013-empathy-994c6fe2f4bb5f86204dea109821de3cd7d611ad.tar.lz
gsoc2013-empathy-994c6fe2f4bb5f86204dea109821de3cd7d611ad.tar.xz
gsoc2013-empathy-994c6fe2f4bb5f86204dea109821de3cd7d611ad.tar.zst
gsoc2013-empathy-994c6fe2f4bb5f86204dea109821de3cd7d611ad.zip
update gnome-contacts's desktop file
https://bugzilla.gnome.org/show_bug.cgi?id=735575
-rw-r--r--libempathy-gtk/empathy-individual-information-dialog.c7
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 2b8d64bd3..22bdb91ee 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);
}