2006-12-11 [colin] 2.6.1cvs19

	* src/wizard.c
		Document :port in server entry tooltips

diff --git a/ChangeLog b/ChangeLog
index c6655c1a3d0dda8c0abbeaef8a4a2644dc448178..9d566f9c34d67546c8fa69897670bc3b9ee45f61 100644 (file)
--- 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
 2006-12-11 [colin]     2.6.1cvs18
 
        * src/main.c

diff --git a/PATCHSETS b/PATCHSETS
index 34d59022cf5615ec0e09d19c4ab53e29bc54e083..91d93c790199135f47a152ebfb0cf06e73643efd 100644 (file)
--- 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.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 7963f2935b769a8beb6cb8c02634c9bff162bbf8..2031ca5c3a137ad6f4b0dbed0d62c98757f95d0e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=18
+EXTRA_VERSION=19

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/wizard.c b/src/wizard.c
index 840cfbb70ad443e0ffe932c747907cbb8a66facf..4bb99ba3f8c1589ec9d8662cbfa768839891043c 100644 (file)
--- 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
 #else
        GtkWidget *table = gtk_table_new(4, 2, FALSE);
 #endif

+       GtkTooltips *tips = gtk_tooltips_new();

        gchar *text;
        gint i = 0;
        
        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);
        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, _("<span weight=\"bold\">SMTP server address:</span>"), 
                             wizard->smtp_server, i); i++;
        wizard->smtp_auth = gtk_check_button_new_with_label(
        GTK_TABLE_ADD_ROW_AT(table, _("<span weight=\"bold\">SMTP server address:</span>"), 
                             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;
 #endif
        GtkWidget *menu = gtk_menu_new();
        GtkWidget *menuitem;

+       GtkTooltips *tips = gtk_tooltips_new();

        gchar *text;
        gint i = 0;
        gint index = 0;
        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_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(_("<span weight=\"bold\">Server address:</span>"));
        gtk_label_set_use_markup(GTK_LABEL(wizard->recv_label), TRUE);
        gtk_table_attach(GTK_TABLE(table), wizard->recv_label,                        
        wizard->recv_label = gtk_label_new(_("<span weight=\"bold\">Server address:</span>"));
        gtk_label_set_use_markup(GTK_LABEL(wizard->recv_label), TRUE);
        gtk_table_attach(GTK_TABLE(table), wizard->recv_label,