From 8daec6589cf7dbd0be2c4f6548234d48d0f5b44a Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Mon, 12 Mar 2012 15:23:30 +0100 Subject: individual-menu: only use 'gnome-contacts' with individuals from Folks https://bugzilla.gnome.org/show_bug.cgi?id=671884 --- libempathy-gtk/empathy-individual-menu.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'libempathy-gtk/empathy-individual-menu.c') diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c index 7b8da52d1..22d314882 100644 --- a/libempathy-gtk/empathy-individual-menu.c +++ b/libempathy-gtk/empathy-individual-menu.c @@ -53,6 +53,7 @@ #include "empathy-share-my-desktop.h" #include "empathy-call-utils.h" #include "empathy-individual-store-channel.h" +#include "empathy-individual-information-dialog.h" #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT #include @@ -1364,7 +1365,24 @@ static void individual_info_menu_item_activate_cb (GtkMenuItem *item, FolksIndividual *individual) { - start_gnome_contacts (individual, TRUE); + EmpathyIndividualManager *mgr; + + mgr = empathy_individual_manager_dup_singleton (); + + /* Only use gnome-contacts if that's a 'real' individual we got from + * Folks (and so the individual manager knows about it). If not that's a + * MUC contact and we use the simple dialog. */ + if (empathy_individual_manager_lookup_member (mgr, + folks_individual_get_id (individual)) != NULL) + { + start_gnome_contacts (individual, TRUE); + } + else + { + empathy_individual_information_dialog_show (individual, NULL); + } + + g_object_unref (mgr); } static GtkWidget * -- cgit v1.2.3