2005-04-21 [paul] 1.9.6cvs45

	* ChangeLog-gtk2.claws
	* src/setup.c
		correction to sync

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index fc936abc137981f3dec8c6ac1e16b85366be9fbf..864478152ff6f3e88b80b75a12b911d031579685 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,9 @@
+2005-04-21 [paul]      1.9.6cvs45
+
+       * ChangeLog-gtk2.claws
+       * src/setup.c
+               correction to sync
+

 2005-04-21 [paul]      1.9.6cvs44
 
        sync with main:
 2005-04-21 [paul]      1.9.6cvs44
 
        sync with main:


@@ -5,9 +11,12 @@
        * src/setup.c
        * src/statusbar.c
        * src/statusbar.h
        * src/setup.c
        * src/statusbar.c
        * src/statusbar.h

-       * src/textview.c

                use gtkut_widget_draw_now(). Improved performance
                of the update of statusbar
                use gtkut_widget_draw_now(). Improved performance
                of the update of statusbar

+       * src/textview.c
+               textview_smooth_scroll_do(): redraw it after scroll
+               is done (fixed incorrect display when a part of the
+               view is hidden).

        * src/gtk/gtkutils.c
        * src/gtk/gtkutils.h
                gtkut_widget_draw_now(): use gdk_window_process_updates()
        * src/gtk/gtkutils.c
        * src/gtk/gtkutils.h
                gtkut_widget_draw_now(): use gdk_window_process_updates()

diff --git a/PATCHSETS b/PATCHSETS
index c1ccde98615fdbac7b83feb9fdff7d0c2ebf7765..5db2cea3ed24bd8cb24d602fcec3c59a01ef1298 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -461,3 +461,4 @@
 ( cvs diff -u -r 1.12.2.21 -r 1.12.2.22 src/action.c; cvs diff -u -r 1.65.2.26 -r 1.65.2.27 src/codeconv.c; cvs diff -u -r 1.15.2.6 -r 1.15.2.7 src/codeconv.h; cvs diff -u -r 1.274.2.34 -r 1.274.2.35 src/mainwindow.c; cvs diff -u -r 1.94.2.49 -r 1.94.2.50 src/messageview.c; cvs diff -u -r 1.204.2.34 -r 1.204.2.35 src/prefs_common.c; cvs diff -u -r 1.23.2.4 -r 1.23.2.5 src/common/session.c; cvs diff -u -r 1.8.2.2 -r 1.8.2.3 src/common/session.h; ) > 1.9.6cvs42.patchset
 ( cvs diff -u -r 1.1.2.498 -r 1.1.2.499 ChangeLog-gtk2.claws; cvs diff -u -r 1.65.2.27 -r 1.65.2.28 src/codeconv.c; ) > 1.9.6cvs43.patchset
 ( cvs diff -u -r 1.5.2.4 -r 1.5.2.5 src/setup.c; cvs diff -u -r 1.5.2.3 -r 1.5.2.4 src/statusbar.c; cvs diff -u -r 1.3 -r 1.4 src/statusbar.h; cvs diff -u -r 1.96.2.52 -r 1.96.2.53 src/textview.c; cvs diff -u -r 1.5.2.11 -r 1.5.2.12 src/gtk/gtkutils.c; cvs diff -u -r 1.4.2.9 -r 1.4.2.10 src/gtk/gtkutils.h; ) > 1.9.6cvs44.patchset
 ( cvs diff -u -r 1.12.2.21 -r 1.12.2.22 src/action.c; cvs diff -u -r 1.65.2.26 -r 1.65.2.27 src/codeconv.c; cvs diff -u -r 1.15.2.6 -r 1.15.2.7 src/codeconv.h; cvs diff -u -r 1.274.2.34 -r 1.274.2.35 src/mainwindow.c; cvs diff -u -r 1.94.2.49 -r 1.94.2.50 src/messageview.c; cvs diff -u -r 1.204.2.34 -r 1.204.2.35 src/prefs_common.c; cvs diff -u -r 1.23.2.4 -r 1.23.2.5 src/common/session.c; cvs diff -u -r 1.8.2.2 -r 1.8.2.3 src/common/session.h; ) > 1.9.6cvs42.patchset
 ( cvs diff -u -r 1.1.2.498 -r 1.1.2.499 ChangeLog-gtk2.claws; cvs diff -u -r 1.65.2.27 -r 1.65.2.28 src/codeconv.c; ) > 1.9.6cvs43.patchset
 ( cvs diff -u -r 1.5.2.4 -r 1.5.2.5 src/setup.c; cvs diff -u -r 1.5.2.3 -r 1.5.2.4 src/statusbar.c; cvs diff -u -r 1.3 -r 1.4 src/statusbar.h; cvs diff -u -r 1.96.2.52 -r 1.96.2.53 src/textview.c; cvs diff -u -r 1.5.2.11 -r 1.5.2.12 src/gtk/gtkutils.c; cvs diff -u -r 1.4.2.9 -r 1.4.2.10 src/gtk/gtkutils.h; ) > 1.9.6cvs44.patchset

+( cvs diff -u -r 1.1.2.500 -r 1.1.2.501 ChangeLog-gtk2.claws; cvs diff -u -r 1.5.2.5 -r 1.5.2.6 src/setup.c; ) > 1.9.6cvs45.patchset

diff --git a/configure.ac b/configure.ac
index fb8689ee3c77a8b756b08d80bcba89480bde4388..54b82762f8432f6d189a9bd8dc44a8b097fab476 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=44
+EXTRA_VERSION=45

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/setup.c b/src/setup.c
index 3108847e2520571aa2f525b32e9eb95621e4e51e..6ded1e4705ae22135d819d7ee545baf8e0b88ac1 100644 (file)
--- a/src/setup.c
+++ b/src/setup.c
@@ -97,7 +97,7 @@ static void scan_tree_func(Folder *folder, FolderItem *item, gpointer data)
 
        gtk_statusbar_push(GTK_STATUSBAR(mainwin->statusbar),
                           mainwin->mainwin_cid, str);
 
        gtk_statusbar_push(GTK_STATUSBAR(mainwin->statusbar),
                           mainwin->mainwin_cid, str);

-       gtkut_widget_draw_now(mainwin->statusbar);
+       gtkut_widget_draw_now(mainwin->hbox_stat);

        gtk_statusbar_pop(GTK_STATUSBAR(mainwin->statusbar),
                          mainwin->mainwin_cid);
        g_free(str);
        gtk_statusbar_pop(GTK_STATUSBAR(mainwin->statusbar),
                          mainwin->mainwin_cid);
        g_free(str);