2004-11-23 [colin] 0.9.12cvs162.1

	* src/prefs_common.c
	* src/prefs_themes.c
	* src/procmsg.c
		Sync with HEAD

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 93c2b75fdd0ae3cac20ea78c00139d6c30e68eec..b8afb934f93b44ef7e51f03ba8e099dbee3e1bdd 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,10 @@
+2004-11-23 [colin]     0.9.12cvs162.1
+
+       * src/prefs_common.c
+       * src/prefs_themes.c
+       * src/procmsg.c
+               Sync with HEAD
+
 2004-11-23 [colin]     0.9.12cvs158.9
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index ac89bd3da997ce266c6c674866b6c3e867fa2866..131583da1c3b046083f973860b39075baa723f63 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -255,3 +255,4 @@
 ( cvs diff -u -r 1.382.2.71 -r 1.382.2.72 src/compose.c; ) > 0.9.12cvs158.7.patchset
 ( cvs diff -u -r 1.382.2.72 -r 1.382.2.73 src/compose.c; ) > 0.9.12cvs158.8.patchset
 ( cvs diff -u -r 1.382.2.73 -r 1.382.2.74 src/compose.c; cvs diff -u -r 1.16.2.9 -r 1.16.2.10 src/msgcache.c; ) > 0.9.12cvs158.9.patchset
+( cvs diff -u -r 1.204.2.24 -r 1.204.2.25 src/prefs_common.c; cvs diff -u -r 1.3.2.13 -r 1.3.2.14 src/prefs_themes.c; cvs diff -u -r 1.150.2.17 -r 1.150.2.18 src/procmsg.c; ) > 0.9.12cvs162.1.patchset

diff --git a/configure.ac b/configure.ac
index 152d4f4cbfec832ef110c61daee24abf89ed47e6..b66a36d8958fc146278589578e4d3431692dfce1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,9 +11,9 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=158
+EXTRA_VERSION=162
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.9
+EXTRA_GTK2_VERSION=.1
 
 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/prefs_common.c b/src/prefs_common.c
