factor out start_gnome_contacts()

[empathy.git] / libempathy-gtk / empathy-individual-linker.c

diff --git a/libempathy-gtk/empathy-individual-linker.c b/libempathy-gtk/empathy-individual-linker.c
index 793c2827fa09a4d30f03f281f6db161a71fd597f..7de5e4addda8f579c6acfe58de27ecf0c0969249 100644 (file)
--- a/libempathy-gtk/empathy-individual-linker.c
+++ b/libempathy-gtk/empathy-individual-linker.c
@@ -35,6 +35,7 @@
 
 #include "empathy-individual-linker.h"
 #include "empathy-individual-store.h"
+#include "empathy-individual-store-manager.h"
 #include "empathy-individual-view.h"
 #include "empathy-individual-widget.h"
 #include "empathy-persona-store.h"
@@ -355,17 +356,18 @@ set_up (EmpathyIndividualLinker *self)
 
   priv = GET_PRIV (self);
 
-  top_vbox = gtk_vbox_new (FALSE, 6);
+  top_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 
   /* Layout panes */
-  paned = GTK_PANED (gtk_hpaned_new ());
+
+  paned = GTK_PANED (gtk_paned_new (GTK_ORIENTATION_HORIZONTAL));
 
   /* Left column heading */
   alignment = gtk_alignment_new (0.5, 0.5, 1, 1);
   gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 0, 6);
   gtk_widget_show (alignment);
 
-  vbox = GTK_BOX (gtk_vbox_new (FALSE, 6));
+  vbox = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 6));
   label = gtk_label_new (NULL);
   tmp = g_strdup_printf ("<b>%s</b>", _("Select contacts to link"));
   gtk_label_set_markup (GTK_LABEL (label), tmp);
@@ -375,7 +377,8 @@ set_up (EmpathyIndividualLinker *self)
 
   /* Individual selector */
   individual_manager = empathy_individual_manager_dup_singleton ();
-  priv->individual_store = empathy_individual_store_new (individual_manager);
+  priv->individual_store = EMPATHY_INDIVIDUAL_STORE (
+      empathy_individual_store_manager_new (individual_manager));
   g_object_unref (individual_manager);
 
   empathy_individual_store_set_show_protocols (priv->individual_store, FALSE);
@@ -439,7 +442,7 @@ set_up (EmpathyIndividualLinker *self)
   gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), 0, 0, 6, 0);
   gtk_widget_show (alignment);
 
-  vbox = GTK_BOX (gtk_vbox_new (FALSE, 6));
+  vbox = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 6));
   label = gtk_label_new (NULL);
   tmp = g_strdup_printf ("<b>%s</b>", _("New contact preview"));
   gtk_label_set_markup (GTK_LABEL (label), tmp);
@@ -572,7 +575,7 @@ finalize (GObject *object)
 {
   EmpathyIndividualLinkerPriv *priv = GET_PRIV (object);
 
-  g_hash_table_destroy (priv->changed_individuals);
+  g_hash_table_unref (priv->changed_individuals);
 
   G_OBJECT_CLASS (empathy_individual_linker_parent_class)->finalize (object);
 }