+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
( 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
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=93
+EXTRA_VERSION=94
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
{
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 */
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;
}
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;
}
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;
}
{
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;
}
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;
}
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;
}
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();
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();
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;
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;
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"),
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__ */
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 */
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;
}
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;
}