2007-08-30 [colin] 2.10.0cvs186

	* src/folderview.c
		Don't opened selected folder when clicking
		on white space
	* src/mainwindow.c
		Maemo: Make Esc close messageviews
	* src/messageview.c
		Maemo: Fix message scrolling to the end on
		opening
		Maemo: Fix reopening same message
	* src/gtk/prefswindow.c
		Maemo: try to fix scrollbar. Doesn't work,
		it seems as if gtk_adjustment_set_value was
		a noop.

diff --git a/ChangeLog b/ChangeLog
index 692d42daa10e644a0c7aaf0e28fc751bd70df0bb..33092c7ba270e5d51e4e3401e5a4051a1754c1de 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2007-08-30 [colin]     2.10.0cvs186
+
+       * src/folderview.c
+               Don't opened selected folder when clicking
+               on white space
+       * src/mainwindow.c
+               Maemo: Make Esc close messageviews
+       * src/messageview.c
+               Maemo: Fix message scrolling to the end on 
+               opening
+               Maemo: Fix reopening same message
+       * src/gtk/prefswindow.c
+               Maemo: try to fix scrollbar. Doesn't work,
+               it seems as if gtk_adjustment_set_value was
+               a noop.
+
 2007-08-30 [colin]     2.10.0cvs185
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 5ca56e15abcac54408f6fd38fff62e3b40e22573..58b684c9d659eb8c3ec2b1fc427d666da2fd6262 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2840,3 +2840,4 @@
 ( cvs diff -u -r 1.14.2.58 -r 1.14.2.59 src/plugins/trayicon/trayicon.c;  ) > 2.10.0cvs183.patchset
 ( cvs diff -u -r 1.12.2.45 -r 1.12.2.46 src/prefs_template.c;  ) > 2.10.0cvs184.patchset
 ( cvs diff -u -r 1.382.2.404 -r 1.382.2.405 src/compose.c;  cvs diff -u -r 1.207.2.178 -r 1.207.2.179 src/folderview.c;  cvs diff -u -r 1.115.2.164 -r 1.115.2.165 src/main.c;  cvs diff -u -r 1.43.2.61 -r 1.43.2.62 src/prefs_matcher.c;  cvs diff -u -r 1.12.2.46 -r 1.12.2.47 src/prefs_template.c;  cvs diff -u -r 1.8.2.22 -r 1.8.2.23 src/quote_fmt.c;  cvs diff -u -r 1.17.2.42 -r 1.17.2.43 src/send_message.c;  cvs diff -u -r 1.43.2.81 -r 1.43.2.82 src/toolbar.c;  cvs diff -u -r 1.9.2.53 -r 1.9.2.54 src/gtk/gtkaspell.c;  cvs diff -u -r 1.1.2.33 -r 1.1.2.34 src/plugins/bogofilter/bogofilter.c;  cvs diff -u -r 1.1.2.25 -r 1.1.2.26 src/plugins/bogofilter/bogofilter_gtk.c;  cvs diff -u -r 1.9.2.26 -r 1.9.2.27 src/plugins/clamav/clamav_plugin_gtk.c;  cvs diff -u -r 1.1.2.47 -r 1.1.2.48 src/plugins/pgpcore/sgpgme.c;  cvs diff -u -r 1.18.2.55 -r 1.18.2.56 src/plugins/spamassassin/spamassassin.c;  cvs diff -u -r 1.23.2.40 -r 1.23.2.41 src/plugins/spamassassin/spamassassin_gtk.c;  ) > 2.10.0cvs185.patchset
+( cvs diff -u -r 1.207.2.179 -r 1.207.2.180 src/folderview.c;  cvs diff -u -r 1.274.2.208 -r 1.274.2.209 src/mainwindow.c;  cvs diff -u -r 1.94.2.149 -r 1.94.2.150 src/messageview.c;  cvs diff -u -r 1.12.2.40 -r 1.12.2.41 src/gtk/prefswindow.c;  ) > 2.10.0cvs186.patchset

