[PC-BSD Commits] r2771 - in pbibuild/modules/thunderbird: . overlay-dir/bin

[svn at pcbsd.org]

Author: kris
Date: 2008-09-15 06:29:27 -0700 (Mon, 15 Sep 2008)
New Revision: 2771

Modified:
   pbibuild/modules/thunderbird/overlay-dir/bin/defaultbrowser
   pbibuild/modules/thunderbird/pbi.conf
Log:

Fixed some bugs with clicking links in thunderbird on KDE4 opening a browser window



Modified: pbibuild/modules/thunderbird/overlay-dir/bin/defaultbrowser
===================================================================
--- pbibuild/modules/thunderbird/overlay-dir/bin/defaultbrowser	2008-09-14 17:33:44 UTC (rev 2770)
+++ pbibuild/modules/thunderbird/overlay-dir/bin/defaultbrowser	2008-09-15 13:29:27 UTC (rev 2771)
@@ -10,19 +10,40 @@
   HOMEDIR="/root"
 fi
 
-if [ -e "${HOMEDIR}/.kde/share/config/kdeglobals" ]
+if [ -e "${HOMEDIR}/.kde4" ]
 then
-  BROWSER="`cat ${HOMEDIR}/.kde/share/config/kdeglobals | grep '^BrowserApplication=' | cut -d '!' -f 2`"
+  KDEDIR=".kde4"
+else
+  KDEDIR=".kde"
+fi
 
+if [ -e "${HOMEDIR}/${KDEDIR}/share/config/kdeglobals" ]
+then
+  BROWSER="`cat ${HOMEDIR}/${KDEDIR}/share/config/kdeglobals | grep '^BrowserApplication' | cut -d '!' -f 2`"
+
   if [ -e "$BROWSER" ]
   then
     ( $BROWSER "$@" ) &
     exit 0
   else
-    ( /usr/local/bin/konqueror "$@" ) &
+    if [ -e "/usr/local/bin/konqueror" ]
+    then
+      ( /usr/local/bin/konqueror "$@" ) &
+    fi
+    if [ -e "/usr/local/kde4/bin/konqueror" ]
+    then
+      ( /usr/local/kde4/bin/konqueror "$@" ) &
+    fi
     exit 0
   fi
 else
-  ( /usr/local/bin/konqueror "$@" ) &
+  if [ -e "/usr/local/bin/konqueror" ]
+  then
+    ( /usr/local/bin/konqueror "$@" ) &
+  fi
+  if [ -e "/usr/local/kde4/bin/konqueror" ]
+  then
+    ( /usr/local/kde4/bin/konqueror "$@" ) &
+  fi
   exit 0
 fi

Modified: pbibuild/modules/thunderbird/pbi.conf
===================================================================
--- pbibuild/modules/thunderbird/pbi.conf	2008-09-14 17:33:44 UTC (rev 2770)
+++ pbibuild/modules/thunderbird/pbi.conf	2008-09-15 13:29:27 UTC (rev 2771)
@@ -32,6 +32,6 @@
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is still the same ver
-BUILDKEY="02"
+BUILDKEY="12"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY