From 2e06e344f7fd8a5543ca9619d07c621d9542820f Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Fri, 18 Jan 2008 23:14:40 +0000 Subject: [PATCH] New UI for Jabber accounts, gabble >= 0.7.2 is required. Fixes bug #507840. svn path=/trunk/; revision=576 --- .../empathy-account-widget-jabber.c | 92 +++++- .../empathy-account-widget-jabber.glade | 308 ++++++++++++------ 2 files changed, 283 insertions(+), 117 deletions(-) diff --git a/libempathy-gtk/empathy-account-widget-jabber.c b/libempathy-gtk/empathy-account-widget-jabber.c index 81e7d351..93a42008 100644 --- a/libempathy-gtk/empathy-account-widget-jabber.c +++ b/libempathy-gtk/empathy-account-widget-jabber.c @@ -32,10 +32,13 @@ #include #include +#include #include "empathy-account-widget-jabber.h" #include "empathy-ui-utils.h" +#define DEBUG_DOMAIN "AccountWidgetJabber" + #define PORT_WITHOUT_SSL 5222 #define PORT_WITH_SSL 5223 @@ -51,6 +54,8 @@ typedef struct { GtkWidget *spinbutton_port; GtkWidget *spinbutton_priority; GtkWidget *checkbutton_ssl; + GtkWidget *checkbutton_ignore_ssl_errors; + GtkWidget *checkbutton_encryption; } EmpathyAccountWidgetJabber; static gboolean account_widget_jabber_entry_focus_cb (GtkWidget *widget, @@ -95,10 +100,13 @@ account_widget_jabber_entry_focus_cb (GtkWidget *widget, if (G_STR_EMPTY (str)) { gchar *value = NULL; + mc_account_unset_param (settings->account, param); mc_account_get_param_string (settings->account, param, &value); + empathy_debug (DEBUG_DOMAIN, "Unset %s and restore to %s", param, value); gtk_entry_set_text (GTK_ENTRY (widget), value ? value : ""); g_free (value); } else { + empathy_debug (DEBUG_DOMAIN, "Setting %s to %s", param, str); mc_account_set_param_string (settings->account, param, str); } @@ -121,26 +129,50 @@ static void account_widget_jabber_checkbutton_toggled_cb (GtkWidget *widget, EmpathyAccountWidgetJabber *settings) { + gboolean value; + gboolean default_value; + const gchar *param; + + value = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)); + if (widget == settings->checkbutton_ssl) { - gint port = 0; - gboolean old_ssl; + gint port = 0; mc_account_get_param_int (settings->account, "port", &port); - old_ssl = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)); - if (old_ssl) { - if (port == PORT_WITHOUT_SSL) { + if (value) { + if (port == PORT_WITHOUT_SSL || port == 0) { port = PORT_WITH_SSL; } } else { - if (port == PORT_WITH_SSL) { + if (port == PORT_WITH_SSL || port == 0) { port = PORT_WITHOUT_SSL; } } - - mc_account_set_param_int (settings->account, "port", port); - mc_account_set_param_boolean (settings->account, "old-ssl", old_ssl); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (settings->spinbutton_port), port); + param = "old-ssl"; + } + else if (widget == settings->checkbutton_ignore_ssl_errors) { + param = "ignore-ssl-errors"; + } + else if (widget == settings->checkbutton_encryption) { + param = "require-encryption"; + } else { + return; + } + + /* FIXME: This is ugly! checkbox don't have a "not-set" value so we + * always unset the param and set the value if different from the + * default value. */ + mc_account_unset_param (settings->account, param); + mc_account_get_param_boolean (settings->account, param, &default_value); + + if (default_value != value) { + empathy_debug (DEBUG_DOMAIN, "Setting %s to %d", param, value); + mc_account_set_param_boolean (settings->account, param, value); + } else { + empathy_debug (DEBUG_DOMAIN, "Unset %s", param, value); } } @@ -148,15 +180,30 @@ static void account_widget_jabber_value_changed_cb (GtkWidget *spinbutton, EmpathyAccountWidgetJabber *settings) { - gdouble value; + gdouble value; + const gchar *param; value = gtk_spin_button_get_value (GTK_SPIN_BUTTON (spinbutton)); if (spinbutton == settings->spinbutton_port) { - mc_account_set_param_int (settings->account, "port", (gint) value); + param = "port"; } else if (spinbutton == settings->spinbutton_priority) { - mc_account_set_param_int (settings->account, "priority", (gint) value); + param = "priority"; + } else { + return; + } + + if (value != 0) { + empathy_debug (DEBUG_DOMAIN, "Setting %s to %d", param, (gint) value); + mc_account_set_param_int (settings->account, param, (gint) value); + } else { + gint val; + + mc_account_unset_param (settings->account, param); + mc_account_get_param_int (settings->account, param, &val); + empathy_debug (DEBUG_DOMAIN, "Unset %s and restore to %d", param, val); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (spinbutton), val); } } @@ -164,7 +211,8 @@ static void account_widget_jabber_button_forget_clicked_cb (GtkWidget *button, EmpathyAccountWidgetJabber *settings) { - mc_account_set_param_string (settings->account, "password", ""); + empathy_debug (DEBUG_DOMAIN, "Unset password"); + mc_account_unset_param (settings->account, "password"); gtk_entry_set_text (GTK_ENTRY (settings->entry_password), ""); } @@ -186,6 +234,8 @@ account_widget_jabber_setup (EmpathyAccountWidgetJabber *settings) gchar *server = NULL; gchar *password = NULL; gboolean old_ssl = FALSE; + gboolean ignore_ssl_errors = FALSE; + gboolean encryption = FALSE; mc_account_get_param_int (settings->account, "port", &port); mc_account_get_param_int (settings->account, "priority", &priority); @@ -194,6 +244,8 @@ account_widget_jabber_setup (EmpathyAccountWidgetJabber *settings) mc_account_get_param_string (settings->account, "server", &server); mc_account_get_param_string (settings->account, "password", &password); mc_account_get_param_boolean (settings->account, "old-ssl", &old_ssl); + mc_account_get_param_boolean (settings->account, "ignore-ssl-errors", &ignore_ssl_errors); + mc_account_get_param_boolean (settings->account, "require-encryption", &encryption); if (!id) { McProfile *profile; @@ -207,13 +259,15 @@ account_widget_jabber_setup (EmpathyAccountWidgetJabber *settings) g_object_unref (profile); } - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (settings->checkbutton_ssl), old_ssl); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (settings->spinbutton_port), port); + gtk_spin_button_set_value (GTK_SPIN_BUTTON (settings->spinbutton_priority), priority); gtk_entry_set_text (GTK_ENTRY (settings->entry_id), id ? id : ""); - gtk_entry_set_text (GTK_ENTRY (settings->entry_password), password ? password : ""); gtk_entry_set_text (GTK_ENTRY (settings->entry_resource), resource ? resource : ""); gtk_entry_set_text (GTK_ENTRY (settings->entry_server), server ? server : ""); - gtk_spin_button_set_value (GTK_SPIN_BUTTON (settings->spinbutton_port), port); - gtk_spin_button_set_value (GTK_SPIN_BUTTON (settings->spinbutton_priority), priority); + gtk_entry_set_text (GTK_ENTRY (settings->entry_password), password ? password : ""); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (settings->checkbutton_ssl), old_ssl); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (settings->checkbutton_ignore_ssl_errors), ignore_ssl_errors); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (settings->checkbutton_encryption), encryption); gtk_widget_set_sensitive (settings->button_forget, !G_STR_EMPTY (password)); @@ -254,6 +308,8 @@ empathy_account_widget_jabber_new (McAccount *account) "spinbutton_port", &settings->spinbutton_port, "spinbutton_priority", &settings->spinbutton_priority, "checkbutton_ssl", &settings->checkbutton_ssl, + "checkbutton_ignore_ssl_errors", &settings->checkbutton_ignore_ssl_errors, + "checkbutton_encryption", &settings->checkbutton_encryption, NULL); account_widget_jabber_setup (settings); @@ -270,6 +326,8 @@ empathy_account_widget_jabber_new (McAccount *account) "entry_resource", "focus-out-event", account_widget_jabber_entry_focus_cb, "entry_server", "focus-out-event", account_widget_jabber_entry_focus_cb, "checkbutton_ssl", "toggled", account_widget_jabber_checkbutton_toggled_cb, + "checkbutton_ignore_ssl_errors", "toggled", account_widget_jabber_checkbutton_toggled_cb, + "checkbutton_encryption", "toggled", account_widget_jabber_checkbutton_toggled_cb, NULL); g_object_unref (glade); diff --git a/libempathy-gtk/empathy-account-widget-jabber.glade b/libempathy-gtk/empathy-account-widget-jabber.glade index 3536dc1d..e91b1117 100644 --- a/libempathy-gtk/empathy-account-widget-jabber.glade +++ b/libempathy-gtk/empathy-account-widget-jabber.glade @@ -209,8 +209,8 @@ 0 1 - 0 - 1 + 2 + 3 fill @@ -231,39 +231,17 @@ 1 3 - 0 - 1 - - - - - - - True - True - Use encryption (SS_L) - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - 3 - 4 - 5 - fill + 2 + 3 - + True - _Port: - True + Priority: + False False GTK_JUSTIFY_LEFT False @@ -272,7 +250,6 @@ 0.5 0 0 - spinbutton_port PANGO_ELLIPSIZE_NONE -1 False @@ -289,16 +266,16 @@ - + True True 1 0 - True + False GTK_UPDATE_ALWAYS False False - 5222 0 65556 1 10 10 + 0 -128 127 1 10 10 1 @@ -310,100 +287,231 @@ - + True - _Server: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - entry_server - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + 0 + 0.5 + GTK_SHADOW_NONE + + + + True + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 12 + 0 + + + + True + 3 + 2 + False + 6 + 6 + + + + True + _Server: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + entry_server + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + _Port: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + spinbutton_port + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + True + True + True + 0 + + True + * + False + + + 1 + 2 + 0 + 1 + + + + + + + True + True + 1 + 0 + True + GTK_UPDATE_ALWAYS + False + False + 5222 0 65556 1 10 10 + + + 1 + 2 + 1 + 2 + + + + + + + True + True + Use old SSL + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + 2 + 2 + 3 + fill + + + + + + + + + + + True + <b>Override server settings</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + 0 - 1 - 2 - 3 + 3 + 4 + 5 fill - - + True True - True - True - 0 - - True - * - False - - - 1 - 3 - 2 - 3 - - - - - - - True - Priority: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + Encryption required (TLS/SSL) + True + GTK_RELIEF_NORMAL + True + False + False + True 0 - 1 - 1 - 2 + 3 + 0 + 1 fill - + True True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 0 -128 127 1 10 10 + Ignore SSL certificate errors + True + GTK_RELIEF_NORMAL + True + False + False + True - 1 + 0 3 1 2 + fill -- 2.39.2