fixed mess in account settings dialog

added label with folder path to folder property dialog

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 735d020d912c6da41b063b4dc12181fb1092f91a..93d232e347849897b340884dd61030c73184ba03 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,21 +1,28 @@
+2001-10-31 [christoph] 0.6.4claws18
+
+       * src/prefs_account.c
+               fixed mess in account settings dialog
+       * src/prefs_folder_item.c
+               added label with folder path to dialog
+

 2001-10-31 [match]     0.6.4claws17
 
 2001-10-31 [match]     0.6.4claws17
 

-               * src/vcard.c
-                       fix memory leak.
-               * src/addrbook.c
-                       fix generation of spurious address book file names.
-                       remove redundant functions.
-               * po/POTFILES.in
-                       added missing file names.
+       * src/vcard.c
+               fix memory leak.
+       * src/addrbook.c
+               fix generation of spurious address book file names.
+               remove redundant functions.
+       * po/POTFILES.in
+               added missing file names.

 
 2001-10-30 [paul]      0.6.4claws16
 
 
 2001-10-30 [paul]      0.6.4claws16
 

-               * sync with sylpheed 0.6.4cvs6
-                       see ChangeLog entries 2001-10-26 to 2001-10-30
+       * sync with sylpheed 0.6.4cvs6
+               see ChangeLog entries 2001-10-26 to 2001-10-30

 
 

-               * tools/filter_conv.pl
-                       read folderlist.xml to discover whether the top-level
-                       folder is called 'Mailbox' or 'Mail' 
+       * tools/filter_conv.pl
+               read folderlist.xml to discover whether the top-level
+               folder is called 'Mailbox' or 'Mail' 

 
 2001-10-29 [paul]      0.6.4claws15
 
 
 2001-10-29 [paul]      0.6.4claws15
 

diff --git a/configure.in b/configure.in
index 20985b3a993c195850fb6ced894b96794552ebf0..7b49f3bd1e0bf9eb61b8d17097abee82c4150aa2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws17
+EXTRA_VERSION=claws18

 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl

diff --git a/src/prefs_account.c b/src/prefs_account.c
index 45f13639870af0d715f6a2913a000ca70df1c488..9353b1337011d2ca93495987b5b518ee34a07c96 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -1088,6 +1088,11 @@ static void prefs_account_send_create(void)
 
        PACK_CHECK_BUTTON (vbox3, smtp_auth_chkbtn,
                _("SMTP Authentication (SMTP AUTH)"));
 
        PACK_CHECK_BUTTON (vbox3, smtp_auth_chkbtn,
                _("SMTP Authentication (SMTP AUTH)"));

+
+       smtp_auth_hbox = gtk_hbox_new (FALSE, 8);
+       gtk_widget_show (smtp_auth_hbox);
+       gtk_box_pack_start (GTK_BOX (vbox3), smtp_auth_hbox, FALSE, FALSE, 0);
+

        label = gtk_label_new ("");
        gtk_widget_show (label);
        gtk_box_pack_start (GTK_BOX (smtp_auth_hbox), label, FALSE, FALSE, 0);
        label = gtk_label_new ("");
        gtk_widget_show (label);
        gtk_box_pack_start (GTK_BOX (smtp_auth_hbox), label, FALSE, FALSE, 0);


@@ -1130,6 +1135,8 @@ static void prefs_account_send_create(void)
        send.customhdr_chkbtn = customhdr_chkbtn;
 
        send.smtp_auth_chkbtn    = smtp_auth_chkbtn;
        send.customhdr_chkbtn = customhdr_chkbtn;
 
        send.smtp_auth_chkbtn    = smtp_auth_chkbtn;

+       send.smtp_userid_entry   = smtp_userid_entry;
+       send.smtp_passwd_entry   = smtp_passwd_entry;

        send.pop_bfr_smtp_chkbtn = pop_bfr_smtp_chkbtn;
 }
 
        send.pop_bfr_smtp_chkbtn = pop_bfr_smtp_chkbtn;
 }
 

diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
index c10cced7f885a5038a45b2eb9b1475bf8879c38e..6190fb8c6a4966578a55d562515fe858a4ef2402 100644 (file)
--- a/src/prefs_folder_item.c
+++ b/src/prefs_folder_item.c
@@ -233,20 +233,20 @@ gint prefs_folder_item_get_sort_type(FolderItem * item)
 void prefs_folder_item_create(FolderItem *item) {
        struct PrefsFolderItemDialog *dialog;
        guint rowcount;
 void prefs_folder_item_create(FolderItem *item) {
        struct PrefsFolderItemDialog *dialog;
        guint rowcount;

+       gchar *folder_identifier, *infotext;

 
        GtkWidget *window;
        GtkWidget *table;
 
        GtkWidget *window;
        GtkWidget *table;

+       GtkWidget *infolabel;

        GtkWidget *ok_btn;
        GtkWidget *cancel_btn;
        GtkWidget *confirm_area;
        GtkWidget *ok_btn;
        GtkWidget *cancel_btn;
        GtkWidget *confirm_area;

-       GtkWidget *hbox;

        
        GtkWidget *checkbtn_request_return_receipt;
        GtkWidget *checkbtn_default_to;
        GtkWidget *entry_default_to;
        GtkWidget *checkbtn_folder_chmod;
        GtkWidget *entry_folder_chmod;
        
        GtkWidget *checkbtn_request_return_receipt;
        GtkWidget *checkbtn_default_to;
        GtkWidget *entry_default_to;
        GtkWidget *checkbtn_folder_chmod;
        GtkWidget *entry_folder_chmod;

-       GtkWidget *hbox2;

        GtkWidget *checkbtn_enable_default_account;
        GtkWidget *optmenu_default_account;
        GtkWidget *optmenu_default_account_menu;
        GtkWidget *checkbtn_enable_default_account;
        GtkWidget *optmenu_default_account;
        GtkWidget *optmenu_default_account_menu;


@@ -258,6 +258,7 @@ void prefs_folder_item_create(FolderItem *item) {
        GtkWidget *menu;
        GtkWidget *menuitem;
        gint account_index, index;
        GtkWidget *menu;
        GtkWidget *menuitem;
        gint account_index, index;

+

        dialog = g_new0(struct PrefsFolderItemDialog, 1);
        dialog->item = item;
 
        dialog = g_new0(struct PrefsFolderItemDialog, 1);
        dialog->item = item;
 


@@ -282,6 +283,14 @@ void prefs_folder_item_create(FolderItem *item) {
        gtk_container_add(GTK_CONTAINER (window), table);
        rowcount = 0;
 
        gtk_container_add(GTK_CONTAINER (window), table);
        rowcount = 0;
 

+       /* Label */
+       folder_identifier = folder_item_get_identifier(item);
+       infotext = g_strconcat(_("Folder Property for "), folder_identifier, NULL);
+       infolabel = gtk_label_new(infotext);
+       gtk_table_attach(GTK_TABLE(table), infolabel, 0, 2, rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
+       gtk_widget_show(infolabel);
+       rowcount++;
+

        /* Request Return Receipt */
        checkbtn_request_return_receipt = gtk_check_button_new_with_label(_("Request Return Receipt"));
        gtk_widget_show(checkbtn_request_return_receipt);
        /* Request Return Receipt */
        checkbtn_request_return_receipt = gtk_check_button_new_with_label(_("Request Return Receipt"));
        gtk_widget_show(checkbtn_request_return_receipt);


@@ -393,6 +402,8 @@ void prefs_folder_item_create(FolderItem *item) {
        dialog->checkbtn_enable_default_account = checkbtn_enable_default_account;
        dialog->optmenu_default_account = optmenu_default_account;
 
        dialog->checkbtn_enable_default_account = checkbtn_enable_default_account;
        dialog->optmenu_default_account = optmenu_default_account;
 

+       g_free(infotext);
+

        gtk_widget_show(window);
 }
 
        gtk_widget_show(window);
 }