commit 4bf705646049fa8d607251beee45fe07fb14d04b
parent 7303367d5583646b9c34bc4d79e8417d4e748bd6
Author: Paul Mangan <paul@claws-mail.org>
Date: Fri, 24 Oct 2008 13:46:13 +0000
2008-10-24 [paul] 3.6.1cvs12
* tools/Makefile.am
* tools/kdeservicemenu/claws-mail-attach-files.desktop.kde4template
* tools/kdeservicemenu/install.sh
another, possibly the final?, attempt on getting this
sorted for kde4
Diffstat:
6 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+2008-10-24 [paul] 3.6.1cvs12
+
+ * tools/Makefile.am
+ * tools/kdeservicemenu/claws-mail-attach-files.desktop.kde4template
+ * tools/kdeservicemenu/install.sh
+ another, possibly the final?, attempt on getting this
+ sorted for kde4
+
2008-10-24 [paul] 3.6.1cvs11
* tools/kdeservicemenu/install.sh
diff --git a/PATCHSETS b/PATCHSETS
@@ -3593,3 +3593,4 @@
( cvs diff -u -r 1.1.2.15 -r 1.1.2.16 tools/claws.i18n.status.pl; ) > 3.6.1cvs9.patchset
( cvs diff -u -r 1.2.2.12 -r 1.2.2.13 tools/kdeservicemenu/README; cvs diff -u -r 1.2.2.6 -r 1.2.2.7 tools/kdeservicemenu/install.sh; ) > 3.6.1cvs10.patchset
( cvs diff -u -r 1.2.2.7 -r 1.2.2.8 tools/kdeservicemenu/install.sh; ) > 3.6.1cvs11.patchset
+( cvs diff -u -r 1.25.2.27 -r 1.25.2.28 tools/Makefile.am; diff -u /dev/null tools/kdeservicemenu/claws-mail-attach-files.desktop.kde4template; cvs diff -u -r 1.2.2.8 -r 1.2.2.9 tools/kdeservicemenu/install.sh; ) > 3.6.1cvs12.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
MICRO_VERSION=1
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=11
+EXTRA_VERSION=12
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/tools/Makefile.am b/tools/Makefile.am
@@ -39,6 +39,7 @@ EXTRA_DIST = \
multiwebsearch.conf \
kdeservicemenu/README \
kdeservicemenu/claws-mail-attach-files.desktop.template \
+ kdeservicemenu/claws-mail-attach-files.desktop.kde4template \
$(EXTRA_TOOLS)
MAKE_EXE = chmod u+x $(EXTRA_TOOLS)
diff --git a/tools/kdeservicemenu/claws-mail-attach-files.desktop.kde4template b/tools/kdeservicemenu/claws-mail-attach-files.desktop.kde4template
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Type=Service
+Actions=AttachFiles;
+Comment=kde service menu for attaching files to Claws Mail
+Encoding=UTF8
+Name=Claws Mail attach files
+ServiceTypes=KonqPopupMenu/Plugin,all/allfiles
+X-KDE-Priority=TopLevel
+X-KDE-Submenu=Claws Mail
+
+[Desktop Action AttachFiles]
+Exec=SCRIPT_PATH %F
+Icon=claws-mail
+Name=Attach File(s)
diff --git a/tools/kdeservicemenu/install.sh b/tools/kdeservicemenu/install.sh
@@ -1,7 +1,6 @@
#!/bin/bash
PERL_SCRIPT="claws-mail-kdeservicemenu.pl"
-DESKTOP_TEMPLATE="claws-mail-attach-files.desktop.template"
DESKTOP="claws-mail-attach-files.desktop"
function check_environ {
@@ -9,6 +8,7 @@ echo "Checking for kde4-config..."
if [ ! -z "$(type 'kde4-config' 2> /dev/null)" ]; then
echo "Found kde4-config..."
SERVICEMENU_DIR="share/kde4/services/ServiceMenus"
+ DESKTOP_TEMPLATE="claws-mail-attach-files.desktop.kde4template"
KDECONFIG="kde4-config"
else
echo "kde4-config not found..."
@@ -16,6 +16,7 @@ else
if [ ! -z "$(type 'kde-config' 2> /dev/null)" ]; then
echo "Found kde-config..."
SERVICEMENU_DIR="share/apps/konqueror/servicemenus"
+ DESKTOP_TEMPLATE="claws-mail-attach-files.desktop.template"
KDECONFIG="kde-config"
else
echo "kde-config not found..."
@@ -24,8 +25,10 @@ else
test -z $KDECONFIG && exit 1
if [[ $KDECONFIG == *4-config ]]; then
SERVICEMENU_DIR="share/kde4/services/ServiceMenus"
+ DESKTOP_TEMPLATE="claws-mail-attach-files.desktop.kde4template"
else
SERVICEMENU_DIR="share/apps/konqueror/servicemenus"
+ DESKTOP_TEMPLATE="claws-mail-attach-files.desktop.template"
fi
fi
fi
