*/
#include "config.h"
+#include "empathy-individual-information-dialog.h"
-#include <string.h>
-#include <stdlib.h>
-
-#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
-#include <gio/gdesktopappinfo.h>
-
-#include <telepathy-glib/telepathy-glib.h>
-#include <folks/folks.h>
-#include <folks/folks-telepathy.h>
-
-#include <libempathy/empathy-individual-manager.h>
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-pkg-kit.h>
-#include "empathy-individual-information-dialog.h"
+#include "empathy-individual-manager.h"
#include "empathy-individual-widget.h"
+#include "empathy-pkg-kit.h"
#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIndividualInformationDialog)
typedef struct {
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, NULL))
+ 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))
{
}
}
+out:
g_free (args);
}