2004-09-24 [colin] 0.9.12cvs103.2

	* src/wizard.c
		Fix gtk warnings and use domain part of the email address
		when domain detection fails (no dot in domain name)

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 0a0d8fc311176c2d944300baa428e0483ce49cc5..c4c9fa42e4d4239794c8d67f723a439ca4200744 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,9 @@
+2004-09-24 [colin]     0.9.12cvs103.2
+
+       * src/wizard.c
+               Fix gtk warnings and use domain part of the email address 
+               when domain detection fails (no dot in domain name)
+
 2004-09-23 [colin]     0.9.12cvs103.1
 
        * src/plugins/spamassassin/libspamc.c

diff --git a/PATCHSETS b/PATCHSETS
index 95fb0f4083fdff0f694d79f64975ee16077426ed..d27baa80da904d6d0eb6e72478d4fb2f4133e6c0 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -174,3 +174,4 @@
 ( cvs diff -u -r 1.7.2.7 -r 1.7.2.8 src/plugins/image_viewer/viewer.c; ) > 0.9.12cvs102.2.patchset
 ( cvs diff -u -r 1.12.2.12 -r 1.12.2.13 src/action.c; ) > 0.9.12cvs102.3.patchset
 ( cvs diff -u -r 1.4.2.1 -r 1.4.2.2 src/plugins/spamassassin/libspamc.c; cvs diff -u -r 1.4.2.1 -r 1.4.2.2 src/plugins/spamassassin/libspamc.h; cvs diff -u -r 1.3.2.1 -r 1.3.2.2 src/plugins/spamassassin/utils.c; cvs diff -u -r 1.3.2.1 -r 1.3.2.2 src/plugins/spamassassin/utils.h; ) > 0.9.12cvs103.1.patchset
+( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/wizard.c; ) > 0.9.12cvs103.2.patchset

diff --git a/configure.ac b/configure.ac
index 9e6af35b0d78cab5d4ce3aa4449e3562aeb53948..bef093a45773211dc7c786b009f6754d2f9adf31 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=103
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.1
+EXTRA_GTK2_VERSION=.2
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}

diff --git a/src/wizard.c b/src/wizard.c
index 1acd9686eccb84ab05ac1e2f34bb0166aba2d102..d3a2970fd9c74b17ae2befd65ab26846d7a55156 100644 (file)
--- a/src/wizard.c
+++ b/src/wizard.c
@@ -199,7 +199,8 @@ create_page_with_text (WizardWindow *wizard, const char * title,
        GtkWidget *label = gtk_label_new(text);                               \
        gtk_table_attach(GTK_TABLE(table), label,                             \
                         0,1,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0);            \
-       gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);                      \
+       if (GTK_IS_MISC(label))                                               \
+               gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5);              \
        gtk_table_attach(GTK_TABLE(table), entry,                             \
                         1,2,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0);            \
 }
@@ -221,6 +222,56 @@ static gchar *get_default_email_addr(void)
        return result;
 }
 
+static gchar *get_default_server(WizardWindow * wizard, const gchar *type)
+{
+       gchar *domain_name = g_strdup(get_domain_name());
+       gchar *result;
+       
+       if (strchr(domain_name, '.') != strrchr(domain_name, '.')
+       && strlen(strchr(domain_name, '.')) > 6) {
+               gchar *tmp = g_strdup(strchr(domain_name, '.')+1);
+               g_free(domain_name);
+               domain_name = tmp;
+       } else if (strchr(domain_name, '.') == NULL) {
+               /* only hostname found, use email suffix */
+               gchar *mail;
+               mail = gtk_editable_get_chars(GTK_EDITABLE(wizard->email), 0, -1);
+
+               if (strlen (mail) && strstr(mail, "@")) {
+                       g_free(domain_name);
+                       domain_name = g_strdup(strstr(mail, "@")+1);
+               }
+               g_free(mail);
+       }
+       result = g_strdup_printf("%s.%s",
+                               type, domain_name);
+       g_free(domain_name);
+       return result;
+}
+
+static void wizard_email_changed(GtkWidget *widget, gpointer data)
+{
+       WizardWindow *wizard = (WizardWindow *)data;
+       RecvProtocol protocol;
+       gchar *text;
+       protocol = GPOINTER_TO_INT
+               (g_object_get_data(G_OBJECT(wizard->recv_type), MENU_VAL_ID));
+       
+       text = get_default_server(wizard, "smtp");
+       gtk_entry_set_text(GTK_ENTRY(wizard->smtp_server), text);
+       g_free(text);
+
+       if (protocol == A_POP3) {
+               text = get_default_server(wizard, "pop");
+               gtk_entry_set_text(GTK_ENTRY(wizard->recv_server), text);
+               g_free(text);
+       } else {
+               text = get_default_server(wizard, "imap");
+               gtk_entry_set_text(GTK_ENTRY(wizard->recv_server), text);
+               g_free(text);
+       }
+}
+
 static GtkWidget* user_page (WizardWindow * wizard)
 {
        GtkWidget *table = gtk_table_new(3,2, FALSE);
@@ -246,6 +297,9 @@ static GtkWidget* user_page (WizardWindow * wizard)
        GTK_TABLE_ADD_ROW_AT(table, _("Your organization:"), 
                             wizard->organization, i); i++;
        
+       g_signal_connect(G_OBJECT(wizard->email), "changed",
+                        G_CALLBACK(wizard_email_changed),
+                        wizard);
        return table;
 }
 
