From: Colin Leroy Date: Wed, 1 Mar 2006 18:09:06 +0000 (+0000) Subject: 2006-03-01 [colin] 2.0.0cvs94 X-Git-Tag: REL_2_1_0~100 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=16242a1763d3929adc050780244e0ecbbd11d486 2006-03-01 [colin] 2.0.0cvs94 * src/compose.c * src/imap.c * src/inc.c * src/inc.h * src/messageview.c * src/news.c * src/plugins/spamassassin/spamassassin.c Allow to add information in the "working offline" window --- diff --git a/ChangeLog b/ChangeLog index 70872878c..d58dcbabe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2006-03-01 [colin] 2.0.0cvs94 + + * src/compose.c + * src/imap.c + * src/inc.c + * src/inc.h + * src/messageview.c + * src/news.c + * src/plugins/spamassassin/spamassassin.c + Allow to add information in the "working offline" + window + 2006-03-01 [wwp] 2.0.0cvs93 * src/plugins/spamassassin/spamassassin.c diff --git a/PATCHSETS b/PATCHSETS index ce8d3ba29..a3692c922 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -1277,3 +1277,4 @@ ( cvs diff -u -r 1.94.2.78 -r 1.94.2.79 src/messageview.c; cvs diff -u -r 1.150.2.54 -r 1.150.2.55 src/procmsg.c; cvs diff -u -r 1.60.2.24 -r 1.60.2.25 src/procmsg.h; cvs diff -u -r 1.395.2.176 -r 1.395.2.177 src/summaryview.c; cvs diff -u -r 1.18.2.25 -r 1.18.2.26 src/plugins/spamassassin/spamassassin.c; cvs diff -u -r 1.4.2.9 -r 1.4.2.10 src/plugins/spamassassin/spamassassin.h; ) > 2.0.0cvs91.patchset ( cvs diff -u -r 1.43.2.40 -r 1.43.2.41 src/toolbar.c; cvs diff -u -r 1.19.2.9 -r 1.19.2.10 src/toolbar.h; ) > 2.0.0cvs92.patchset ( cvs diff -u -r 1.18.2.26 -r 1.18.2.27 src/plugins/spamassassin/spamassassin.c; ) > 2.0.0cvs93.patchset +( cvs diff -u -r 1.382.2.248 -r 1.382.2.249 src/compose.c; cvs diff -u -r 1.179.2.94 -r 1.179.2.95 src/imap.c; cvs diff -u -r 1.149.2.43 -r 1.149.2.44 src/inc.c; cvs diff -u -r 1.29.2.8 -r 1.29.2.9 src/inc.h; cvs diff -u -r 1.94.2.79 -r 1.94.2.80 src/messageview.c; cvs diff -u -r 1.101.2.21 -r 1.101.2.22 src/news.c; cvs diff -u -r 1.18.2.27 -r 1.18.2.28 src/plugins/spamassassin/spamassassin.c; ) > 2.0.0cvs94.patchset diff --git a/configure.ac b/configure.ac index cc9d75c48..6e87d004e 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=0 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=93 +EXTRA_VERSION=94 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/compose.c b/src/compose.c index 465973324..a886318ce 100644 --- a/src/compose.c +++ b/src/compose.c @@ -7132,7 +7132,10 @@ static void compose_send_cb(gpointer data, guint action, GtkWidget *widget) { Compose *compose = (Compose *)data; - if (prefs_common.work_offline && !inc_offline_should_override()) + if (prefs_common.work_offline && + !inc_offline_should_override( + _("Sylpheed-Claws needs network access in order " + "to send this email."))) return; if (compose->draft_timeout_tag != -1) { /* CLAWS: disable draft timeout */ diff --git a/src/imap.c b/src/imap.c index f7a5cea66..4b8fad119 100644 --- a/src/imap.c +++ b/src/imap.c @@ -681,7 +681,10 @@ static IMAPSession *imap_session_get(Folder *folder) g_return_val_if_fail(FOLDER_CLASS(folder) == &imap_class, NULL); g_return_val_if_fail(folder->account != NULL, NULL); - if (prefs_common.work_offline && !inc_offline_should_override()) { + if (prefs_common.work_offline && + !inc_offline_should_override( + _("Sylpheed-Claws needs network access in order " + "to access the IMAP server."))) { return NULL; } @@ -2139,7 +2142,10 @@ static GSList *imap_get_uncached_messages(IMAPSession *session, data->numlist = newlist; data->cur += count; - if (prefs_common.work_offline && !inc_offline_should_override()) { + if (prefs_common.work_offline && + !inc_offline_should_override( + _("Sylpheed-Claws needs network access in order " + "to access the IMAP server."))) { g_free(data); return NULL; } @@ -2658,7 +2664,10 @@ static gint imap_cmd_fetch(IMAPSession *session, guint32 uid, data->headers = headers; data->body = body; - if (prefs_common.work_offline && !inc_offline_should_override()) { + if (prefs_common.work_offline && + !inc_offline_should_override( + _("Sylpheed-Claws needs network access in order " + "to access the IMAP server."))) { g_free(data); return -1; } @@ -2739,7 +2748,10 @@ static gint imap_cmd_expunge(IMAPSession *session) { int r; - if (prefs_common.work_offline && !inc_offline_should_override()) { + if (prefs_common.work_offline && + !inc_offline_should_override( + _("Sylpheed-Claws needs network access in order " + "to access the IMAP server."))) { return -1; } @@ -3074,7 +3086,10 @@ static gint get_list_of_uids(IMAPSession *session, Folder *folder, IMAPFolderIte data->item = item; data->msgnum_list = msgnum_list; data->session = session; - if (prefs_common.work_offline && !inc_offline_should_override()) { + if (prefs_common.work_offline && + !inc_offline_should_override( + _("Sylpheed-Claws needs network access in order " + "to access the IMAP server."))) { g_free(data); return -1; } @@ -3791,7 +3806,10 @@ static gint imap_get_flags(Folder *folder, FolderItem *item, GSList *tmp = NULL, *cur; - if (prefs_common.work_offline && !inc_offline_should_override()) { + if (prefs_common.work_offline && + !inc_offline_should_override( + _("Sylpheed-Claws needs network access in order " + "to access the IMAP server."))) { g_free(data); return -1; } diff --git a/src/inc.c b/src/inc.c index a550e1f4f..7af40c02f 100644 --- a/src/inc.c +++ b/src/inc.c @@ -166,7 +166,10 @@ void inc_mail(MainWindow *mainwin, gboolean notify) if (inc_lock_count) return; - if (prefs_common.work_offline && !inc_offline_should_override()) + if (prefs_common.work_offline && + !inc_offline_should_override( + _("Sylpheed-Claws needs network access in order " + "to get mails."))) return; inc_lock(); @@ -268,7 +271,10 @@ gint inc_account_mail(MainWindow *mainwin, PrefsAccount *account) if (inc_lock_count) return 0; - if (prefs_common.work_offline && !inc_offline_should_override()) + if (prefs_common.work_offline && + !inc_offline_should_override( + _("Sylpheed-Claws needs network access in order " + "to get mails."))) return 0; inc_autocheck_timer_remove(); @@ -291,7 +297,10 @@ void inc_all_account_mail(MainWindow *mainwin, gboolean autocheck, gint new_msgs = 0; gint account_new_msgs = 0; - if (prefs_common.work_offline && !inc_offline_should_override()) + if (prefs_common.work_offline && + !inc_offline_should_override( + _("Sylpheed-Claws needs network access in order " + "to get mails."))) return; if (inc_lock_count) return; @@ -1429,7 +1438,7 @@ static gint inc_autocheck_func(gpointer data) return FALSE; } -gboolean inc_offline_should_override(void) +gboolean inc_offline_should_override(const gchar *msg) { static time_t overridden_yes = 0; static time_t overridden_no = 0; @@ -1448,7 +1457,9 @@ gboolean inc_offline_should_override(void) return FALSE; tmp = g_strdup_printf( - _("You're working offline. Override for %d minutes?"), + _("%s%sYou're working offline. Override for %d minutes?"), + msg?msg:"", + msg?"\n\n":"", length); answer = alertpanel(_("Offline warning"), diff --git a/src/inc.h b/src/inc.h index 9a48867f3..e9a5e1973 100644 --- a/src/inc.h +++ b/src/inc.h @@ -98,6 +98,6 @@ void inc_unlock (void); void inc_autocheck_timer_init (MainWindow *mainwin); void inc_autocheck_timer_set (void); void inc_autocheck_timer_remove (void); -gboolean inc_offline_should_override(void); +gboolean inc_offline_should_override(const gchar *msg); #endif /* __INC_H__ */ diff --git a/src/messageview.c b/src/messageview.c index dcbcd9700..ce9296d74 100644 --- a/src/messageview.c +++ b/src/messageview.c @@ -700,7 +700,10 @@ static gint disposition_notification_send(MsgInfo *msginfo) return -1; } - if (prefs_common.work_offline && !inc_offline_should_override()) + if (prefs_common.work_offline && + !inc_offline_should_override( + _("Sylpheed-Claws needs network access in order " + "to send this email."))) return 0; /* send it */ diff --git a/src/news.c b/src/news.c index dfefe56e6..1ef6710d0 100644 --- a/src/news.c +++ b/src/news.c @@ -309,7 +309,10 @@ static NNTPSession *news_session_get(Folder *folder) g_return_val_if_fail(FOLDER_CLASS(folder) == &news_class, NULL); g_return_val_if_fail(folder->account != NULL, NULL); - if (prefs_common.work_offline && !inc_offline_should_override()) { + if (prefs_common.work_offline && + !inc_offline_should_override( + _("Sylpheed-Claws needs network access in order " + "to access the News server."))) { return NULL; } diff --git a/src/plugins/spamassassin/spamassassin.c b/src/plugins/spamassassin/spamassassin.c index 755e20d75..b8f87401d 100644 --- a/src/plugins/spamassassin/spamassassin.c +++ b/src/plugins/spamassassin/spamassassin.c @@ -298,7 +298,9 @@ int spamassassin_learn(MsgInfo *msginfo, GSList *msglist, gboolean spam) if (config.transport == SPAMASSASSIN_TRANSPORT_TCP && prefs_common.work_offline - && !inc_offline_should_override()) { + && !inc_offline_should_override( + _("Sylpheed-Claws needs network access in order " + "to feed this mail(s) to the remote learner."))) { return -1; }