2004-08-21 [paul] 0.9.12cvs66.4

[claws.git] / src / mainwindow.c

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 12ae40a2d7fa0ba691ff43c4cb7f71ee6d9a08b2..bae439f14b38a966eba40bf2dbf7bcf425b218a4 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1543,15 +1543,13 @@ void main_window_get_position(MainWindow *mainwin)
 
 void main_window_progress_on(MainWindow *mainwin)
 {
-       gtk_progress_set_show_text(GTK_PROGRESS(mainwin->progressbar), TRUE);
-       gtk_progress_set_format_string(GTK_PROGRESS(mainwin->progressbar), "");
+       gtk_progress_bar_set_text(GTK_PROGRESS_BAR(mainwin->progressbar), "");
 }
 
 void main_window_progress_off(MainWindow *mainwin)
 {
-       gtk_progress_set_show_text(GTK_PROGRESS(mainwin->progressbar), FALSE);
-       gtk_progress_bar_update(GTK_PROGRESS_BAR(mainwin->progressbar), 0.0);
-       gtk_progress_set_format_string(GTK_PROGRESS(mainwin->progressbar), "");
+       gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(mainwin->progressbar), 0.0);
+       gtk_progress_bar_set_text(GTK_PROGRESS_BAR(mainwin->progressbar), "");
 }
 
 void main_window_progress_set(MainWindow *mainwin, gint cur, gint total)
@@ -1559,8 +1557,8 @@ void main_window_progress_set(MainWindow *mainwin, gint cur, gint total)
        gchar buf[32];
 
        g_snprintf(buf, sizeof(buf), "%d / %d", cur, total);
-       gtk_progress_set_format_string(GTK_PROGRESS(mainwin->progressbar), buf);
-       gtk_progress_bar_update(GTK_PROGRESS_BAR(mainwin->progressbar),
+       gtk_progress_bar_set_text(GTK_PROGRESS_BAR(mainwin->progressbar), buf);
+       gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(mainwin->progressbar),
                                (cur == 0 && total == 0) ? 0 :
                                (gfloat)cur / (gfloat)total);
 }
@@ -2634,7 +2632,7 @@ static void hide_read_messages (MainWindow *mainwin, guint action,
                                GtkWidget *widget)
 {
        if (!mainwin->summaryview->folder_item
-           || gtk_object_get_data(GTK_OBJECT(widget), "dont_toggle"))
+           || g_object_get_data(G_OBJECT(widget), "dont_toggle"))
                return;
        summary_toggle_show_read_messages(mainwin->summaryview);
 }
@@ -3093,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);
+               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 ();