2007-08-31 [colin] 2.10.0cvs187
authorColin Leroy <colin@colino.net>
Fri, 31 Aug 2007 17:03:45 +0000 (17:03 +0000)
committerColin Leroy <colin@colino.net>
Fri, 31 Aug 2007 17:03:45 +0000 (17:03 +0000)
* src/etpan/imap-thread.c
Fix unwanted creation of
libetpan's stream dump file
* src/compose.c
Fix coloring of pastes as quotation
* src/summaryview.c
Maemo: Fix opening of mails from keypad
in Sent folders
* src/addressbook.c
* src/folderview.c
* src/image_viewer.c
* src/mimeview.c
* src/gtk/prefswindow.c
Maemo: Fix adjustments changes

ChangeLog
PATCHSETS
configure.ac
src/addressbook.c
src/compose.c
src/etpan/imap-thread.c
src/folderview.c
src/gtk/prefswindow.c
src/image_viewer.c
src/mimeview.c
src/summaryview.c

index 33092c7ba270e5d51e4e3401e5a4051a1754c1de..0249f98d6a5205e4658d7d353966b6bfb913ea74 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2007-08-31 [colin]     2.10.0cvs187
+
+       * src/etpan/imap-thread.c
+               Fix unwanted creation of 
+               libetpan's stream dump file
+       * src/compose.c
+               Fix coloring of pastes as quotation
+       * src/summaryview.c
+               Maemo: Fix opening of mails from keypad
+               in Sent folders
+       * src/addressbook.c
+       * src/folderview.c
+       * src/image_viewer.c
+       * src/mimeview.c
+       * src/gtk/prefswindow.c
+               Maemo: Fix adjustments changes 
+
 2007-08-30 [colin]     2.10.0cvs186
 
        * src/folderview.c
