complete the replacement of deprecated gtk_progress_*

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 5d7b0f6fb0c2c922ef3959fed46b30775620dda1..cf7e3e21b4344a0758dcaa9c7c32edf0cd7fa944 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2004-07-28 [paul]      0.9.12cvs37.7
+
+       * src/mainwindow.c
+               complete the replacement of deprecated gtk_progress_*
+
 2004-07-28 [paul]      0.9.12cvs37.6
 
        * src/action.c

diff --git a/PATCHSETS b/PATCHSETS
index 83ff670a783d9c9330143b6e79169f8e76d0b0f6..f2fbcea82a852970620d9b1aa64686b5b784800a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -89,3 +89,4 @@
 ( cvs diff -u -r 1.60.2.7 -r 1.60.2.8 src/addressbook.c; cvs diff -u -r 1.382.2.37 -r 1.382.2.38 src/compose.c; cvs diff -u -r 1.26.2.3 -r 1.26.2.4 src/foldersel.c; cvs diff -u -r 1.274.2.14 -r 1.274.2.15 src/mainwindow.c; cvs diff -u -r 1.94.2.25 -r 1.94.2.26 src/messageview.c; cvs diff -u -r 1.59.2.7 -r 1.59.2.8 src/prefs_filtering.c; cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/prefs_filtering_action.c; cvs diff -u -r 1.4.2.4 -r 1.4.2.5 src/prefs_fonts.c; cvs diff -u -r 1.10.2.5 -r 1.10.2.6 src/prefs_gtk.c; cvs diff -u -r 1.43.2.7 -r 1.43.2.8 src/prefs_matcher.c; cvs diff -u -r 1.9.2.5 -r 1.9.2.6 src/sourcewindow.c; cvs diff -u -r 1.3.2.3 -r 1.3.2.4 src/ssl_manager.c; cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/gtk/logwindow.c; cvs diff -u -r 1.12.2.3 -r 1.12.2.4 src/gtk/prefswindow.c; ) > 0.9.12cvs37.4.patchset
 ( cvs diff -u -r 1.2.2.10 -r 1.2.2.11 src/gtk/filesel.c; ) > 0.9.12cvs37.5.patchset
 ( cvs diff -u -r 1.12.2.8 -r 1.12.2.9 src/action.c; cvs diff -u -r 1.149.2.12 -r 1.149.2.13 src/inc.c; cvs diff -u -r 1.274.2.15 -r 1.274.2.16 src/mainwindow.c; cvs diff -u -r 1.17.2.4 -r 1.17.2.5 src/send_message.c; cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/gtk/progressdialog.c; cvs diff -u -r 1.1.4.1 -r 1.1.4.2 src/gtk/progressdialog.h; ) > 0.9.12cvs37.6.patchset
+( cvs diff -u -r 1.274.2.16 -r 1.274.2.17 src/mainwindow.c; ) > 0.9.12cvs37.7.patchset

diff --git a/configure.ac b/configure.ac
index 59cc92bafe9154b37f5b37957d1bfec93bb28ba0..8a16f83500c68281d82bee78b8ebd7b87a49a013 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=37
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.6
+EXTRA_GTK2_VERSION=.7
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 4aad56ca4c7da0080b2a7f455145ef65705d8ff1..3d100b552ae9a6fcffcf79bb7c9196b765b27029 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -3091,10 +3091,12 @@ gboolean mainwindow_progressindicator_hook(gpointer source, gpointer userdata)
        switch (data->cmd) {
        case PROGRESS_COMMAND_START:
        case PROGRESS_COMMAND_STOP:
-/*             gtk_progress_set_percentage(GTK_PROGRESS(mainwin->progressbar), 0.0);
-               break; */
+               gtk_progress_bar_set_fraction
+                       (GTK_PROGRESS_BAR(mainwin->progressbar), 0.0);
+               break;
        case PROGRESS_COMMAND_SET_PERCENTAGE:
-/*             gtk_progress_set_percentage(GTK_PROGRESS(mainwin->progressbar), data->value); */
+               gtk_progress_bar_set_fraction
+                       (GTK_PROGRESS_BAR(mainwin->progressbar), data->value);
                break;          
        }
        while (gtk_events_pending()) gtk_main_iteration ();