Merge branch 'gnome-3-6'

[empathy.git] / libempathy-gtk / empathy-irc-network-dialog.c

diff --git a/libempathy-gtk/empathy-irc-network-dialog.c b/libempathy-gtk/empathy-irc-network-dialog.c
index 63222badc0e9dbb832b83a0aceb91511e92b5c2c..65f0a41bb51c5af09370b37f9ddcbee03416e051 100644 (file)
--- a/libempathy-gtk/empathy-irc-network-dialog.c
+++ b/libempathy-gtk/empathy-irc-network-dialog.c
@@ -27,9 +27,6 @@
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 
-#include <libmissioncontrol/mc-account.h>
-#include <libmissioncontrol/mc-protocol.h>
-
 #include <libempathy/empathy-utils.h>
 
 #include <libempathy/empathy-irc-network-manager.h>
@@ -463,6 +460,8 @@ empathy_irc_network_dialog_show (EmpathyIrcNetwork *network,
   GtkTreeSelection *selection;
   GtkTreeViewColumn *column;
   gchar *filename;
+  GtkWidget *sw, *toolbar;
+  GtkStyleContext *context;
 
   g_return_val_if_fail (network != NULL, NULL);
 
@@ -491,6 +490,8 @@ empathy_irc_network_dialog_show (EmpathyIrcNetwork *network,
       "button_remove", &dialog->button_remove,
       "button_up", &dialog->button_up,
       "button_down", &dialog->button_down,
+      "scrolledwindow_network_server", &sw,
+      "toolbar_network_server", &toolbar,
       NULL);
   g_free (filename);
 
@@ -509,6 +510,11 @@ empathy_irc_network_dialog_show (EmpathyIrcNetwork *network,
       GTK_TREE_VIEW (dialog->treeview_servers),
       -1, _("Server"), renderer, "text", COL_ADR,
       NULL);
+  column = gtk_tree_view_get_column (GTK_TREE_VIEW (dialog->treeview_servers),
+      0);
+
+  gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+  gtk_tree_view_column_set_expand (column, TRUE);
 
   /* port */
   adjustment = (GtkAdjustment *) gtk_adjustment_new (6667, 1, G_MAXUINT16,
@@ -520,12 +526,15 @@ empathy_irc_network_dialog_show (EmpathyIrcNetwork *network,
       NULL);
   g_signal_connect (renderer, "edited",
       G_CALLBACK (irc_network_dialog_port_edited_cb), dialog);
+
   gtk_tree_view_insert_column_with_attributes (
       GTK_TREE_VIEW (dialog->treeview_servers),
       -1, _("Port"), renderer, "text", COL_PORT,
       NULL);
+
   column = gtk_tree_view_get_column (GTK_TREE_VIEW (dialog->treeview_servers),
       1);
+  gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
   gtk_tree_view_column_set_expand (column, TRUE);
 
   /* SSL */
@@ -542,6 +551,11 @@ empathy_irc_network_dialog_show (EmpathyIrcNetwork *network,
       GTK_TREE_VIEW (dialog->treeview_servers));
   gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
 
+  column = gtk_tree_view_get_column (GTK_TREE_VIEW (dialog->treeview_servers),
+      2);
+  gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+
+  gtk_tree_view_column_set_expand (column, TRUE);
   /* charset */
   totem_subtitle_encoding_init (GTK_COMBO_BOX (dialog->combobox_charset));
 
@@ -571,8 +585,17 @@ empathy_irc_network_dialog_show (EmpathyIrcNetwork *network,
       GTK_WINDOW (parent));
   gtk_window_set_modal (GTK_WINDOW (dialog->dialog), TRUE);
 
+  /* join the add/remove toolbar to the treeview */
+  context = gtk_widget_get_style_context (sw);
+  gtk_style_context_set_junction_sides (context, GTK_JUNCTION_BOTTOM);
+
+  context = gtk_widget_get_style_context (toolbar);
+  gtk_style_context_set_junction_sides (context, GTK_JUNCTION_TOP);
+
   irc_network_dialog_network_update_buttons (dialog);
   gtk_widget_show_all (dialog->dialog);
 
+  gtk_window_set_resizable (GTK_WINDOW (dialog->dialog), FALSE);
+
   return dialog->dialog;
 }