talons

commit 7303367d5583646b9c34bc4d79e8417d4e748bd6
parent 28a77346f660acde1130907a4ca6f5eaa8d21dd4
Author: Paul Mangan <paul@claws-mail.org>
Date:   Fri, 24 Oct 2008 11:13:02 +0000

2008-10-24 [paul]	3.6.1cvs11

	* tools/kdeservicemenu/install.sh
		fix servicemenu installation directory on kde4

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
tools/kdeservicemenu/install.sh
 | 
8
+++++++-

4 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-24 [paul]	3.6.1cvs11
+
+	* tools/kdeservicemenu/install.sh
+		fix servicemenu installation directory on kde4
+
 2008-10-24 [paul]	3.6.1cvs10
 
 	* tools/kdeservicemenu/README
diff --git a/PATCHSETS b/PATCHSETS
@@ -3592,3 +3592,4 @@
 ( cvs diff -u -r 1.1.2.53 -r 1.1.2.54 src/plugins/pgpcore/sgpgme.c;  ) > 3.6.1cvs8.patchset
 ( 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
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=10
+EXTRA_VERSION=11
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/tools/kdeservicemenu/install.sh b/tools/kdeservicemenu/install.sh
@@ -3,24 +3,30 @@
 PERL_SCRIPT="claws-mail-kdeservicemenu.pl"
 DESKTOP_TEMPLATE="claws-mail-attach-files.desktop.template"
 DESKTOP="claws-mail-attach-files.desktop"
-SERVICEMENU_DIR="share/apps/konqueror/servicemenus"
 
 function check_environ {
 echo "Checking for kde4-config..."
 if [ ! -z "$(type 'kde4-config' 2> /dev/null)" ]; then
   echo "Found kde4-config..."
+  SERVICEMENU_DIR="share/kde4/services/ServiceMenus"
   KDECONFIG="kde4-config"
 else
   echo "kde4-config not found..."
   echo "Checking for kde-config..."
   if [ ! -z "$(type 'kde-config' 2> /dev/null)" ]; then
       echo "Found kde-config..."
+      SERVICEMENU_DIR="share/apps/konqueror/servicemenus"
       KDECONFIG="kde-config"
   else
     echo "kde-config not found..."
     echo "asking user to find kde4-config or kde-config..."
     KDECONFIG=$(kdialog --title "Locate kde-config or kde4-config" --getopenfilename / )
     test -z $KDECONFIG && exit 1
+    if [[ $KDECONFIG == *4-config ]]; then
+      SERVICEMENU_DIR="share/kde4/services/ServiceMenus"
+    else
+      SERVICEMENU_DIR="share/apps/konqueror/servicemenus"
+    fi 
   fi
 fi
 }