From a2dd862e0f2a262f61b4976148f6cc1e988ec66f Mon Sep 17 00:00:00 2001 From: Jonny Lamb Date: Fri, 10 Dec 2010 12:28:09 +0000 Subject: account-widget: add Remember Password widgets for all the other protocols ...and link these widgets up nicely. Signed-off-by: Jonny Lamb --- libempathy-gtk/empathy-account-widget-aim.ui | 34 ++++++++++- libempathy-gtk/empathy-account-widget-groupwise.ui | 40 +++++++++++-- libempathy-gtk/empathy-account-widget-icq.ui | 34 ++++++++++- libempathy-gtk/empathy-account-widget-jabber.ui | 70 ++++++++++++++++++---- libempathy-gtk/empathy-account-widget-msn.ui | 40 +++++++++++-- libempathy-gtk/empathy-account-widget-sip.ui | 40 +++++++++++-- libempathy-gtk/empathy-account-widget.c | 47 +++++++++++++++ 7 files changed, 281 insertions(+), 24 deletions(-) diff --git a/libempathy-gtk/empathy-account-widget-aim.ui b/libempathy-gtk/empathy-account-widget-aim.ui index b590eea99..fb2e5181d 100644 --- a/libempathy-gtk/empathy-account-widget-aim.ui +++ b/libempathy-gtk/empathy-account-widget-aim.ui @@ -15,7 +15,7 @@ True - 3 + 4 2 12 6 @@ -90,6 +90,25 @@ 2 + + + Remember Password + True + True + False + True + True + + + 1 + 2 + 3 + 4 + + + + + @@ -273,5 +292,18 @@ 3 + + + Remember Password + True + True + False + True + True + + + 4 + + diff --git a/libempathy-gtk/empathy-account-widget-groupwise.ui b/libempathy-gtk/empathy-account-widget-groupwise.ui index 1629a0175..1cf2ea790 100644 --- a/libempathy-gtk/empathy-account-widget-groupwise.ui +++ b/libempathy-gtk/empathy-account-widget-groupwise.ui @@ -14,7 +14,7 @@ True - 3 + 4 2 12 6 @@ -74,9 +74,6 @@ 2 - - - True @@ -90,6 +87,28 @@ 3 + + + Remember Password + True + True + False + True + True + + + 1 + 2 + 3 + 4 + + + + + + + + False @@ -270,5 +289,18 @@ 3 + + + Remember Password + True + True + False + True + True + + + 4 + + diff --git a/libempathy-gtk/empathy-account-widget-icq.ui b/libempathy-gtk/empathy-account-widget-icq.ui index 654174f8e..4d9597886 100644 --- a/libempathy-gtk/empathy-account-widget-icq.ui +++ b/libempathy-gtk/empathy-account-widget-icq.ui @@ -15,7 +15,7 @@ True - 3 + 4 2 12 6 @@ -90,6 +90,25 @@ 2 + + + Remember Password + True + True + False + True + True + + + 1 + 2 + 3 + 4 + + + + + @@ -301,5 +320,18 @@ 3 + + + Remember Password + True + True + False + True + True + + + 4 + + diff --git a/libempathy-gtk/empathy-account-widget-jabber.ui b/libempathy-gtk/empathy-account-widget-jabber.ui index 3136f51b4..ca476e536 100644 --- a/libempathy-gtk/empathy-account-widget-jabber.ui +++ b/libempathy-gtk/empathy-account-widget-jabber.ui @@ -21,7 +21,7 @@ True - 3 + 4 2 12 6 @@ -46,8 +46,6 @@ 1 2 - 0 - 1 @@ -60,10 +58,6 @@ GTK_FILL - 0 - 1 - 0 - 1 @@ -76,11 +70,9 @@ entry_password - GTK_FILL - 0 - 1 2 3 + GTK_FILL @@ -140,6 +132,25 @@ Use <a href="http://www.facebook.com/username/">this page</a> to cho 2 + + + Remember Password + True + True + False + True + True + + + 1 + 2 + 3 + 4 + + + + + @@ -508,6 +519,19 @@ Use <a href="http://www.facebook.com/username/">this page</a> to cho 5 + + + Remember Password + True + True + False + True + True + + + 6 + + True @@ -598,6 +622,19 @@ Use <a href="http://www.facebook.com/username/">this page</a> to cho 3 + + + Remember Password + True + True + False + True + True + + + 4 + + True @@ -690,5 +727,18 @@ Use <a href="http://www.facebook.com/username/">this page</a> to cho 3 + + + Remember Password + True + True + False + True + True + + + 4 + + diff --git a/libempathy-gtk/empathy-account-widget-msn.ui b/libempathy-gtk/empathy-account-widget-msn.ui index 133ce487d..6665133f4 100644 --- a/libempathy-gtk/empathy-account-widget-msn.ui +++ b/libempathy-gtk/empathy-account-widget-msn.ui @@ -14,7 +14,7 @@ True - 3 + 4 2 12 6 @@ -74,9 +74,6 @@ 2 - - - True @@ -90,6 +87,28 @@ 3 + + + Remember Password + True + True + False + True + True + + + 1 + 2 + 3 + 4 + + + + + + + + False @@ -270,5 +289,18 @@ 3 + + + Remember Password + True + True + False + True + True + + + 4 + + diff --git a/libempathy-gtk/empathy-account-widget-sip.ui b/libempathy-gtk/empathy-account-widget-sip.ui index b00eda944..98a8f2c17 100644 --- a/libempathy-gtk/empathy-account-widget-sip.ui +++ b/libempathy-gtk/empathy-account-widget-sip.ui @@ -13,7 +13,7 @@ True - 3 + 4 2 12 6 @@ -74,9 +74,6 @@ 2 - - - True @@ -89,6 +86,28 @@ 3 + + + Remember Password + True + True + False + True + True + + + 1 + 2 + 3 + 4 + + + + + + + + False @@ -583,6 +602,19 @@ 3 + + + Remember Password + True + True + False + True + True + + + 4 + + 65535 diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c index cf60a498a..d2a1c56f4 100644 --- a/libempathy-gtk/empathy-account-widget.c +++ b/libempathy-gtk/empathy-account-widget.c @@ -1228,6 +1228,17 @@ account_widget_build_sip (EmpathyAccountWidget *self, EmpathyAccountWidgetPriv *priv = GET_PRIV (self); empathy_account_widget_sip_build (self, filename, &priv->table_common_settings); + + if (priv->simple) + { + priv->remember_password_widget = GTK_WIDGET (gtk_builder_get_object ( + self->ui_details->gui, "remember_password_simple")); + } + else + { + priv->remember_password_widget = GTK_WIDGET (gtk_builder_get_object ( + self->ui_details->gui, "remember_password")); + } } static void @@ -1251,6 +1262,9 @@ account_widget_build_msn (EmpathyAccountWidget *self, NULL); self->ui_details->default_focus = g_strdup ("entry_id_simple"); + + priv->remember_password_widget = GTK_WIDGET (gtk_builder_get_object ( + self->ui_details->gui, "remember_password_simple")); } else { @@ -1267,6 +1281,9 @@ account_widget_build_msn (EmpathyAccountWidget *self, NULL); self->ui_details->default_focus = g_strdup ("entry_id"); + + priv->remember_password_widget = GTK_WIDGET (gtk_builder_get_object ( + self->ui_details->gui, "remember_password")); } } @@ -1409,6 +1426,9 @@ account_widget_build_jabber (EmpathyAccountWidget *self, NULL); self->ui_details->default_focus = g_strdup ("entry_id_simple"); + + priv->remember_password_widget = GTK_WIDGET (gtk_builder_get_object ( + self->ui_details->gui, "remember_password_simple")); } else if (priv->simple && service == GTALK_SERVICE) { @@ -1423,6 +1443,9 @@ account_widget_build_jabber (EmpathyAccountWidget *self, NULL); self->ui_details->default_focus = g_strdup ("entry_id_g_simple"); + + priv->remember_password_widget = GTK_WIDGET (gtk_builder_get_object ( + self->ui_details->gui, "remember_password_g_simple")); } else if (priv->simple && service == FACEBOOK_SERVICE) { @@ -1439,6 +1462,9 @@ account_widget_build_jabber (EmpathyAccountWidget *self, setup_id_widget_with_suffix (self, entry_id, "@chat.facebook.com"); self->ui_details->default_focus = g_strdup ("entry_id_fb_simple"); + + priv->remember_password_widget = GTK_WIDGET (gtk_builder_get_object ( + self->ui_details->gui, "remember_password_fb_simple")); } else { @@ -1484,6 +1510,9 @@ account_widget_build_jabber (EmpathyAccountWidget *self, self->ui_details->default_focus = g_strdup ("entry_id"); priv->spinbutton_port = spinbutton_port; + priv->remember_password_widget = GTK_WIDGET (gtk_builder_get_object ( + self->ui_details->gui, "remember_password")); + g_signal_connect (checkbutton_ssl, "toggled", G_CALLBACK (account_widget_jabber_ssl_toggled_cb), self); @@ -1530,6 +1559,9 @@ account_widget_build_icq (EmpathyAccountWidget *self, NULL); self->ui_details->default_focus = g_strdup ("entry_uin_simple"); + + priv->remember_password_widget = GTK_WIDGET (gtk_builder_get_object ( + self->ui_details->gui, "remember_password_simple")); } else { @@ -1548,6 +1580,9 @@ account_widget_build_icq (EmpathyAccountWidget *self, NULL); self->ui_details->default_focus = g_strdup ("entry_uin"); + + priv->remember_password_widget = GTK_WIDGET (gtk_builder_get_object ( + self->ui_details->gui, "remember_password")); } } @@ -1570,6 +1605,9 @@ account_widget_build_aim (EmpathyAccountWidget *self, NULL); self->ui_details->default_focus = g_strdup ("entry_screenname_simple"); + + priv->remember_password_widget = GTK_WIDGET (gtk_builder_get_object ( + self->ui_details->gui, "remember_password_simple")); } else { @@ -1587,6 +1625,9 @@ account_widget_build_aim (EmpathyAccountWidget *self, NULL); self->ui_details->default_focus = g_strdup ("entry_screenname"); + + priv->remember_password_widget = GTK_WIDGET (gtk_builder_get_object ( + self->ui_details->gui, "remember_password")); } } @@ -1657,6 +1698,9 @@ account_widget_build_groupwise (EmpathyAccountWidget *self, NULL); self->ui_details->default_focus = g_strdup ("entry_id_simple"); + + priv->remember_password_widget = GTK_WIDGET (gtk_builder_get_object ( + self->ui_details->gui, "remember_password_simple")); } else { @@ -1673,6 +1717,9 @@ account_widget_build_groupwise (EmpathyAccountWidget *self, NULL); self->ui_details->default_focus = g_strdup ("entry_id"); + + priv->remember_password_widget = GTK_WIDGET (gtk_builder_get_object ( + self->ui_details->gui, "remember_password")); } } -- cgit v1.2.3