[maemo-commits] [maemo-commits] r19221 - in projects/haf/tags/ke-recv/3.19-7: debian src

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-08-27 15:22:41 +0300 (Thu, 27 Aug 2009)
New Revision: 19221

Modified:
   projects/haf/tags/ke-recv/3.19-7/debian/changelog
   projects/haf/tags/ke-recv/3.19-7/src/osso-mmc-mount.sh
Log:
patch to support user-dirs.dirs


Modified: projects/haf/tags/ke-recv/3.19-7/debian/changelog
===================================================================
--- projects/haf/tags/ke-recv/3.19-7/debian/changelog	2009-08-27 11:43:16 UTC (rev 19220)
+++ projects/haf/tags/ke-recv/3.19-7/debian/changelog	2009-08-27 12:22:41 UTC (rev 19221)
@@ -1,3 +1,10 @@
+ke-recv (3.19-7) unstable; urgency=low
+
+  Patch from Mox Soini to support '/home/user/.config/user-dirs.dirs':
+  * Fixes: NB#130327 - ke-recv needs to support global safe folders
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Thu, 27 Aug 2009 14:42:49 +0300
+
 ke-recv (3.19-6) unstable; urgency=low
 
   * Make sure logger is not called without command line arguments.

Modified: projects/haf/tags/ke-recv/3.19-7/src/osso-mmc-mount.sh
===================================================================
--- projects/haf/tags/ke-recv/3.19-7/src/osso-mmc-mount.sh	2009-08-27 11:43:16 UTC (rev 19220)
+++ projects/haf/tags/ke-recv/3.19-7/src/osso-mmc-mount.sh	2009-08-27 12:22:41 UTC (rev 19221)
@@ -74,12 +74,35 @@
 if [ $RC = 0 ]; then
   # create some special directories for user's partition
   if [ "x$MP" = "x/home/user/MyDocs" -a -w $MP ]; then
-    for d in .sounds .videos .documents .images .camera; do
-      mkdir -p $MP/$d
-    done
+    # use global folder names
+    USERDIRS="/home/user/.config/user-dirs.dirs"
+    if [ -f "$USERDIRS" ]; then
+      HOME='/home/user'
+      source "$USERDIRS"
+      mkdir -p "$XDG_DOCUMENTS_DIR" 
+      mkdir -p "$XDG_PICTURES_DIR"
+      mkdir -p "$XDG_MUSIC_DIR"
+      mkdir -p "$XDG_VIDEOS_DIR" 
+      mkdir -p "$NOKIA_CAMERA_DIR"
+    else
+      # fallback
+      for d in .sounds .videos .documents .images .camera; do
+        mkdir -p $MP/$d
+      done
+    fi
     touch $MP
   elif [ "x$MP" = "x/home/user/MyDocs" ]; then
     logger "$0: '$MP' is not writable"
+  elif [ "x$MP" = "x/media/mmc1" -a -w $MP ]; then
+    # use global folder names
+    USERDIRS="/home/user/.config/user-dirs.dirs"
+    if [ -f "$USERDIRS" ]; then
+      HOME='/home/user'
+      source "$USERDIRS"
+      mkdir -p "$NOKIA_MMC_CAMERA_DIR"
+    fi
+  elif [ "x$MP" = "x/media/mmc1" ]; then
+    logger "$0: '$MP' is not writable"
   fi
 fi