index 58b684c9d659eb8c3ec2b1fc427d666da2fd6262..7cb70f24f4d87025593c0f68160f63429a5d94ca 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
+( cvs diff -u -r 1.60.2.96 -r 1.60.2.97 src/addressbook.c;  cvs diff -u -r 1.382.2.405 -r 1.382.2.406 src/compose.c;  cvs diff -u -r 1.207.2.180 -r 1.207.2.181 src/folderview.c;  cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/image_viewer.c;  cvs diff -u -r 1.83.2.114 -r 1.83.2.115 src/mimeview.c;  cvs diff -u -r 1.395.2.323 -r 1.395.2.324 src/summaryview.c;  cvs diff -u -r 1.1.4.83 -r 1.1.4.84 src/etpan/imap-thread.c;  cvs diff -u -r 1.12.2.41 -r 1.12.2.42 src/gtk/prefswindow.c;  ) > 2.10.0cvs187.patchset
index a02bbafa22b8a2bc70919b0cfe30d0c370ed23cb..d605b1de9f361743dbdd558ae28d5134e4ac3705 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=186
+EXTRA_VERSION=187
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 22920dd9a2a1d26d1c0d0aafdd24f60b9d8eecf7..1c326f6c5da28f180584785905a86c27402c92ec 100644 (file)
@@ -5366,12 +5366,14 @@ static gboolean addressbook_drag_motion_cb(GtkWidget      *widget,
        if (gtk_clist_get_selection_info
                (GTK_CLIST(widget), x - 24, y - 24, &row, &column)) {
 
-               if (y > height - 24 && height + vpos < total_height)
+               if (y > height - 24 && height + vpos < total_height) {
                        gtk_adjustment_set_value(pos, (vpos+5 > height ? height : vpos+5));
-
-               if (y < 24 && y > 0)
+                       gtk_adjustment_changed(pos);
+               }
+               if (y < 24 && y > 0) {
                        gtk_adjustment_set_value(pos, (vpos-5 < 0 ? 0 : vpos-5));
-
+                       gtk_adjustment_changed(pos);
+               }
                node = gtk_ctree_node_nth(GTK_CTREE(widget), row);
 
                if (node != NULL) {
index 7e52447e13a42b9424a372fd4eb268a2da169368..3cb9886f421d2274b62d4be4fab5a8140c301163 100644 (file)
@@ -9688,6 +9688,7 @@ static void compose_show_first_last_header(Compose *compose, gboolean show_first
 
        vadj = gtk_viewport_get_vadjustment(GTK_VIEWPORT(compose->header_table->parent));
        gtk_adjustment_set_value(vadj, (show_first ? vadj->lower : vadj->upper));
+       gtk_adjustment_changed(vadj);
 }
 
 static void text_inserted(GtkTextBuffer *buffer, GtkTextIter *iter,
@@ -9705,6 +9706,8 @@ static void text_inserted(GtkTextBuffer *buffer, GtkTextIter *iter,
        if (paste_as_quotation) {
                gchar *new_text;
                const gchar *qmark;
+               guint pos = 0;
+               GtkTextIter start_iter;
 
                if (len < 0)
                        len = strlen(text);
@@ -9716,6 +9719,8 @@ static void text_inserted(GtkTextBuffer *buffer, GtkTextIter *iter,
                mark = gtk_text_buffer_create_mark(buffer, NULL, iter, FALSE);
                gtk_text_buffer_place_cursor(buffer, iter);
 
+               pos = gtk_text_iter_get_offset(iter);
+
                compose_quote_fmt(compose, NULL, "%Q", qmark, new_text, TRUE, FALSE,
                                                  _("Quote format error at line %d."));
                quote_fmt_reset_vartable();
@@ -9725,6 +9730,13 @@ static void text_inserted(GtkTextBuffer *buffer, GtkTextIter *iter,
                                  
                gtk_text_buffer_get_iter_at_mark(buffer, iter, mark);
                gtk_text_buffer_place_cursor(buffer, iter);
+               gtk_text_buffer_delete_mark(buffer, mark);
+
+               gtk_text_buffer_get_iter_at_offset(buffer, &start_iter, pos);
+               mark = gtk_text_buffer_create_mark(buffer, NULL, &start_iter, FALSE);
+               compose_beautify_paragraph(compose, &start_iter, FALSE);
+               gtk_text_buffer_get_iter_at_mark(buffer, &start_iter, mark);
+               gtk_text_buffer_delete_mark(buffer, mark);
        } else {
                if (strcmp(text, "\n") || compose->automatic_break
                || gtk_text_iter_starts_line(iter))
@@ -9736,12 +9748,12 @@ static void text_inserted(GtkTextBuffer *buffer, GtkTextIter *iter,
                }
        }
        
-       mark = gtk_text_buffer_create_mark(buffer, NULL, iter, FALSE);
-       
-       compose_beautify_paragraph(compose, iter, FALSE);
-
-       gtk_text_buffer_get_iter_at_mark(buffer, iter, mark);
-       gtk_text_buffer_delete_mark(buffer, mark);
+       if (!paste_as_quotation) {
+               mark = gtk_text_buffer_create_mark(buffer, NULL, iter, FALSE);
+               compose_beautify_paragraph(compose, iter, FALSE);
+               gtk_text_buffer_get_iter_at_mark(buffer, iter, mark);
+               gtk_text_buffer_delete_mark(buffer, mark);
+       }
 
        g_signal_handlers_unblock_by_func(G_OBJECT(buffer),
                                          G_CALLBACK(text_inserted),
index c65eaf21fc0462fbe7e55e6d994b13f6dd2902b5..e8c8af5fb2d9a371ea030de4191a4eb20e8a0714 100644 (file)
@@ -84,6 +84,11 @@ static gboolean thread_manager_event(GIOChannel * source,
        return TRUE;
 }
 
+static void imap_logger_noop(int direction, const char * str, size_t size) 
+{
+       /* inhibit logging */
+}
+
 static void imap_logger_cmd(int direction, const char * str, size_t size) 
 {
        gchar *buf;
@@ -1728,7 +1733,7 @@ static void fetch_uid_run(struct etpan_thread_op * op)
        CHECK_IMAP();
 
        fetch_result = NULL;
-       mailstream_logger = NULL;
+       mailstream_logger = imap_logger_noop;
        log_print(LOG_PROTOCOL, "IMAP4- [fetching UIDs...]\n");
 
        r = imap_get_messages_list(param->imap, param->first_index,
@@ -1973,7 +1978,7 @@ int imap_threaded_fetch_uid_flags(Folder * folder, uint32_t first_index,
        param.imap = imap;
        param.first_index = first_index;
        
-       mailstream_logger = NULL;
+       mailstream_logger = imap_logger_noop;
        log_print(LOG_PROTOCOL, "IMAP4- [fetching flags...]\n");
 
        threaded_run(folder, &param, &result, fetch_uid_flags_run);
index ec9a934a8b87fa69d25bac8df54116260b8d3ca0..bc000b1c7d458a43aec1722ce86c579c97e95653 100644 (file)
@@ -1130,6 +1130,7 @@ void folderview_rescan_tree(Folder *folder, gboolean rebuild)
                pos = gtk_scrolled_window_get_vadjustment(
                                        GTK_SCROLLED_WINDOW(folderview->scrolledwin));
                gtk_adjustment_set_value(pos, height);
+               gtk_adjustment_changed(pos);
        }
        label_window_destroy(window);
        inc_unlock();
@@ -1170,6 +1171,7 @@ void folderview_fast_rescan_tree(Folder *folder)
                pos = gtk_scrolled_window_get_vadjustment(
                                        GTK_SCROLLED_WINDOW(folderview->scrolledwin));
                gtk_adjustment_set_value(pos, height);
+               gtk_adjustment_changed(pos);
        }
        label_window_destroy(window);
        inc_unlock();
@@ -2710,6 +2712,7 @@ void folderview_reflect_prefs(void)
        pos = gtk_scrolled_window_get_vadjustment(
                                GTK_SCROLLED_WINDOW(folderview->scrolledwin));
        gtk_adjustment_set_value(pos, height);
+       gtk_adjustment_changed(pos);
        gtk_clist_thaw(GTK_CLIST(folderview->ctree));
 }
 
@@ -2855,11 +2858,14 @@ static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
                (GTK_CLIST(widget), x - 24, y - 24, &row, &column)) {
                GtkWidget *srcwidget;
 
-               if (y > height - 24 && height + vpos < total_height)
+               if (y > height - 24 && height + vpos < total_height) {
                        gtk_adjustment_set_value(pos, (vpos+5 > height ? height : vpos+5));
-
-               if (y < 48 && y > 0)
+                       gtk_adjustment_changed(pos);
+               }
+               if (y < 48 && y > 0) {
                        gtk_adjustment_set_value(pos, (vpos-5 < 0 ? 0 : vpos-5));
+                       gtk_adjustment_changed(pos);
+               }
 
                node = gtk_ctree_node_nth(GTK_CTREE(widget), row);
                item = gtk_ctree_node_get_row_data(GTK_CTREE(widget), node);
index fe3cdc286e0de9a8b1c3d55f33f436f30e5b0ebf..26bfc60e005682f4cb3c51e5a4c7bdae9746e9f6 100644 (file)
@@ -579,12 +579,15 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages,
        adj = gtk_scrolled_window_get_vadjustment(
                        GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow1));
        gtk_adjustment_set_value(adj, adj->lower);
+       gtk_adjustment_changed(adj);
        adj = gtk_scrolled_window_get_vadjustment(
                        GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow2));
        gtk_adjustment_set_value(adj, adj->lower);
+       gtk_adjustment_changed(adj);
        adj = gtk_scrolled_window_get_hadjustment(
                        GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow2));
        gtk_adjustment_set_value(adj, adj->lower);
+       gtk_adjustment_changed(adj);
 }
 
 void prefswindow_open(const gchar *title, GSList *prefs_pages, gpointer data,
@@ -714,9 +717,11 @@ static gboolean prefswindow_row_selected(GtkTreeSelection *selector,
        adj = gtk_scrolled_window_get_vadjustment(
                        GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow2));
        gtk_adjustment_set_value(adj, adj->lower);
+       gtk_adjustment_changed(adj);
        adj = gtk_scrolled_window_get_hadjustment(
                        GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow2));
        gtk_adjustment_set_value(adj, adj->lower);
+       gtk_adjustment_changed(adj);
 
 #ifdef MAEMO
        prefs_show_page(prefswindow);
index bc2eec55e778f5c13d1773b534b7f1a795bceef8..85e021d878537175cd065e21601b137b6db3ed7e 100644 (file)
@@ -185,12 +185,16 @@ static void image_viewer_clear_viewer(MimeViewer *_mimeviewer)
        if (imageviewer->scrolledwin) {
                hadj = gtk_scrolled_window_get_hadjustment
                        (GTK_SCROLLED_WINDOW(imageviewer->scrolledwin));
-               if (hadj)
+               if (hadj) {
                        gtk_adjustment_set_value(hadj, 0.0);
+                       gtk_adjustment_changed(hadj);
+               }
                vadj = gtk_scrolled_window_get_vadjustment
                        (GTK_SCROLLED_WINDOW(imageviewer->scrolledwin));
-               if (vadj)
+               if (vadj) {
                        gtk_adjustment_set_value(vadj, 0.0);
+                       gtk_adjustment_changed(vadj);
+               }
        }
        g_free(imageviewer->file);
        imageviewer->file = NULL;
index 7e00d71345ea7264f67297c208691fa079762562..537b5d7f4d8f775f7d9472c795118e0014aea332 100644 (file)
@@ -2253,6 +2253,7 @@ static void icon_list_clear (MimeView *mimeview)
        mimeview->icon_count = 0;
        adj  = gtk_layout_get_vadjustment(GTK_LAYOUT(mimeview->icon_scroll));
        gtk_adjustment_set_value(adj, adj->lower);
+       gtk_adjustment_changed(adj);
 }
 
 /*!
index 4957332148f0ae2688bfc6564c2cbc65a2247256..4338ada3588738a5681d9839a38f6520c0984e52 100644 (file)
@@ -5943,8 +5943,12 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                case GDK_KP_Enter:
                        handled = TRUE;
                        if (summaryview->displayed != summaryview->selected) {
+#ifndef MAEMO
                                summary_display_msg(summaryview,
                                                    summaryview->selected);
+#else
+                               summary_open_row(NULL, summaryview);
+#endif
                                break;
                        }
                        mimeview_scroll_one_line(messageview->mimeview, mod_pressed);