*/
#include "config.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
+#include "empathy-account-widget-sip.h"
#include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
-#include <telepathy-glib/util.h>
-#include <libempathy/empathy-utils.h>
-
-#include "empathy-account-widget.h"
#include "empathy-account-widget-private.h"
-#include "empathy-account-widget-sip.h"
#include "empathy-ui-utils.h"
typedef struct {
g_free (mechanism);
}
-void
+static void
+checkbutton_tel_toggled (
+ GtkWidget *checkbox,
+ EmpathyAccountWidgetSip *sip_settings)
+{
+ EmpathyAccountSettings *settings;
+
+ settings = empathy_account_widget_get_settings (sip_settings->self);
+
+ empathy_account_settings_set_uri_scheme_tel (settings,
+ gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbox)));
+
+ empathy_account_widget_changed (sip_settings->self);
+}
+
+GtkWidget *
empathy_account_widget_sip_build (EmpathyAccountWidget *self,
const char *filename,
- GtkWidget **table_common_settings)
+ GtkWidget **grid_common_settings)
{
EmpathyAccountWidgetSip *settings;
GtkWidget *vbox_settings;
gboolean is_simple;
- GtkWidget *table_advanced;
+ GtkWidget *grid_advanced;
g_object_get (self, "simple", &is_simple, NULL);
if (is_simple)
{
- self->ui_details->gui = empathy_builder_get_file (filename,
+ self->ui_details->gui = empathy_builder_get_resource (filename,
"vbox_sip_simple", &vbox_settings,
NULL);
else
{
GtkListStore *store;
- GtkTreeIter iter;
GtkCellRenderer *renderer;
+ GtkToggleButton *checkbutton_tel;
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,
+ self->ui_details->gui = empathy_builder_get_resource (filename,
+ "grid_common_settings", grid_common_settings,
+ "grid_advanced_sip_settings", &grid_advanced,
"vbox_sip_settings", &vbox_settings,
"label_stun-server", &settings->label_stun_server,
"entry_stun-server", &settings->entry_stun_server,
"checkbutton_discover-stun", &settings->checkbutton_discover_stun,
"spinbutton_keepalive-interval",
&settings->spinbutton_keepalive_interval,
+ "checkbutton_tel", &checkbutton_tel,
NULL);
settings->vbox_settings = vbox_settings;
+ gtk_toggle_button_set_active (checkbutton_tel,
+ empathy_account_settings_has_uri_scheme_tel (
+ empathy_account_widget_get_settings (self)));
+
empathy_account_widget_handle_params (self,
"entry_userid", "account",
"entry_password", "password",
"checkbutton_loose-routing", "loose-routing",
"checkbutton_discover-binding", "discover-binding",
"spinbutton_keepalive-interval", "keepalive-interval",
+ "checkbutton_ignore-tls-errors", "ignore-tls-errors",
+ "entry_local-ip-address", "local-ip-address",
+ "spinbutton_local-port", "local-port",
NULL);
account_widget_sip_discover_stun_toggled_cb (
"vbox_sip_settings", "destroy", account_widget_sip_destroy_cb,
"checkbutton_discover-stun", "toggled",
account_widget_sip_discover_stun_toggled_cb,
+ "checkbutton_tel", "toggled", checkbutton_tel_toggled,
NULL);
self->ui_details->default_focus = g_strdup ("entry_userid");
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_insert_with_values (store, NULL, -1,
+ 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_insert_with_values (store, NULL, -1,
+ 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_insert_with_values (store, NULL, -1,
+ 0, "tcp", 1, _("TCP"), -1);
- gtk_list_store_append (store, &iter);
- gtk_list_store_set (store, &iter, 0, "tls", 1, _("TLS"), -1);
+ gtk_list_store_insert_with_values (store, NULL, -1,
+ 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_grid_attach (GTK_GRID (grid_advanced), settings->combobox_transport,
+ 1, 11, 3, 1);
gtk_widget_show (settings->combobox_transport);
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_insert_with_values (store, NULL, -1,
+ 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_insert_with_values (store, NULL, -1,
+ 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_insert_with_values (store, NULL, -1,
+ 0, "options", 1, _("Options"), -1);
- gtk_list_store_append (store, &iter);
- gtk_list_store_set (store, &iter, 0, "none", 1, _("None"), -1);
+ gtk_list_store_insert_with_values (store, NULL, -1,
+ 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_grid_attach (GTK_GRID (grid_advanced),
+ settings->combobox_keep_alive_mechanism,
+ 1, 7, 3, 1);
gtk_widget_show (settings->combobox_keep_alive_mechanism);
}
- self->ui_details->widget = vbox_settings;
+ return vbox_settings;
}
projects / empathy.git / blobdiff