2005-01-07 [colin] 0.9.13cvs28.3

[claws.git] / src / inc.c

diff --git a/src/inc.c b/src/inc.c
index 2578da91cf5da05911865fe61c9793e4b3578a1d..20ebb7499a91b869bbb533c33a1a95c4b03c73dd 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -71,12 +71,9 @@ static GList *inc_dialog_list = NULL;
 
 static guint inc_lock_count = 0;
 
 
 static guint inc_lock_count = 0;
 

-static GdkPixmap *currentxpm;
-static GdkBitmap *currentxpmmask;
-static GdkPixmap *errorxpm;
-static GdkBitmap *errorxpmmask;
-static GdkPixmap *okxpm;
-static GdkBitmap *okxpmmask;
+static GdkPixbuf *currentpix;
+static GdkPixbuf *errorpix;
+static GdkPixbuf *okpix;

 
 #define MSGBUFSIZE     8192
 
 
 #define MSGBUFSIZE     8192
 


@@ -388,12 +385,12 @@ static IncProgressDialog *inc_progress_dialog_create(gboolean autocheck)
 
        progress_dialog_get_fraction(progress);
 
 
        progress_dialog_get_fraction(progress);
 

-       stock_pixmap_gdk(progress->clist, STOCK_PIXMAP_COMPLETE,
-                        &okxpm, &okxpmmask);
-       stock_pixmap_gdk(progress->clist, STOCK_PIXMAP_CONTINUE,
-                        &currentxpm, &currentxpmmask);
-       stock_pixmap_gdk(progress->clist, STOCK_PIXMAP_ERROR,
-                        &errorxpm, &errorxpmmask);
+       stock_pixbuf_gdk(progress->list_view, STOCK_PIXMAP_COMPLETE,
+                        &okpix);
+       stock_pixbuf_gdk(progress->list_view, STOCK_PIXMAP_CONTINUE,
+                        &currentpix);
+       stock_pixbuf_gdk(progress->list_view, STOCK_PIXMAP_ERROR,
+                        &errorpix);

 
        if (prefs_common.recv_dialog_mode == RECV_DIALOG_ALWAYS ||
            (prefs_common.recv_dialog_mode == RECV_DIALOG_MANUAL &&
 
        if (prefs_common.recv_dialog_mode == RECV_DIALOG_ALWAYS ||
            (prefs_common.recv_dialog_mode == RECV_DIALOG_MANUAL &&


@@ -420,14 +417,13 @@ static void inc_progress_dialog_set_list(IncProgressDialog *inc_dialog)
        for (list = inc_dialog->queue_list; list != NULL; list = list->next) {
                IncSession *session = list->data;
                Pop3Session *pop3_session = POP3_SESSION(session->session);
        for (list = inc_dialog->queue_list; list != NULL; list = list->next) {
                IncSession *session = list->data;
                Pop3Session *pop3_session = POP3_SESSION(session->session);

-               gchar *text[3];

 
                session->data = inc_dialog;
 
 
                session->data = inc_dialog;
 

-               text[0] = NULL;
-               text[1] = pop3_session->ac_prefs->account_name;
-               text[2] = _("Standby");
-               gtk_clist_append(GTK_CLIST(inc_dialog->dialog->clist), text);
+               progress_dialog_list_set(inc_dialog->dialog,
+                                        -1, NULL,
+                                        pop3_session->ac_prefs->account_name,
+                                        _("Standby"));

        }
 }
 
        }
 }
 


@@ -490,7 +486,6 @@ static void inc_session_destroy(IncSession *session)
 static gint inc_start(IncProgressDialog *inc_dialog)
 {
        IncSession *session;
 static gint inc_start(IncProgressDialog *inc_dialog)
 {
        IncSession *session;

-       GtkCList *clist = GTK_CLIST(inc_dialog->dialog->clist);

        GList *qlist;
        Pop3Session *pop3_session;
        IncState inc_state;
        GList *qlist;
        Pop3Session *pop3_session;
        IncState inc_state;


@@ -542,10 +537,13 @@ static gint inc_start(IncProgressDialog *inc_dialog)
                qlist = next;
        }
 
                qlist = next;
        }
 

-#define SET_PIXMAP_AND_TEXT(xpm, xpmmask, str)                            \
+#define SET_PIXMAP_AND_TEXT(pix, str)                                     \

 {                                                                         \
 {                                                                         \

-       gtk_clist_set_pixmap(clist, inc_dialog->cur_row, 0, xpm, xpmmask); \
-       gtk_clist_set_text(clist, inc_dialog->cur_row, 2, str);            \
+       progress_dialog_list_set(inc_dialog->dialog,                       \
+                                inc_dialog->cur_row,                      \
+                                pix,                                      \
+                                NULL,                                     \
+                                str);                                     \

 }
 
        for (; inc_dialog->queue_list != NULL; inc_dialog->cur_row++) {
 }
 
        for (; inc_dialog->queue_list != NULL; inc_dialog->cur_row++) {


@@ -553,7 +551,7 @@ static gint inc_start(IncProgressDialog *inc_dialog)
                pop3_session = POP3_SESSION(session->session);
 
                if (pop3_session->pass == NULL) {
                pop3_session = POP3_SESSION(session->session);
 
                if (pop3_session->pass == NULL) {

-                       SET_PIXMAP_AND_TEXT(okxpm, okxpmmask, _("Cancelled"));
+                       SET_PIXMAP_AND_TEXT(okpix, _("Cancelled"));

                        inc_session_destroy(session);
                        inc_dialog->queue_list =
                                g_list_remove(inc_dialog->queue_list, session);
                        inc_session_destroy(session);
                        inc_dialog->queue_list =
                                g_list_remove(inc_dialog->queue_list, session);


@@ -561,10 +559,10 @@ static gint inc_start(IncProgressDialog *inc_dialog)
                }
 
                inc_progress_dialog_clear(inc_dialog);
                }
 
                inc_progress_dialog_clear(inc_dialog);

-               gtk_clist_moveto(clist, inc_dialog->cur_row, -1, 1.0, 0.0);
+               progress_dialog_list_select_row(inc_dialog->dialog,
+                                               inc_dialog->cur_row);

 
 

-               SET_PIXMAP_AND_TEXT(currentxpm, currentxpmmask,
-                                   _("Retrieving"));
+               SET_PIXMAP_AND_TEXT(currentpix, _("Retrieving"));

 
                /* begin POP3 session */
                inc_state = inc_pop3_session_do(session);
 
                /* begin POP3 session */
                inc_state = inc_pop3_session_do(session);


@@ -578,33 +576,30 @@ static gint inc_start(IncProgressDialog *inc_dialog)
                                         to_human_readable(pop3_session->cur_total_recv_bytes));
                        else
                                msg = g_strdup_printf(_("Done (no new messages)"));
                                         to_human_readable(pop3_session->cur_total_recv_bytes));
                        else
                                msg = g_strdup_printf(_("Done (no new messages)"));

-                       SET_PIXMAP_AND_TEXT(okxpm, okxpmmask, msg);
+                       SET_PIXMAP_AND_TEXT(okpix, msg);

                        g_free(msg);
                        break;
                case INC_CONNECT_ERROR:
                        g_free(msg);
                        break;
                case INC_CONNECT_ERROR:

-                       SET_PIXMAP_AND_TEXT(errorxpm, errorxpmmask,
-                                           _("Connection failed"));
+                       SET_PIXMAP_AND_TEXT(errorpix, _("Connection failed"));

                        break;
                case INC_AUTH_FAILED:
                        break;
                case INC_AUTH_FAILED:

-                       SET_PIXMAP_AND_TEXT(errorxpm, errorxpmmask,
-                                           _("Auth failed"));
+                       SET_PIXMAP_AND_TEXT(errorpix, _("Auth failed"));

                        break;
                case INC_LOCKED:
                        break;
                case INC_LOCKED:

-                       SET_PIXMAP_AND_TEXT(errorxpm, errorxpmmask,
-                                           _("Locked"));
+                       SET_PIXMAP_AND_TEXT(errorpix, _("Locked"));

                        break;
                case INC_ERROR:
                case INC_NO_SPACE:
                case INC_IO_ERROR:
                case INC_SOCKET_ERROR:
                case INC_EOF:
                        break;
                case INC_ERROR:
                case INC_NO_SPACE:
                case INC_IO_ERROR:
                case INC_SOCKET_ERROR:
                case INC_EOF:

-                       SET_PIXMAP_AND_TEXT(errorxpm, errorxpmmask, _("Error"));
+                       SET_PIXMAP_AND_TEXT(errorpix, _("Error"));

                        break;
                case INC_TIMEOUT:
                        break;
                case INC_TIMEOUT:

-                       SET_PIXMAP_AND_TEXT(errorxpm, errorxpmmask, _("Timeout"));
+                       SET_PIXMAP_AND_TEXT(errorpix, _("Timeout"));

                        break;
                case INC_CANCEL:
                        break;
                case INC_CANCEL:

-                       SET_PIXMAP_AND_TEXT(okxpm, okxpmmask, _("Cancelled"));
+                       SET_PIXMAP_AND_TEXT(okpix, _("Cancelled"));

                        break;
                default:
                        break;
                        break;
                default:
                        break;


@@ -934,8 +929,9 @@ static void inc_progress_dialog_set_progress(IncProgressDialog *inc_dialog,
                           pop3_session->cur_total_num,
                           to_human_readable
                           (pop3_session->cur_total_recv_bytes));
                           pop3_session->cur_total_num,
                           to_human_readable
                           (pop3_session->cur_total_recv_bytes));

-               gtk_clist_set_text(GTK_CLIST(inc_dialog->dialog->clist),
-                                  inc_dialog->cur_row, 2, buf);
+               progress_dialog_list_set_status(inc_dialog->dialog,
+                                               inc_dialog->cur_row,
+                                               buf);

        }
 }
 
        }
 }