Merge branch 'gnome-3-8'

[empathy.git] / libempathy-gtk / empathy-contact-search-dialog.c

diff --git a/libempathy-gtk/empathy-contact-search-dialog.c b/libempathy-gtk/empathy-contact-search-dialog.c
index 82ca6cc318d01474262b65ddcd1524aede98e3d4..2696f5abbeb2fdb9a8af808e434745175bbeae2d 100644 (file)
--- a/libempathy-gtk/empathy-contact-search-dialog.c
+++ b/libempathy-gtk/empathy-contact-search-dialog.c
@@ -22,23 +22,22 @@
  *     Danielle Madeley <danielle.madeley@collabora.co.uk>
  *     Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
  */
+
 #include "config.h"
+#include "empathy-contact-search-dialog.h"
 
 #include <glib/gi18n-lib.h>
 
-#include <telepathy-glib/telepathy-glib.h>
-
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-client-factory.h>
-
-#include <libempathy-gtk/empathy-account-chooser.h>
-#include <libempathy-gtk/empathy-cell-renderer-text.h>
-#include <libempathy-gtk/empathy-cell-renderer-activatable.h>
-#include <libempathy-gtk/empathy-contact-dialogs.h>
-#include <libempathy-gtk/empathy-images.h>
+#include "empathy-account-chooser.h"
+#include "empathy-cell-renderer-activatable.h"
+#include "empathy-cell-renderer-text.h"
+#include "empathy-client-factory.h"
+#include "empathy-images.h"
+#include "empathy-individual-information-dialog.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 #include "empathy-contact-search-dialog.h"
 
@@ -454,6 +453,7 @@ on_profile_button_got_contact_cb (GObject *source,
 {
   GError *error = NULL;
   EmpathyContact *contact;
+  FolksIndividual *individual;
 
   contact = empathy_client_factory_dup_contact_by_id_finish (
         EMPATHY_CLIENT_FACTORY (source), result, &error);
@@ -464,9 +464,13 @@ on_profile_button_got_contact_cb (GObject *source,
       return;
     }
 
-  empathy_contact_information_dialog_show (contact, NULL);
+  individual = empathy_ensure_individual_from_tp_contact (
+    empathy_contact_get_tp_contact (contact));
+
+  empathy_display_individual_info (individual);
 
   g_object_unref (contact);
+  g_object_unref (individual);
 }
 
 static void
@@ -664,6 +668,7 @@ empathy_contact_search_dialog_init (EmpathyContactSearchDialog *self)
   gtk_window_set_default_size (GTK_WINDOW (self), 200, 400);
   gtk_widget_show_all (vbox);
   gtk_widget_hide (priv->spinner);
+  g_object_unref (size_group);
 }
 
 GtkWidget *