]> git.0d.be Git - empathy.git/blobdiff - libempathy-gtk/empathy-account-widget-sip.c
Merge branch 'sasl'
[empathy.git] / libempathy-gtk / empathy-account-widget-sip.c
index db39ddae4a360ed9b4259cabfb93098fd7361c72..5058f6ade34e957c97e53c76411a508a1db842ad 100644 (file)
@@ -28,6 +28,7 @@
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 
+#include <telepathy-glib/util.h>
 #include <libempathy/empathy-utils.h>
 
 #include "empathy-account-widget.h"
@@ -39,9 +40,14 @@ typedef struct {
   EmpathyAccountWidget *self;
   GtkWidget *vbox_settings;
 
+  GtkWidget *label_stun_server;
   GtkWidget *entry_stun_server;
-  GtkWidget *spinbutton_stun_part;
+  GtkWidget *label_stun_port;
+  GtkWidget *spinbutton_stun_port;
   GtkWidget *checkbutton_discover_stun;
+  GtkWidget *combobox_transport;
+  GtkWidget *combobox_keep_alive_mechanism;
+  GtkWidget *spinbutton_keepalive_interval;
 } EmpathyAccountWidgetSip;
 
 static void
@@ -59,8 +65,32 @@ account_widget_sip_discover_stun_toggled_cb (
   gboolean active;
 
   active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbox));
+  gtk_widget_set_sensitive (settings->label_stun_server, !active);
   gtk_widget_set_sensitive (settings->entry_stun_server, !active);
-  gtk_widget_set_sensitive (settings->spinbutton_stun_part, !active);
+  gtk_widget_set_sensitive (settings->label_stun_port, !active);
+  gtk_widget_set_sensitive (settings->spinbutton_stun_port, !active);
+}
+
+static void
+keep_alive_mechanism_combobox_change_cb (GtkWidget *widget,
+    EmpathyAccountWidgetSip *self)
+{
+  GtkTreeIter iter;
+  GtkTreeModel *model;
+  gchar *mechanism;
+  gboolean enabled;
+
+  /* Unsensitive the keep-alive spin button if keep-alive is disabled */
+  if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (widget), &iter))
+    return;
+
+  model = gtk_combo_box_get_model (GTK_COMBO_BOX (widget));
+  gtk_tree_model_get (model, &iter, 0, &mechanism, -1);
+
+  enabled = tp_strdiff (mechanism, "none");
+
+  gtk_widget_set_sensitive (self->spinbutton_keepalive_interval, enabled);
+  g_free (mechanism);
 }
 
 void
