talons

commit bdc9ae8b32d71eeb0f77db9cc8a715c0b86f5881
parent ae5c7a82abbbed9fa7981d0ebae08b3a6432fd65
Author: Holger Berndt <hb@claws-mail.org>
Date:   Fri,  5 Aug 2011 23:53:29 +0000

2011-08-05 [holger]	3.7.9cvs40

	* claws-mail.desktop
		Revert 3.7.9cvs35 for now, it may be problematic
		(see bug #2450)

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
claws-mail.desktop
 | 
7
-------
M
configure.ac
 | 
2
+-

4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2011-08-05 [holger]	3.7.9cvs40
+
+	* claws-mail.desktop
+		Revert 3.7.9cvs35 for now, it may be problematic
+		(see bug #2450)
+
 2011-08-05 [paul]	3.7.9cvs39
 
 	* src/mainwindow.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4191,3 +4191,4 @@
 ( cvs diff -u -r 1.13.2.42 -r 1.13.2.43 src/common/plugin.c;  cvs diff -u -r 1.5.2.16 -r 1.5.2.17 src/common/plugin.h;  ) > 3.7.9cvs37.patchset
 ( cvs diff -u -r 1.1.4.9 -r 1.1.4.10 src/etpan/Makefile.am;  cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/plugins/pgpcore/Makefile.am;  cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/plugins/pgpmime/Makefile.am;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/smime/Makefile.am;  ) > 3.7.9cvs38.patchset
 ( cvs diff -u -r 1.274.2.326 -r 1.274.2.327 src/mainwindow.c;  cvs diff -u -r 1.94.2.216 -r 1.94.2.217 src/messageview.c;  cvs diff -u -r 1.43.2.123 -r 1.43.2.124 src/toolbar.c;  ) > 3.7.9cvs39.patchset
+( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 claws-mail.desktop;  ) > 3.7.9cvs40.patchset
diff --git a/claws-mail.desktop b/claws-mail.desktop
@@ -13,10 +13,3 @@ Type=Application
 StartupNotify=true
 MimeType=x-scheme-handler/mailto;
 X-Info=Claws Mail
-X-Ayatana-Desktop-Shortcuts=Compose;
-X-Ubuntu-Gettext-Domain=claws-mail
-
-[Compose Shortcut Group]
-Name=Compose New Message
-Exec=claws-mail --compose
-OnlyShowIn=Messaging Menu
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=9
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=39
+EXTRA_VERSION=40
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=