From bd067766c70820efa311ed1eb63dbbb886263673 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Tue, 6 Nov 2007 11:17:29 +0000 Subject: Allow to change jabber priority. Fixes bug #493992 (Laurent Bigonville). 2007-11-06 Xavier Claessens * libempathy-gtk/empathy-account-widget-jabber.glade: * libempathy-gtk/empathy-account-widget-jabber.c: Allow to change jabber priority. Fixes bug #493992 (Laurent Bigonville). svn path=/trunk/; revision=423 --- ChangeLog | 6 ++ libempathy-gtk/empathy-account-widget-jabber.c | 25 +++-- libempathy-gtk/empathy-account-widget-jabber.glade | 115 +++++++++++++++------ 3 files changed, 107 insertions(+), 39 deletions(-) diff --git a/ChangeLog b/ChangeLog index a04e251bf..de09c3750 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-11-06 Xavier Claessens + + * libempathy-gtk/empathy-account-widget-jabber.glade: + * libempathy-gtk/empathy-account-widget-jabber.c: Allow to change jabber + priority. Fixes bug #493992 (Laurent Bigonville). + 2007-11-04 Xavier Claessens * libempathy-gtk/empathy-main-window.c: Display error message when an diff --git a/libempathy-gtk/empathy-account-widget-jabber.c b/libempathy-gtk/empathy-account-widget-jabber.c index f17623fad..5e7793cfc 100644 --- a/libempathy-gtk/empathy-account-widget-jabber.c +++ b/libempathy-gtk/empathy-account-widget-jabber.c @@ -49,6 +49,7 @@ typedef struct { GtkWidget *entry_resource; GtkWidget *entry_server; GtkWidget *spinbutton_port; + GtkWidget *spinbutton_priority; GtkWidget *checkbutton_ssl; } EmpathyAccountWidgetJabber; @@ -147,12 +148,16 @@ static void account_widget_jabber_value_changed_cb (GtkWidget *spinbutton, EmpathyAccountWidgetJabber *settings) { - if (spinbutton == settings->spinbutton_port) { - gdouble value; + gdouble value; + + value = gtk_spin_button_get_value (GTK_SPIN_BUTTON (spinbutton)); - 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); } + else if (spinbutton == settings->spinbutton_priority) { + mc_account_set_param_int (settings->account, "priority", (gint) value); + } } static void @@ -175,6 +180,7 @@ static void account_widget_jabber_setup (EmpathyAccountWidgetJabber *settings) { gint port = 0; + gint priority = 0; gchar *id = NULL; gchar *resource = NULL; gchar *server = NULL; @@ -182,6 +188,7 @@ account_widget_jabber_setup (EmpathyAccountWidgetJabber *settings) gboolean old_ssl = FALSE; mc_account_get_param_int (settings->account, "port", &port); + mc_account_get_param_int (settings->account, "priority", &priority); mc_account_get_param_string (settings->account, "account", &id); mc_account_get_param_string (settings->account, "resource", &resource); mc_account_get_param_string (settings->account, "server", &server); @@ -206,6 +213,7 @@ account_widget_jabber_setup (EmpathyAccountWidgetJabber *settings) 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_widget_set_sensitive (settings->button_forget, !G_STR_EMPTY (password)); @@ -222,7 +230,8 @@ empathy_account_widget_jabber_new (McAccount *account) GladeXML *glade; GtkSizeGroup *size_group; GtkWidget *label_id, *label_password; - GtkWidget *label_server, *label_resource, *label_port; + GtkWidget *label_server, *label_resource; + GtkWidget *label_port, *label_priority; settings = g_new0 (EmpathyAccountWidgetJabber, 1); settings->account = g_object_ref (account); @@ -235,6 +244,7 @@ empathy_account_widget_jabber_new (McAccount *account) "label_id", &label_id, "label_password", &label_password, "label_resource", &label_resource, + "label_priority", &label_priority, "label_server", &label_server, "label_port", &label_port, "entry_id", &settings->entry_id, @@ -242,6 +252,7 @@ empathy_account_widget_jabber_new (McAccount *account) "entry_resource", &settings->entry_resource, "entry_server", &settings->entry_server, "spinbutton_port", &settings->spinbutton_port, + "spinbutton_priority", &settings->spinbutton_priority, "checkbutton_ssl", &settings->checkbutton_ssl, NULL); @@ -253,6 +264,7 @@ empathy_account_widget_jabber_new (McAccount *account) "button_forget", "clicked", account_widget_jabber_button_forget_clicked_cb, "entry_password", "changed", account_widget_jabber_entry_changed_cb, "spinbutton_port", "value-changed", account_widget_jabber_value_changed_cb, + "spinbutton_priority", "value-changed", account_widget_jabber_value_changed_cb, "entry_id", "focus-out-event", account_widget_jabber_entry_focus_cb, "entry_password", "focus-out-event", account_widget_jabber_entry_focus_cb, "entry_resource", "focus-out-event", account_widget_jabber_entry_focus_cb, @@ -270,11 +282,12 @@ empathy_account_widget_jabber_new (McAccount *account) gtk_size_group_add_widget (size_group, label_resource); gtk_size_group_add_widget (size_group, label_server); gtk_size_group_add_widget (size_group, label_port); + gtk_size_group_add_widget (size_group, label_priority); g_object_unref (size_group); - gtk_editable_select_region (GTK_EDITABLE (settings->entry_id), 0, -1); - gtk_widget_grab_focus (settings->entry_id); + gtk_editable_select_region (GTK_EDITABLE (settings->entry_id), 0, -1); + gtk_widget_grab_focus (settings->entry_id); gtk_widget_show (settings->vbox_settings); diff --git a/libempathy-gtk/empathy-account-widget-jabber.glade b/libempathy-gtk/empathy-account-widget-jabber.glade index 8a2af8cca..3d0639daa 100644 --- a/libempathy-gtk/empathy-account-widget-jabber.glade +++ b/libempathy-gtk/empathy-account-widget-jabber.glade @@ -181,7 +181,7 @@ True - 4 + 5 3 False 6 @@ -238,30 +238,31 @@ - + True True - True - True - 0 - - True - * - False + Use encryption (SS_L) + True + GTK_RELIEF_NORMAL + True + False + False + True - 1 + 0 3 - 1 - 2 + 4 + 5 + fill - + True - _Server: + _Port: True False GTK_JUSTIFY_LEFT @@ -271,7 +272,7 @@ 0.5 0 0 - entry_server + spinbutton_port PANGO_ELLIPSIZE_NONE -1 False @@ -280,8 +281,8 @@ 0 1 - 1 - 2 + 3 + 4 fill @@ -302,16 +303,16 @@ 1 3 - 2 - 3 + 3 + 4 - + True - _Port: + _Server: True False GTK_JUSTIFY_LEFT @@ -321,7 +322,7 @@ 0.5 0 0 - spinbutton_port + entry_server PANGO_ELLIPSIZE_NONE -1 False @@ -338,26 +339,74 @@ - + True True - Use encryption (SS_L) - True - GTK_RELIEF_NORMAL - True - False - False - True + True + True + 0 + + True + * + False - 0 + 1 3 - 3 - 4 + 2 + 3 + + + + + + + True + Priority: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 1 + 2 fill + + + + True + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 0 0 100 1 10 10 + + + 1 + 3 + 1 + 2 + + + -- cgit v1.2.3