Removed two obsolete statuswindow_* aliases.

diff --git a/src/folder.c b/src/folder.c
index 97393d2151432eaca90cb5d0fe6a5d6147430bfc..48a8d32ceeec45ad25243993589eb60c304a57b9 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -4566,13 +4566,13 @@ void folder_item_synchronise(FolderItem *item)
        if (!item)
                return;
        if (item->prefs->offlinesync && item->folder->klass->synchronise) {
-               statuswindow_print_all(_("Synchronising %s for offline use...\n"), item->path ? item->path : "(null)");
+               statusbar_print_all(_("Synchronising %s for offline use...\n"), item->path ? item->path : "(null)");
                item->folder->klass->synchronise(item, 
                        item->prefs->offlinesync_days);
                if (item->prefs->offlinesync_days > 0 &&
                    item->prefs->remove_old_bodies)
                        folder_item_clean_local_files(item, item->prefs->offlinesync_days);
-               statuswindow_pop_all();
+               statusbar_pop_all();
        }
 }
 

diff --git a/src/imap.c b/src/imap.c
index 0e1e777aa6744c5c9c19fc456606a4d253bce473..5c99688161096472995c0fdba983361199d6b182 100644 (file)
--- a/src/imap.c
+++ b/src/imap.c
@@ -1165,7 +1165,7 @@ static IMAPSession *imap_session_new(Folder * folder,
        buf = g_strdup_printf(_("Account '%s': Connecting to IMAP server: %s:%d..."),
                                folder->account->account_name, folder->account->recv_server,
                                port);
-       statuswindow_print_all("%s", buf);
+       statusbar_print_all("%s", buf);
        log_message(LOG_PROTOCOL, "%s\n", buf);
        g_free(buf);
 
@@ -1194,7 +1194,7 @@ static IMAPSession *imap_session_new(Folder * folder,
                }
        }
        
-       statuswindow_pop_all();
+       statusbar_pop_all();
        if (r == MAILIMAP_NO_ERROR_AUTHENTICATED) {
                authenticated = TRUE;
        }
@@ -1332,7 +1332,7 @@ try_again:
                memset(acc_pass, 0, strlen(acc_pass));
                g_free(acc_pass);
        }
-       statuswindow_pop_all();
+       statusbar_pop_all();
        session->authenticated = TRUE;
        return MAILIMAP_NO_ERROR;
 }

diff --git a/src/inc.c b/src/inc.c
index b8aa62724cdcf04f56837cf05e130a1a93d304da..5761f7750739d58feb0d6fb7fcc005be097e335a 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -824,7 +824,7 @@ static IncState inc_pop3_session_do(IncSession *session)
 
        buf = g_strdup_printf(_("Account '%s': Connecting to POP3 server: %s:%d..."),
                                account_name, server, port);
-       statuswindow_print_all("%s", buf);
+       statusbar_print_all("%s", buf);
        log_message(LOG_PROTOCOL, "%s\n", buf);
 
        progress_dialog_set_label(inc_dialog->dialog, buf);
@@ -848,7 +848,7 @@ static IncState inc_pop3_session_do(IncSession *session)
                            server, port);
                }
                session->inc_state = INC_CONNECT_ERROR;
-               statuswindow_pop_all();
+               statusbar_pop_all();
                return INC_CONNECT_ERROR;
        }
 
@@ -925,7 +925,7 @@ static void inc_progress_dialog_set_label(IncProgressDialog *inc_dialog,
        case POP3_GETAUTH_PASS:
        case POP3_GETAUTH_APOP:
                progress_dialog_set_label(dialog, _("Authenticating..."));
-               statuswindow_pop_all();
+               statusbar_pop_all();
                statusbar_print_all(_("Retrieving messages from %s (%s)..."),
                                    SESSION(session)->server,
                                    session->ac_prefs->account_name);

diff --git a/src/mbox.c b/src/mbox.c
index 3561053b159e6e274807491183e86fa7cef48c13..606663f574fcfc77a204c1ca49687912004b2155 100644 (file)
--- a/src/mbox.c
+++ b/src/mbox.c
@@ -565,7 +565,7 @@ gint export_list_to_mbox(GSList *mlist, const gchar *mbox)
        flockfile(mbox_fp);
 #endif
 
-       statuswindow_print_all(_("Exporting to mbox..."));
+       statusbar_print_all(_("Exporting to mbox..."));
        for (cur = mlist; cur != NULL; cur = cur->next) {
                int len;
                gchar buft[BUFFSIZE];
@@ -665,7 +665,7 @@ gint export_list_to_mbox(GSList *mlist, const gchar *mbox)
 
 out:
        statusbar_progress_all(0,0,0);
-       statuswindow_pop_all();
+       statusbar_pop_all();
 
 #ifdef HAVE_FGETS_UNLOCKED
        funlockfile(mbox_fp);

diff --git a/src/messageview.c b/src/messageview.c
index 01163bb7e9772dabd60ec06832405d39f822376b..0fadb623bdf808fec5d2a002c88f5bc3c565e34e 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -1382,13 +1382,13 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
        messageview->updating = TRUE;
 
        if (msginfo->size > 1024*1024)
-               statuswindow_print_all(_("Fetching message (%s)..."),
+               statusbar_print_all(_("Fetching message (%s)..."),
                        to_human_readable(msginfo->size));
        
        file = procmsg_get_message_file_path(msginfo);
 
        if (msginfo->size > 1024*1024)
-               statuswindow_pop_all();
+               statusbar_pop_all();
 
        if (!file) {
                g_warning("can't get message file path.");

diff --git a/src/send_message.c b/src/send_message.c
index 1560f9dc9d269768a2ab2bb9aa6b0fbf307e3247..45fd5cf1366c7bc3b85627d4f80f950c37962cc7 100644 (file)
--- a/src/send_message.c
+++ b/src/send_message.c
@@ -460,7 +460,7 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g
                ac_prefs->session = SMTP_SESSION(session);
 
 
-       statuswindow_pop_all();
+       statusbar_pop_all();
        statusbar_verbosity_set(FALSE);
        return ret;
 }
@@ -485,12 +485,12 @@ static gint send_recv_message(Session *session, const gchar *msg, gpointer data)
        case SMTP_HELO:
                g_snprintf(buf, sizeof(buf), _("Sending HELO..."));
                state_str = _("Authenticating");
-               statuswindow_print_all(_("Sending message..."));
+               statusbar_print_all(_("Sending message..."));
                break;
        case SMTP_EHLO:
                g_snprintf(buf, sizeof(buf), _("Sending EHLO..."));
                state_str = _("Authenticating");
-               statuswindow_print_all(_("Sending message..."));
+               statusbar_print_all(_("Sending message..."));
                break;
        case SMTP_AUTH:
                g_snprintf(buf, sizeof(buf), _("Authenticating..."));

diff --git a/src/statusbar.h b/src/statusbar.h
index 5b6626797cb14661d1cf1c16a861fdac4cce8092..b3b5d46725f46ae221e1f76e0e87671a6480a62d 100644 (file)
--- a/src/statusbar.h
+++ b/src/statusbar.h
@@ -34,9 +34,6 @@ void statusbar_print_all      (const gchar    *format, ...)
                                 G_GNUC_PRINTF(1, 2);
 void statusbar_pop_all         (void);
 
-#define statuswindow_print_all statusbar_print_all
-#define statuswindow_pop_all   statusbar_pop_all
-
 void statusbar_verbosity_set   (gboolean        verbose);
 
 void statusbar_progress_all    (gint done, gint total, gint step);