From a2643c207eb87e8a43940072dc95c12a05d1abf3 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Mon, 11 Dec 2006 22:49:38 +0000 Subject: [PATCH] 2006-12-11 [colin] 2.6.1cvs19 * src/wizard.c Document :port in server entry tooltips --- ChangeLog | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/wizard.c | 13 +++++++++++++ 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c6655c1a3..9d566f9c3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-12-11 [colin] 2.6.1cvs19 + + * src/wizard.c + Document :port in server entry tooltips + 2006-12-11 [colin] 2.6.1cvs18 * src/main.c diff --git a/PATCHSETS b/PATCHSETS index 34d59022c..91d93c790 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2126,3 +2126,4 @@ ( cvs diff -u -r 1.1.2.40 -r 1.1.2.41 src/wizard.c; cvs diff -u -r 1.105.2.72 -r 1.105.2.73 src/prefs_account.c; ) > 2.6.1cvs16.patchset ( cvs diff -u -r 1.115.2.114 -r 1.115.2.115 src/main.c; ) > 2.6.1cvs17.patchset ( cvs diff -u -r 1.115.2.115 -r 1.115.2.116 src/main.c; ) > 2.6.1cvs18.patchset +( cvs diff -u -r 1.1.2.41 -r 1.1.2.42 src/wizard.c; ) > 2.6.1cvs19.patchset diff --git a/configure.ac b/configure.ac index 7963f2935..2031ca5c3 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=6 MICRO_VERSION=1 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=18 +EXTRA_VERSION=19 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/wizard.c b/src/wizard.c index 840cfbb70..4bb99ba3f 100644 --- a/src/wizard.c +++ b/src/wizard.c @@ -911,6 +911,7 @@ static GtkWidget* smtp_page (WizardWindow * wizard) #else GtkWidget *table = gtk_table_new(4, 2, FALSE); #endif + GtkTooltips *tips = gtk_tooltips_new(); gchar *text; gint i = 0; @@ -921,6 +922,12 @@ static GtkWidget* smtp_page (WizardWindow * wizard) text = get_default_server(wizard, "smtp"); gtk_entry_set_text(GTK_ENTRY(wizard->smtp_server), text); g_free(text); + + gtk_tooltips_set_tip(GTK_TOOLTIPS(tips), wizard->smtp_server, + _("You can specify the port number by appending it at the end: " + "\"mail.example.com:25\""), + NULL); + GTK_TABLE_ADD_ROW_AT(table, _("SMTP server address:"), wizard->smtp_server, i); i++; wizard->smtp_auth = gtk_check_button_new_with_label( @@ -1063,6 +1070,7 @@ static GtkWidget* recv_page (WizardWindow * wizard) #endif GtkWidget *menu = gtk_menu_new(); GtkWidget *menuitem; + GtkTooltips *tips = gtk_tooltips_new(); gchar *text; gint i = 0; gint index = 0; @@ -1110,6 +1118,11 @@ static GtkWidget* recv_page (WizardWindow * wizard) gtk_entry_set_text(GTK_ENTRY(wizard->recv_server), text); g_free(text); + gtk_tooltips_set_tip(GTK_TOOLTIPS(tips), wizard->recv_server, + _("You can specify the port number by appending it at the end: " + "\"mail.example.com:110\""), + NULL); + wizard->recv_label = gtk_label_new(_("Server address:")); gtk_label_set_use_markup(GTK_LABEL(wizard->recv_label), TRUE); gtk_table_attach(GTK_TABLE(table), wizard->recv_label,