From: Colin Leroy <colin@colino.net>
Date: Thu, 24 Feb 2005 07:23:56 +0000 (+0000)
Subject: 2005-02-24 [colin]      1.0.1cvs15.10
X-Git-Tag: rel_1_9_6~19
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=4843918f4a932c7150bc663d4b628b46ecdf819d

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 143d75112..85d7a2c69 100644
--- 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 763fdefe4..9756f1177 100644
--- 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 b943317f5..7c547ed8e 100644
--- 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 e67f84b33..d2e22da49 100644
--- 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);