@@ -265,22 +319,6 @@ static GtkWidget* mailbox_page (WizardWindow * wizard)
        return table;
 }
 
-static gchar *get_default_server(const gchar *type)
-{
-       gchar *domain_name = g_strdup(get_domain_name());
-       gchar *result;
-       if (strchr(domain_name, '.') != strrchr(domain_name, '.')
-       && strlen(strchr(domain_name, '.')) > 6) {
-               gchar *tmp = g_strdup(strchr(domain_name, '.')+1);
-               g_free(domain_name);
-               domain_name = tmp;
-       }
-       result = g_strdup_printf("%s.%s",
-                               type, domain_name);
-       g_free(domain_name);
-       return result;
-}
-
 static GtkWidget* smtp_page (WizardWindow * wizard)
 {
        GtkWidget *table = gtk_table_new(1,2, FALSE);
@@ -291,7 +329,7 @@ static GtkWidget* smtp_page (WizardWindow * wizard)
        gtk_table_set_col_spacings(GTK_TABLE(table), 8);
 
        wizard->smtp_server = gtk_entry_new();
-       text = get_default_server("smtp");
+       text = get_default_server(wizard, "smtp");
        gtk_entry_set_text(GTK_ENTRY(wizard->smtp_server), text);
        g_free(text);
        GTK_TABLE_ADD_ROW_AT(table, _("SMTP server address:"), 
@@ -308,11 +346,11 @@ static void wizard_protocol_changed(GtkMenuItem *menuitem, gpointer data)
                (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
        
        if (protocol == A_POP3) {
-               text = get_default_server("pop");
+               text = get_default_server(wizard, "pop");
                gtk_entry_set_text(GTK_ENTRY(wizard->recv_server), text);
                g_free(text);
        } else {
-               text = get_default_server("imap");
+               text = get_default_server(wizard, "imap");
                gtk_entry_set_text(GTK_ENTRY(wizard->recv_server), text);
                g_free(text);
        }
@@ -344,7 +382,7 @@ static GtkWidget* recv_page (WizardWindow * wizard)
                             wizard->recv_type, i); i++;
 
        wizard->recv_server = gtk_entry_new();
-       text = get_default_server("pop");
+       text = get_default_server(wizard, "pop");
        gtk_entry_set_text(GTK_ENTRY(wizard->recv_server), text);
        g_free(text);
        GTK_TABLE_ADD_ROW_AT(table, _("Server address:"), 
@@ -376,13 +414,11 @@ static GtkWidget* ssl_page (WizardWindow * wizard)
                                        _("Use SSL to connect to SMTP server"));
        gtk_table_attach(GTK_TABLE(table), wizard->smtp_use_ssl,      
                         0,1,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0); i++;
-       gtk_misc_set_alignment(GTK_MISC(wizard->smtp_use_ssl), 0, 0.5);
        
        wizard->recv_use_ssl = gtk_check_button_new_with_label(
                                        _("Use SSL to connect to receiving server"));
        gtk_table_attach(GTK_TABLE(table), wizard->recv_use_ssl,      
                         0,1,i,i+1, GTK_EXPAND|GTK_FILL, 0, 0, 0);
-       gtk_misc_set_alignment(GTK_MISC(wizard->recv_use_ssl), 0, 0.5);
        
        return table;
 }