2007-07-16 [colin] 2.10.0cvs32

	* src/toolbar.c
		Fix double-loading of mails on Maemo

diff --git a/ChangeLog b/ChangeLog
index 2ed93133031dffeaacdb58ca314eef3902e81548..8f576f75d4185c0d9f96e2476771d53cf70e1984 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-16 [colin]     2.10.0cvs32
+
+       * src/toolbar.c
+               Fix double-loading of mails on Maemo
+
 2007-07-16 [colin]     2.10.0cvs31
 
        * src/messageview.c

diff --git a/PATCHSETS b/PATCHSETS
index 0de3d37f2125f61a65761d88968fc8c019f17d35..ad0c4a17782dae50315220cf62f9a27816449ced 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2685,3 +2685,4 @@
 ( cvs diff -u -r 1.1.2.54 -r 1.1.2.55 src/wizard.c;  cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/gtk/icon_legend.c;  ) > 2.10.0cvs29.patchset
 ( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/edittags.c;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/edittags.h;  cvs diff -u -r 1.274.2.198 -r 1.274.2.199 src/mainwindow.c;  cvs diff -u -r 1.83.2.110 -r 1.83.2.111 src/mimeview.c;  cvs diff -u -r 1.20.2.21 -r 1.20.2.22 src/mimeview.h;  cvs diff -u -r 1.25.2.41 -r 1.25.2.42 src/stock_pixmap.c;  cvs diff -u -r 1.395.2.311 -r 1.395.2.312 src/summaryview.c;  cvs diff -u -r 1.5.2.10 -r 1.5.2.11 src/gtk/gtkvscrollbutton.c;  ) > 2.10.0cvs30.patchset
 ( cvs diff -u -r 1.94.2.138 -r 1.94.2.139 src/messageview.c;  ) > 2.10.0cvs31.patchset
+( cvs diff -u -r 1.43.2.75 -r 1.43.2.76 src/toolbar.c;  ) > 2.10.0cvs32.patchset

diff --git a/configure.ac b/configure.ac
index 58779513f203eb74cb50d0461b42d3076102464a..aa8156bf7a8be018a68787c39ba62a080782c8a0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=31
+EXTRA_VERSION=32
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/toolbar.c b/src/toolbar.c
index d5d62ed631ac6d68c5520782179a8e18d966aa28..15795d8edad3903788689befe30f423cec8c9c68 100644 (file)
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -1217,11 +1217,13 @@ static void toolbar_prev_unread_cb(GtkWidget *widget, gpointer data)
                
                /* Now we need to update the messageview window */
                if (msgview->mainwin->summaryview->selected) {
+#ifndef MAEMO
                        MsgInfo * msginfo = summary_get_selected_msg(msgview->mainwin->summaryview);
                       
                        if (msginfo)
                                messageview_show(msgview, msginfo, 
                                         msgview->all_headers);
+#endif
                } else {
                        gtk_widget_destroy(msgview->window);
                }
@@ -1262,11 +1264,13 @@ static void toolbar_next_unread_cb(GtkWidget *widget, gpointer data)
 
                /* Now we need to update the messageview window */
                if (msgview->mainwin->summaryview->selected) {
+#ifndef MAEMO
                        MsgInfo * msginfo = summary_get_selected_msg(msgview->mainwin->summaryview);
                        
                        if (msginfo)
                                messageview_show(msgview, msginfo, 
                                         msgview->all_headers);
+#endif
                } else {
                        gtk_widget_destroy(msgview->window);
                }