From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Thu, 28 Aug 2014 09:13:27 +0000 (+0200)
Subject: update gnome-contacts's desktop file
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=994c6fe2f4bb5f86204dea109821de3cd7d611ad

update gnome-contacts's desktop file

https://bugzilla.gnome.org/show_bug.cgi?id=735575
---

diff --git a/libempathy-gtk/empathy-individual-information-dialog.c b/libempathy-gtk/empathy-individual-information-dialog.c
index 2b8d64bd..22bdb91e 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);
 }