@@ -71,6 +101,7 @@ empathy_account_widget_sip_build (EmpathyAccountWidget *self,
   EmpathyAccountWidgetSip *settings;
   GtkWidget *vbox_settings;
   gboolean is_simple;
+  GtkWidget *table_advanced;
 
   g_object_get (self, "simple", &is_simple, NULL);
 
@@ -89,15 +120,24 @@ empathy_account_widget_sip_build (EmpathyAccountWidget *self,
     }
   else
     {
+      GtkListStore *store;
+      GtkTreeIter iter;
+      GtkCellRenderer *renderer;
+
       settings = g_slice_new0 (EmpathyAccountWidgetSip);
       settings->self = self;
 
       self->ui_details->gui = empathy_builder_get_file (filename,
           "table_common_settings", table_common_settings,
+          "table_advanced_sip_settings", &table_advanced,
           "vbox_sip_settings", &vbox_settings,
+          "label_stun-server", &settings->label_stun_server,
           "entry_stun-server", &settings->entry_stun_server,
-          "spinbutton_stun-port", &settings->spinbutton_stun_part,
+          "label_stun-port", &settings->label_stun_port,
+          "spinbutton_stun-port", &settings->spinbutton_stun_port,
           "checkbutton_discover-stun", &settings->checkbutton_discover_stun,
+          "spinbutton_keepalive-interval",
+            &settings->spinbutton_keepalive_interval,
           NULL);
       settings->vbox_settings = vbox_settings;
 
@@ -107,6 +147,12 @@ empathy_account_widget_sip_build (EmpathyAccountWidget *self,
           "checkbutton_discover-stun", "discover-stun",
           "entry_stun-server", "stun-server",
           "spinbutton_stun-port", "stun-port",
+          "entry_auth-user", "auth-user",
+          "entry_proxy-host", "proxy-host",
+          "spinbutton_port", "port",
+          "checkbutton_loose-routing", "loose-routing",
+          "checkbutton_discover-binding", "discover-binding",
+          "spinbutton_keepalive-interval", "keepalive-interval",
           NULL);
 
       account_widget_sip_discover_stun_toggled_cb (
@@ -119,8 +165,79 @@ empathy_account_widget_sip_build (EmpathyAccountWidget *self,
           account_widget_sip_discover_stun_toggled_cb,
           NULL);
 
-      self->ui_details->add_forget = TRUE;
       self->ui_details->default_focus = g_strdup ("entry_userid");
+
+      /* Create the 'transport' combo box. The first column has to contain the
+       * value of the param. */
+      store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
+      settings->combobox_transport = gtk_combo_box_new_with_model (
+          GTK_TREE_MODEL (store));
+
+      renderer = gtk_cell_renderer_text_new ();
+      gtk_cell_layout_pack_start (
+          GTK_CELL_LAYOUT (settings->combobox_transport), renderer, TRUE);
+      gtk_cell_layout_add_attribute (
+          GTK_CELL_LAYOUT (settings->combobox_transport), renderer, "text", 1);
+
+      gtk_list_store_append (store, &iter);
+      gtk_list_store_set (store, &iter, 0, "auto", 1, _("Auto"), -1);
+
+      gtk_list_store_append (store, &iter);
+      gtk_list_store_set (store, &iter, 0, "udp", 1, _("UDP"), -1);
+
+      gtk_list_store_append (store, &iter);
+      gtk_list_store_set (store, &iter, 0, "tcp", 1, _("TCP"), -1);
+
+      gtk_list_store_append (store, &iter);
+      gtk_list_store_set (store, &iter, 0, "tls", 1, _("TLS"), -1);
+
+      empathy_account_widget_setup_widget (self, settings->combobox_transport,
+          "transport");
+
+      gtk_table_attach_defaults (GTK_TABLE (table_advanced),
+          settings->combobox_transport, 1, 4, 11, 12);
+
+      gtk_widget_show (settings->combobox_transport);
+
+      /* Create the 'keep-alive mechanism' combo box */
+      store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
+      settings->combobox_keep_alive_mechanism = gtk_combo_box_new_with_model (
+          GTK_TREE_MODEL (store));
+
+      renderer = gtk_cell_renderer_text_new ();
+      gtk_cell_layout_pack_start (
+          GTK_CELL_LAYOUT (settings->combobox_keep_alive_mechanism), renderer,
+          TRUE);
+      gtk_cell_layout_add_attribute (
+          GTK_CELL_LAYOUT (settings->combobox_keep_alive_mechanism), renderer,
+          "text", 1);
+
+      gtk_list_store_append (store, &iter);
+      gtk_list_store_set (store, &iter, 0, "auto", 1, _("Auto"), -1);
+
+      gtk_list_store_append (store, &iter);
+      /* translators: this string is very specific to SIP's internal; maybe
+       * best to keep the English version. */
+      gtk_list_store_set (store, &iter, 0, "register", 1, _("Register"), -1);
+
+      gtk_list_store_append (store, &iter);
+      /* translators: this string is very specific to SIP's internal; maybe
+       * best to keep the English version. */
+      gtk_list_store_set (store, &iter, 0, "options", 1, _("Options"), -1);
+
+      gtk_list_store_append (store, &iter);
+      gtk_list_store_set (store, &iter, 0, "none", 1, _("None"), -1);
+
+      g_signal_connect (settings->combobox_keep_alive_mechanism, "changed",
+          G_CALLBACK (keep_alive_mechanism_combobox_change_cb), settings);
+
+      empathy_account_widget_setup_widget (self,
+          settings->combobox_keep_alive_mechanism, "keepalive-mechanism");
+
+      gtk_table_attach_defaults (GTK_TABLE (table_advanced),
+          settings->combobox_keep_alive_mechanism, 1, 4, 7, 8);
+
+      gtk_widget_show (settings->combobox_keep_alive_mechanism);
     }
 
   self->ui_details->widget = vbox_settings;