2011-08-05 [holger] 3.7.9cvs40

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

diff --git a/ChangeLog b/ChangeLog
index 29a4f87e1074717dc1431907df57f72c05cdc2cc..33265ecfb33c690944be91845183599e7f5c0b0d 100644 (file)
--- 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
index 4fd5c59826b3ca0bbf93da8121f53c7fc05b9c1b..13dd7ec67e8ab6f8e5345b32f4838afa5a678e65 100644 (file)
--- 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
index 990ac624489efa308e3065a6c8e83392b64a732c..adbdee4fff93bec2b5168466c15c9312c855753e 100644 (file)
--- 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
index 9fa08624bd02be94d0fffeea77e45285fd057b64..93031857455bb880842ab0427daf8bef6a2bc8b0 100644 (file)
--- 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=