2006-09-01 [paul] 2.4.0cvs120

	* src/folderview.c
	* src/folderview.h
	* src/imap.c
	* src/mainwindow.c
	* src/summaryview.c
		obey the 'When entering folder...' option
		when using the /View/Go to/... menu items

diff --git a/ChangeLog b/ChangeLog
index 7d2d75b..0731883 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-09-01 [paul]      2.4.0cvs120
+
+       * src/folderview.c
+       * src/folderview.h
+       * src/imap.c
+       * src/mainwindow.c
+       * src/summaryview.c
+               obey the 'When entering folder...' option
+               when using the /View/Go to/... menu items
+
 2006-08-31 [colin]     2.4.0cvs119
 
        * src/folderview.c

diff --git a/PATCHSETS b/PATCHSETS
index 7704710..32f04fc 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1811,3 +1811,4 @@
 ( cvs diff -u -r 1.204.2.98 -r 1.204.2.99 src/prefs_common.c;  ) > 2.4.0cvs117.patchset
 ( cvs diff -u -r 1.1.4.26 -r 1.1.4.27 src/gtk/gtksctree.c;  ) > 2.4.0cvs118.patchset
 ( cvs diff -u -r 1.207.2.116 -r 1.207.2.117 src/folderview.c;  ) > 2.4.0cvs119.patchset
+( cvs diff -u -r 1.207.2.117 -r 1.207.2.118 src/folderview.c;  cvs diff -u -r 1.20.2.12 -r 1.20.2.13 src/folderview.h;  cvs diff -u -r 1.179.2.129 -r 1.179.2.130 src/imap.c;  cvs diff -u -r 1.274.2.141 -r 1.274.2.142 src/mainwindow.c;  cvs diff -u -r 1.395.2.238 -r 1.395.2.239 src/summaryview.c;  ) > 2.4.0cvs120.patchset

diff --git a/configure.ac b/configure.ac
index c688ed5..cf59c54 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=119
+EXTRA_VERSION=120
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/folderview.c b/src/folderview.c
index 374395e..4ab941e 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -874,7 +874,7 @@ static GtkCTreeNode *folderview_find_next_unread(GtkCTree *ctree,
        return NULL;
 }
 
-void folderview_select_next_unread(FolderView *folderview)
+void folderview_select_next_unread(FolderView *folderview, gboolean force_open)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        GtkCTreeNode *node = NULL;
@@ -882,7 +882,7 @@ void folderview_select_next_unread(FolderView *folderview)
        gboolean last_open = prefs_common.always_show_msg;
        
        prefs_common.select_on_entry = SELECTONENTRY_UNM;
-       prefs_common.always_show_msg = TRUE;
+       prefs_common.always_show_msg = force_open ? TRUE : last_open;
 
        if ((node = folderview_find_next_unread(ctree, folderview->opened))
            != NULL) {
@@ -1998,7 +1998,7 @@ static gboolean folderview_key_pressed(GtkWidget *widget, GdkEventKey *event,
                        if (folderview->opened == folderview->selected &&
                            (!folderview->summaryview->folder_item ||
                             folderview->summaryview->folder_item->total_msgs == 0))
-                               folderview_select_next_unread(folderview);
+                               folderview_select_next_unread(folderview, TRUE);
                        else
                                folderview_select_node(folderview,
                                                       folderview->selected);

diff --git a/src/folderview.h b/src/folderview.h
index b9d71f8..5b58cae 100644 (file)
--- a/src/folderview.h
+++ b/src/folderview.h
@@ -98,7 +98,8 @@ void folderview_set_all                       (void);
 void folderview_select                 (FolderView     *folderview,
                                         FolderItem     *item);
 void folderview_unselect               (FolderView     *folderview);
-void folderview_select_next_unread     (FolderView     *folderview);
+void folderview_select_next_unread     (FolderView     *folderview, 
+                                        gboolean        force_open);
 void folderview_select_next_new                (FolderView     *folderview);
 void folderview_select_next_marked     (FolderView     *folderview);
 

diff --git a/src/imap.c b/src/imap.c
index af4a05a..a535bca 100644 (file)
--- a/src/imap.c
+++ b/src/imap.c
@@ -3123,7 +3123,6 @@ gint imap_get_num_list(Folder *folder, FolderItem *_item, GSList **msgnum_list,
        GSList *uidlist = NULL;
        gchar *dir;
        gboolean selected_folder;
-       
        debug_print("get_num_list\n");
        
        g_return_val_if_fail(folder != NULL, -1);
@@ -3398,7 +3397,7 @@ gboolean imap_scan_required(Folder *folder, FolderItem *_item)
        IMAPSession *session;
        IMAPFolderItem *item = (IMAPFolderItem *)_item;
        gint ok, exists = 0, unseen = 0;
-       guint32 uid_next, uid_val;
+       guint32 uid_next = 0, uid_val = 0;
        gboolean selected_folder;
        
        g_return_val_if_fail(folder != NULL, FALSE);

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 09f95c4..8b9f458 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -3701,7 +3701,7 @@ static void goto_folder_cb(MainWindow *mainwin, guint action,
 static void goto_unread_folder_cb(MainWindow *mainwin, guint action,
                           GtkWidget *widget)
 {
-       folderview_select_next_unread(mainwin->folderview);
+       folderview_select_next_unread(mainwin->folderview, FALSE);
 }
 
 static void copy_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
@@ -3927,7 +3927,7 @@ gboolean mainwindow_key_pressed (GtkWidget *widget, GdkEventKey *event,
                            && mainwin->summaryview->folder_item->total_msgs == 0))) {
                        g_signal_stop_emission_by_name(G_OBJECT(widget), 
                                        "key_press_event");
-                       folderview_select_next_unread(mainwin->folderview);
+                       folderview_select_next_unread(mainwin->folderview, TRUE);
                }
                break;
        default:

diff --git a/src/summaryview.c b/src/summaryview.c
index 8b77228..9730162 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -1493,7 +1493,7 @@ void summary_select_next_unread(SummaryView *summaryview)
                        }
 
                        if (val == G_ALERTALTERNATE) {
-                               folderview_select_next_unread(summaryview->folderview);
+                               folderview_select_next_unread(summaryview->folderview, TRUE);
                                return;
                        } 
                        else