2008-10-24 [paul] 3.6.1cvs11
authorPaul Mangan <paul@claws-mail.org>
Fri, 24 Oct 2008 11:13:02 +0000 (11:13 +0000)
committerPaul Mangan <paul@claws-mail.org>
Fri, 24 Oct 2008 11:13:02 +0000 (11:13 +0000)
* tools/kdeservicemenu/install.sh
fix servicemenu installation directory on kde4

ChangeLog
PATCHSETS
configure.ac
tools/kdeservicemenu/install.sh

index d92d1df..b21c62b 100644 (file)
--- 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
index 7361af2..5cfeda0 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index fa8a489..2c7da9a 100644 (file)
@@ -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=
 
index 8ffe42e..8148902 100644 (file)
@@ -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
 }