diff --git a/configure.ac b/configure.ac
index 02c0f4c6297cd3d23c65f231fc1ef0f6286d0349..a02bbafa22b8a2bc70919b0cfe30d0c370ed23cb 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=185
+EXTRA_VERSION=186
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/folderview.c b/src/folderview.c
index 4e5488935435cc43f2a640246766ad79adbddc49..ec9a934a8b87fa69d25bac8df54116260b8d3ca0 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -2016,8 +2016,13 @@ static gboolean folderview_button_pressed(GtkWidget *ctree, GdkEventButton *even
 static gboolean folderview_button_released(GtkWidget *ctree, GdkEventButton *event,
                                           FolderView *folderview)
 {
+       int row = -1, column = -1;
+
        if (!event) return FALSE;
 
+       if (!gtk_clist_get_selection_info(GTK_CLIST(ctree), event->x, event->y,
+                                         &row, &column))
+               return FALSE;
        if (event->button == 1 && folderview->open_folder == FALSE &&
            folderview->opened != NULL) {
                gtkut_ctree_set_focus_row(GTK_CTREE(ctree),

diff --git a/src/gtk/prefswindow.c b/src/gtk/prefswindow.c
index 7f968db7590ba4f2d4618bf2a535a552583392f1..fe3cdc286e0de9a8b1c3d55f33f436f30e5b0ebf 100644 (file)
--- a/src/gtk/prefswindow.c
+++ b/src/gtk/prefswindow.c
@@ -318,7 +318,6 @@ static void prefswindow_build_tree(GtkWidget *tree_view, GSList *prefs_pages,
        gint index; /* index in pages list */
        GtkTreeSelection *selection;
        GtkTreeIter iter;
-       GtkAdjustment *adj;
 
        for (cur = prefs_pages, index = 0; cur != NULL; cur = g_slist_next(cur), index++) {
                PrefsPage *page = (PrefsPage *)cur->data;
@@ -408,15 +407,6 @@ static void prefswindow_build_tree(GtkWidget *tree_view, GSList *prefs_pages,
                gtk_tree_selection_select_iter(selection, &iter);
        }
 #endif
-       adj = gtk_scrolled_window_get_vadjustment(
-                       GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow1));
-       gtk_adjustment_set_value(adj, 0);
-       adj = gtk_scrolled_window_get_vadjustment(
-                       GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow2));
-       gtk_adjustment_set_value(adj, 0);
-       adj = gtk_scrolled_window_get_hadjustment(
-                       GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow2));
-       gtk_adjustment_set_value(adj, 0);
 }
 
 void prefswindow_open_full(const gchar *title, GSList *prefs_pages,
@@ -428,6 +418,7 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages,
        gint x = gdk_screen_width();
        gint y = gdk_screen_height();
        static GdkGeometry geometry;
+       GtkAdjustment *adj;
 
        prefswindow = g_new0(PrefsWindow, 1);
 
@@ -585,6 +576,15 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages,
 #ifdef MAEMO
        maemo_window_full_screen_if_needed(GTK_WINDOW(prefswindow->window));
 #endif
+       adj = gtk_scrolled_window_get_vadjustment(
+                       GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow1));
+       gtk_adjustment_set_value(adj, adj->lower);
+       adj = gtk_scrolled_window_get_vadjustment(
+                       GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow2));
+       gtk_adjustment_set_value(adj, adj->lower);
+       adj = gtk_scrolled_window_get_hadjustment(
+                       GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow2));
+       gtk_adjustment_set_value(adj, adj->lower);
 }
 
 void prefswindow_open(const gchar *title, GSList *prefs_pages, gpointer data,
@@ -713,10 +713,10 @@ static gboolean prefswindow_row_selected(GtkTreeSelection *selector,
 
        adj = gtk_scrolled_window_get_vadjustment(
                        GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow2));
-       gtk_adjustment_set_value(adj, 0);
+       gtk_adjustment_set_value(adj, adj->lower);
        adj = gtk_scrolled_window_get_hadjustment(
                        GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow2));
-       gtk_adjustment_set_value(adj, 0);
+       gtk_adjustment_set_value(adj, adj->lower);
 
 #ifdef MAEMO
        prefs_show_page(prefswindow);

diff --git a/src/mainwindow.c b/src/mainwindow.c
index d5de5914b54eb667f9e7b45a8492b7b56a67e1ac..17e8a1b42a933803742d9f6fcf9913de311076ac 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -4340,6 +4340,14 @@ gboolean mainwindow_key_pressed (GtkWidget *widget, GdkEventKey *event,
                        gtk_window_fullscreen(GTK_WINDOW(widget));
                 }
                break;
+       case GDK_Escape:
+               if (mainwin->summaryview && 
+                   mainwin->summaryview->ext_messageview && 
+                   mainwin->summaryview->ext_messageview->window && 
+                   widget == mainwin->summaryview->ext_messageview->window) {
+                       messageview_destroy(mainwin->summaryview->ext_messageview);
+               }
+               break;
 #endif
        default:
                break;

diff --git a/src/messageview.c b/src/messageview.c
index 0f0aa29b4da99f81c62840935172f1bb8c2b2528..632bed8704013c1414a9c5b649169dda42d0d303 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -871,7 +871,9 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
        }
        mimeview_show_message(messageview->mimeview, mimeinfo, file);
        
+#ifndef MAEMO
        messageview_set_position(messageview, 0);
+#endif
 
        if (messageview->window && msginfo->subject) {
                subject = g_strdup(msginfo->subject);
@@ -953,12 +955,14 @@ void messageview_destroy(MessageView *messageview)
        debug_print("destroy messageview\n");
        messageview_list = g_list_remove(messageview_list, messageview);
 
-       if (messageview->mainwin->summaryview->messageview == messageview)
+       if (messageview->mainwin->summaryview->messageview == messageview) {
+               messageview->mainwin->summaryview->displayed = NULL;
                messageview->mainwin->summaryview->messageview = NULL;
-
-       if (messageview->mainwin->summaryview->ext_messageview == messageview)
+       }
+       if (messageview->mainwin->summaryview->ext_messageview == messageview) {
+               messageview->mainwin->summaryview->displayed = NULL;
                messageview->mainwin->summaryview->ext_messageview = NULL;
-
+       }
        if (!messageview->deferred_destroy) {
                hooks_unregister_hook(MSGINFO_UPDATE_HOOKLIST,
                              messageview->msginfo_update_callback_id);