index 97f3003caf1f8fad953b15e1589f07d6178e81ff..d5364e359697d839064fd09de3d36994f60bb16f 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -2588,7 +2588,7 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
        gint n_menurc;
 
        static struct KeyBind default_menurc[] = {
-               {"<Main>/File/Empty trash",                     ""},
+               {"<Main>/File/Empty all Trash folders",         ""},
                {"<Main>/File/Save as...",                      "<control>S"},
                {"<Main>/File/Print...",                        ""},
                {"<Main>/File/Exit",                            "<control>Q"},
@@ -2598,8 +2598,7 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
                {"<Main>/Edit/Find in current message...",      "<control>F"},
                {"<Main>/Edit/Search folder...",                "<shift><control>F"},
 
-               {"<Main>/View/Expand Summary View",             "V"},
-               {"<Main>/View/Expand Message View",             "<shift>V"},
+               {"<Main>/View/Show or hide/Message View",       "V"},
                {"<Main>/View/Thread view",                     "<control>T"},
                {"<Main>/View/Go to/Prev message",              "P"},
                {"<Main>/View/Go to/Next message",              "N"},
@@ -2607,12 +2606,13 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
                {"<Main>/View/Go to/Next unread message",       "<shift>N"},
                {"<Main>/View/Go to/Other folder...",           "G"},
                {"<Main>/View/Open in new window",              "<control><alt>N"},
-               {"<Main>/View/View source",                     "<control>U"},
+               {"<Main>/View/Message source",                  "<control>U"},
                {"<Main>/View/Show all headers",                "<control>H"},
-               {"<Main>/View/Update",                          "<control><alt>U"},
+               {"<Main>/View/Update summary",                  "<control><alt>U"},
 
-               {"<Main>/Message/Receive/Get new mail",         "<control>I"},
-               {"<Main>/Message/Receive/Get from all accounts",        "<shift><control>I"},
+               {"<Main>/Message/Receive/Get from current account",
+                                                               "<control>I"},
+               {"<Main>/Message/Receive/Get from all accounts","<shift><control>I"},
                {"<Main>/Message/Compose an email message",     "<control>M"},
                {"<Main>/Message/Reply",                        "<control>R"},
                {"<Main>/Message/Reply to/all",                 "<shift><control>R"},
@@ -2632,7 +2632,7 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
                {"<Main>/Tools/Execute",                        "X"},
                {"<Main>/Tools/Log window",                     "<shift><control>L"},
 
-               {"<Compose>/File/Close",                                "<control>W"},
+               {"<Compose>/Message/Close",                             "<control>W"},
                {"<Compose>/Edit/Select all",                           "<control>A"},
                {"<Compose>/Edit/Advanced/Move a word backward",        ""},
                {"<Compose>/Edit/Advanced/Move a word forward",         ""},
@@ -2642,7 +2642,7 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
        };
 
        static struct KeyBind mew_wl_menurc[] = {
-               {"<Main>/File/Empty trash",                     "<shift>D"},
+               {"<Main>/File/Empty all Trash folders",                 "<shift>D"},
                {"<Main>/File/Save as...",                      "Y"},
                {"<Main>/File/Print...",                        "<shift>numbersign"},
                {"<Main>/File/Exit",                            "<shift>Q"},
@@ -2652,8 +2652,7 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
                {"<Main>/Edit/Find in current message...",      "<control>F"},
                {"<Main>/Edit/Search folder...",                "<control>S"},
 
-               {"<Main>/View/Expand Summary View",             ""},
-               {"<Main>/View/Expand Message View",             ""},
+               {"<Main>/View/Show or hide/Message View",       ""},
                {"<Main>/View/Thread view",                     "<shift>T"},
                {"<Main>/View/Go to/Prev message",              "P"},
                {"<Main>/View/Go to/Next message",              "N"},
@@ -2661,12 +2660,13 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
                {"<Main>/View/Go to/Next unread message",       "<shift>N"},
                {"<Main>/View/Go to/Other folder...",           "G"},
                {"<Main>/View/Open in new window",              "<control><alt>N"},
-               {"<Main>/View/View source",                     "<control>U"},
+               {"<Main>/View/Message source",                  "<control>U"},
                {"<Main>/View/Show all headers",                "<shift>H"},
-               {"<Main>/View/Update",                          "<shift>S"},
+               {"<Main>/View/Update summary",                  "<shift>S"},
 
-               {"<Main>/Message/Receive/Get new mail",         "<control>I"},
-               {"<Main>/Message/Receive/Get from all accounts",        "<shift><control>I"},
+               {"<Main>/Message/Receive/Get from current account",
+                                                               "<control>I"},
+               {"<Main>/Message/Receive/Get from all accounts","<shift><control>I"},
                {"<Main>/Message/Compose an email message",     "W"},
                {"<Main>/Message/Reply",                        "<control>R"},
                {"<Main>/Message/Reply to/all",                 "<shift>A"},
@@ -2686,7 +2686,7 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
                {"<Main>/Tools/Execute",                        "X"},
                {"<Main>/Tools/Log window",                     "<shift><control>L"},
 
-               {"<Compose>/File/Close",                                "<alt>W"},
+               {"<Compose>/Message/Close",                             "<alt>W"},
                {"<Compose>/Edit/Select all",                           ""},
                {"<Compose>/Edit/Advanced/Move a word backward,"        "<alt>B"},
                {"<Compose>/Edit/Advanced/Move a word forward",         "<alt>F"},
@@ -2696,7 +2696,7 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
        };
 
        static struct KeyBind mutt_menurc[] = {
-               {"<Main>/File/Empty trash",                     ""},
+               {"<Main>/File/Empty all Trash folders",         ""},
                {"<Main>/File/Save as...",                      "S"},
                {"<Main>/File/Print...",                        "P"},
                {"<Main>/File/Exit",                            "Q"},
@@ -2706,7 +2706,7 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
                {"<Main>/Edit/Find in current message...",      "<control>F"},
                {"<Main>/Edit/Search messages...",              "slash"},
 
-               {"<Main>/View/Toggle summary view",             "V"},
+               {"<Main>/View/Show or hide/Message view",       "V"},
                {"<Main>/View/Thread view",                     "<control>T"},
                {"<Main>/View/Go to/Prev message",              ""},
                {"<Main>/View/Go to/Next message",              ""},
@@ -2714,12 +2714,13 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
                {"<Main>/View/Go to/Next unread message",       ""},
                {"<Main>/View/Go to/Other folder...",           "C"},
                {"<Main>/View/Open in new window",              "<control><alt>N"},
-               {"<Main>/View/View source",                     "<control>U"},
+               {"<Main>/View/Message source",                  "<control>U"},
                {"<Main>/View/Show all headers",                "<control>H"},
-               {"<Main>/View/Update",                          "<control><alt>U"},
+               {"<Main>/View/Update summary",                          "<control><alt>U"},
 
-               {"<Main>/Message/Receive/Get new mail",                 "<control>I"},
-               {"<Main>/Message/Receive/Get from all accounts",        "<shift><control>I"},
+               {"<Main>/Message/Receive/Get from current account",
+                                                               "<control>I"},
+               {"<Main>/Message/Receive/Get from all accounts","<shift><control>I"},
                {"<Main>/Message/Compose an email message",             "M"},
                {"<Main>/Message/Reply",                        "R"},
                {"<Main>/Message/Reply to/all",                 "G"},
@@ -2739,7 +2740,7 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
                {"<Main>/Tools/Execute",                        "X"},
                {"<Main>/Tools/Log window",                     "<shift><control>L"},
 
-               {"<Compose>/File/Close",                                "<alt>W"},
+               {"<Compose>/Message/Close",                             "<alt>W"},
                {"<Compose>/Edit/Select all",                           ""},
                {"<Compose>/Edit/Advanced/Move a word backward",        "<alt>B"},
                {"<Compose>/Edit/Advanced/Move a word forward",         "<alt>F"},
@@ -2749,7 +2750,7 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
        };
 
        static struct KeyBind old_sylpheed_menurc[] = {
-               {"<Main>/File/Empty trash",                     ""},
+               {"<Main>/File/Empty all Trash folders",         ""},
                {"<Main>/File/Save as...",                      ""},
                {"<Main>/File/Print...",                        "<alt>P"},
                {"<Main>/File/Exit",                            "<alt>Q"},
@@ -2759,8 +2760,7 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
                {"<Main>/Edit/Find in current message...",      "<control>F"},
                {"<Main>/Edit/Search folder...",                "<control>S"},
 
-               {"<Main>/View/Expand Summary View",             ""},
-               {"<Main>/View/Expand Message View",             ""},
+               {"<Main>/View/Show or hide/Message View",       ""},
                {"<Main>/View/Thread view",                     "<control>T"},
                {"<Main>/View/Go to/Prev message",              "P"},
                {"<Main>/View/Go to/Next message",              "N"},
@@ -2768,12 +2768,13 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
                {"<Main>/View/Go to/Next unread message",       "<shift>N"},
                {"<Main>/View/Go to/Other folder...",           "<alt>G"},
                {"<Main>/View/Open in new window",              "<shift><control>N"},
-               {"<Main>/View/View source",                     "<control>U"},
+               {"<Main>/View/Message source",                  "<control>U"},
                {"<Main>/View/Show all headers",                "<control>H"},
-               {"<Main>/View/Update",                          "<alt>U"},
+               {"<Main>/View/Update summary",                  "<alt>U"},
 
-               {"<Main>/Message/Receive/Get new mail",                 "<alt>I"},
-               {"<Main>/Message/Receive/Get from all accounts",        "<shift><alt>I"},
+               {"<Main>/Message/Receive/Get from current account",
+                                                               "<alt>I"},
+               {"<Main>/Message/Receive/Get from all accounts","<shift><alt>I"},
                {"<Main>/Message/Compose an email message",     "<alt>N"},
                {"<Main>/Message/Reply",                        "<alt>R"},
                {"<Main>/Message/Reply to/all",                 "<shift><alt>R"},
@@ -2793,7 +2794,7 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
                {"<Main>/Tools/Execute",                        "<alt>X"},
                {"<Main>/Tools/Log window",                     "<alt>L"},
 
-               {"<Compose>/File/Close",                                "<alt>W"},
+               {"<Compose>/Message/Close",                             "<alt>W"},
                {"<Compose>/Edit/Select all",                           ""},
                {"<Compose>/Edit/Advanced/Move a word backward",        "<alt>B"},
                {"<Compose>/Edit/Advanced/Move a word forward",         "<alt>F"},

diff --git a/src/prefs_themes.c b/src/prefs_themes.c
index c4af8fa6a99b51283e2d693efdf31342aa735bdd..904e2bc15cc07201900a800e398c009748f9df2d 100644 (file)
--- a/src/prefs_themes.c
+++ b/src/prefs_themes.c
@@ -775,7 +775,6 @@ static void prefs_themes_create_widget(PrefsPage *page, GtkWindow *window, gpoin
        GdkColor uri_color[2] = {{0, 0, 0, 0xffff}, {0, 0xffff, 0, 0}};
        gboolean success[2];
 
-       /* BEGIN GLADE EDITED CODE */
        GtkWidget *vbox1;
        GtkWidget *frame1;
        GtkWidget *vbox2;
@@ -813,9 +812,7 @@ static void prefs_themes_create_widget(PrefsPage *page, GtkWindow *window, gpoin
        vbox1 = gtk_vbox_new (FALSE, 0);
        gtk_widget_show (vbox1);
 
-       frame1 = gtk_frame_new (_("Selector"));
-       gtk_widget_show (frame1);
-       gtk_box_pack_start (GTK_BOX (vbox1), frame1, TRUE, TRUE, 0);
+       PACK_FRAME (vbox1, frame1, _("Selector"));
 
        vbox2 = gtk_vbox_new (FALSE, 0);
        gtk_widget_show (vbox2);
@@ -872,9 +869,7 @@ static void prefs_themes_create_widget(PrefsPage *page, GtkWindow *window, gpoin
        gtk_misc_set_alignment (GTK_MISC (label_global_status), 0, 0.5);
        gtk_misc_set_padding (GTK_MISC (label_global_status), 6, 0);
 
-       frame_info = gtk_frame_new (_("Information"));
-       gtk_widget_show (frame_info);
-       gtk_box_pack_start (GTK_BOX (vbox1), frame_info, TRUE, TRUE, 0);
+       PACK_FRAME(vbox1, frame_info, _("Information"));
 
        table1 = gtk_table_new (4, 2, FALSE);
        gtk_widget_show (table1);
@@ -938,9 +933,7 @@ static void prefs_themes_create_widget(PrefsPage *page, GtkWindow *window, gpoin
                        (GtkAttachOptions) (0), 0, 0);
        gtk_misc_set_alignment (GTK_MISC (label_status), 0, 0.5);
 
-       frame_preview = gtk_frame_new (_("Preview"));
-       gtk_widget_show (frame_preview);
-       gtk_box_pack_start (GTK_BOX (vbox1), frame_preview, TRUE, TRUE, 0);
+       PACK_FRAME(vbox1, frame_preview, _("Preview"));
 
        hbox1 = gtk_hbox_new (FALSE, 0);
        gtk_widget_show (hbox1);
@@ -981,9 +974,7 @@ static void prefs_themes_create_widget(PrefsPage *page, GtkWindow *window, gpoin
        gtk_box_pack_start (GTK_BOX (hbox1), icon_7, TRUE, TRUE, 0);
        gtk_misc_set_padding (GTK_MISC (icon_7), 0, 5);
 
-       frame_buttons = gtk_frame_new (_("Actions"));
-       gtk_widget_show (frame_buttons);
-       gtk_box_pack_start (GTK_BOX (vbox1), frame_buttons, TRUE, TRUE, 0);
+       PACK_FRAME(vbox1, frame_buttons, _("Actions"));
 
        hbuttonbox1 = gtk_hbutton_box_new ();
        gtk_widget_show (hbuttonbox1);
@@ -1017,7 +1008,6 @@ static void prefs_themes_create_widget(PrefsPage *page, GtkWindow *window, gpoin
                         NULL);
 
        gtk_widget_grab_default (btn_use);
-       /* END GLADE EDITED CODE */
 
        prefs_themes->window = GTK_WIDGET(window);
        

diff --git a/src/procmsg.c b/src/procmsg.c
index dd7ad649c18f39c035559c9d9dcd9c3bbe6346f3..023ef34bf276aa8adf03acfbd52d9779da743fe8 100644 (file)
--- a/src/procmsg.c
+++ b/src/procmsg.c
@@ -602,8 +602,6 @@ void procmsg_get_filter_keyword(MsgInfo *msginfo, gchar **header, gchar **key,
 
 void procmsg_empty_trash(FolderItem *trash)
 {
-       FILE *fp;
-
        if (trash && trash->total_msgs > 0) {
                GSList *mlist = folder_item_get_msg_list(trash);
                GSList *cur;