use gtk_box_new() instead of gtk_[h,v]box_new()

[empathy.git] / src / empathy-main-window.c

diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c
index fe39ca454ffcdf4d260455fe6a08781fe7111d68..e4b2ccbfbe4006e90c805166648227848ae4a27b 100644 (file)
--- a/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@ -47,8 +47,6 @@
 #include <libempathy/empathy-tp-contact-factory.h>
 
 #include <libempathy-gtk/empathy-contact-dialogs.h>
-#include <libempathy-gtk/empathy-contact-list-store.h>
-#include <libempathy-gtk/empathy-contact-list-view.h>
 #include <libempathy-gtk/empathy-live-search.h>
 #include <libempathy-gtk/empathy-contact-blocking-dialog.h>
 #include <libempathy-gtk/empathy-contact-search-dialog.h>
@@ -569,7 +567,7 @@ main_window_load_events_idle_cb (gpointer user_data)
 }
 
 static void
-main_window_row_activated_cb (EmpathyContactListView *view,
+main_window_row_activated_cb (EmpathyIndividualView *view,
                              GtkTreePath            *path,
                              GtkTreeViewColumn      *col,
                              EmpathyMainWindow      *window)
@@ -1167,7 +1165,7 @@ main_window_setup_balance_create_widget (EmpathyMainWindow *window,
        EmpathyMainWindowPriv *priv = GET_PRIV (window);
        GtkWidget *hbox, *image, *label, *button;
 
-       hbox = gtk_hbox_new (FALSE, 6);
+       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 
        /* protocol icon */
        image = gtk_image_new ();
@@ -1374,8 +1372,8 @@ empathy_main_window_finalize (GObject *window)
        g_object_unref (priv->individual_store);
        g_object_unref (priv->contact_manager);
        g_object_unref (priv->sound_mgr);
-       g_hash_table_destroy (priv->errors);
-       g_hash_table_destroy (priv->auths);
+       g_hash_table_unref (priv->errors);
+       g_hash_table_unref (priv->auths);
 
        /* disconnect all handlers of status-changed signal */
        g_hash_table_iter_init (&iter, priv->status_changed_handlers);
@@ -1383,7 +1381,7 @@ empathy_main_window_finalize (GObject *window)
                g_signal_handler_disconnect (TP_ACCOUNT (key),
                                             GPOINTER_TO_UINT (value));
 
-       g_hash_table_destroy (priv->status_changed_handlers);
+       g_hash_table_unref (priv->status_changed_handlers);
 
        g_signal_handlers_disconnect_by_func (priv->event_manager,
                                              main_window_event_added_cb,
@@ -1519,7 +1517,7 @@ main_window_view_sort_contacts_cb (GtkRadioAction    *action,
                                   EmpathyMainWindow *window)
 {
        EmpathyMainWindowPriv *priv = GET_PRIV (window);
-       EmpathyContactListStoreSort value;
+       EmpathyIndividualStoreSort value;
        GSList      *group;
        GType        type;
        GEnumClass  *enum_class;