( cvs diff -u -r 1.20.2.5 -r 1.20.2.6 src/gtk/Makefile.am; cvs diff -u -r 1.4.2.18 -r 1.4.2.19 src/gtk/about.c; diff -u /dev/null src/gtk/authors.h; ) > 1.9.15cvs83.patchset
( cvs diff -u -r 1.654.2.963 -r 1.654.2.964 configure.ac; cvs diff -u -r 1.207.2.76 -r 1.207.2.77 src/folderview.c; cvs diff -u -r 1.8.2.10 -r 1.8.2.11 src/headerview.c; cvs diff -u -r 1.115.2.61 -r 1.115.2.62 src/main.c; cvs diff -u -r 1.204.2.66 -r 1.204.2.67 src/prefs_common.c; cvs diff -u -r 1.103.2.34 -r 1.103.2.35 src/prefs_common.h; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/prefs_message.c; cvs diff -u -r 1.96.2.79 -r 1.96.2.80 src/textview.c; cvs diff -u -r 1.12.2.8 -r 1.12.2.9 src/textview.h; cvs diff -u -r 1.9.2.18 -r 1.9.2.19 src/common/defs.h; cvs diff -u -r 1.36.2.46 -r 1.36.2.47 src/common/utils.c; cvs diff -u -r 1.20.2.25 -r 1.20.2.26 src/common/utils.h; cvs diff -u -r 1.5.2.15 -r 1.5.2.16 src/gtk/gtkutils.c; cvs diff -u -r 1.4.2.13 -r 1.4.2.14 src/gtk/gtkutils.h; ) > 1.9.15cvs84.patchset
( cvs diff -u -r 1.96.2.80 -r 1.96.2.81 src/textview.c; ) > 1.9.15cvs85.patchset
+( cvs diff -u -r 1.149.2.37 -r 1.149.2.38 src/inc.c; ) > 1.9.15cvs86.patchset
{
static time_t overridden_yes = 0;
static time_t overridden_no = 0;
- int length = 600;
+ int length = 10; /* minutes */
gint answer = G_ALERTDEFAULT;
if (prefs_common.autochk_newmail)
- length = prefs_common.autochk_itv;
+ length = prefs_common.autochk_itv; /* minutes */
if (prefs_common.work_offline) {
- gchar *tmp = g_strdup_printf(
- _("You're working offline. Override for %d minutes?"),
- length);
- if (time(NULL) - overridden_yes < length * 10)
+ gchar *tmp = NULL;
+
+ if (time(NULL) - overridden_yes < length * 60) /* seconds */
return TRUE;
- else if (time(NULL) - overridden_no < length * 10)
+ else if (time(NULL) - overridden_no < length * 60) /* seconds */
return FALSE;
-
+
+ tmp = g_strdup_printf(
+ _("You're working offline. Override for %d minutes?"),
+ length);
+
answer = alertpanel(_("Offline warning"),
tmp,
GTK_STOCK_YES, GTK_STOCK_NO, _("On_ly once"));