2005-02-24 [colin] 1.0.1cvs15.10

        * src/messageview.c
                Don't send out receipts if offline. Ask.

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 143d751129cd74d67fa7735953ce212adab22ef2..85d7a2c690a689c6321981e2334893f0234205b2 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2005-02-24 [colin]     1.0.1cvs15.10
+
+       * src/messageview.c
+               Don't send out receipts if offline. Ask.
+
 2005-02-23 [colin]     1.0.1cvs15.9
 
        * src/summaryview.c     

diff --git a/PATCHSETS b/PATCHSETS
index 763fdefe4d774adb893652788e932fd9d13d4b05..9756f11772cdcee270c443be95ccbc3a59026fbf 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -398,3 +398,4 @@
 ( cvs diff -u -r 1.382.2.106 -r 1.382.2.107 src/compose.c; ) > 1.0.1cvs15.7.patchset
 ( cvs diff -u -r 1.395.2.55 -r 1.395.2.56 src/summaryview.c; ) > 1.0.1cvs15.8.patchset
 ( cvs diff -u -r 1.395.2.56 -r 1.395.2.57 src/summaryview.c; ) > 1.0.1cvs15.9.patchset
+( cvs diff -u -r 1.94.2.46 -r 1.94.2.47 src/messageview.c; ) > 1.0.1cvs15.10.patchset

diff --git a/configure.ac b/configure.ac
index b943317f557538357f5365fc85ccf905bffbc5b6..7c547ed8eb5f3ac2a43bf9ad0497a60c2b6ea9b7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=15
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.9
+EXTRA_GTK2_VERSION=.10
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}

diff --git a/src/messageview.c b/src/messageview.c
index e67f84b33094cb3063a3dd532c23004196df0487..d2e22da4945fb082f7a6dd2709eed30688295145 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -658,7 +658,13 @@ static gint disposition_notification_send(MsgInfo *msginfo)
                unlink(tmp);
                return -1;
        }
-       
+               
+       if (prefs_common.work_offline)
+               if (alertpanel(_("Offline warning"), 
+                              _("You're working offline. Override?"),
+                              _("Yes"), _("No"), NULL) != G_ALERTDEFAULT)
+                       return 0;
+
        /* send it */
        path = folder_item_fetch_msg(queue, num);
        ok = procmsg_send_message_queue(path);