2008-11-13 [wwp] 3.6.1cvs24

	* tools/popfile-link.sh
		Add support for reusing existing POPFile session ID.

diff --git a/ChangeLog b/ChangeLog
index 7f25e2c3f026c7dd80c5280e7c6c37a75fe06dca..4444cbfba43b7faaa8d88db1799e0f1dfb1c31f1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-13 [wwp]       3.6.1cvs24
+
+       * tools/popfile-link.sh
+               Add support for reusing existing POPFile session ID.
+
 2008-11-12 [colin]     3.6.1cvs23
 
        * src/prefs_gtk.h

diff --git a/PATCHSETS b/PATCHSETS
index a6e4bb00bdc3746d032e51d4263f9db17a9b37cb..beb72e0c1d05302d7fd5b857fd40b9cb40a3f6ab 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3605,3 +3605,4 @@
 ( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/autofaces.c;  cvs diff -u -r 1.2.2.5 -r 1.2.2.6 src/common/md5.c;  cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/common/md5.h;  ) > 3.6.1cvs21.patchset
 ( cvs diff -u -r 1.395.2.398 -r 1.395.2.399 src/summaryview.c;  ) > 3.6.1cvs22.patchset
 ( cvs diff -u -r 1.5.2.17 -r 1.5.2.18 src/prefs_gtk.h;  ) > 3.6.1cvs23.patchset
+( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 tools/popfile-link.sh;  ) > 3.6.1cvs24.patchset

diff --git a/configure.ac b/configure.ac
index fc77a9a80b3d689995510610d17e4d20c1149ee5..6a14a4069d6e5bf768e4e3a450f538f6fb4e1832 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=23
+EXTRA_VERSION=24
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/tools/popfile-link.sh b/tools/popfile-link.sh
index b1ff1ae9e7e10197a7e8a56ec4e81a1f06c6123c..a64742432d49a1149c1e96196b64411a24a2faff 100644 (file)
--- a/tools/popfile-link.sh
+++ b/tools/popfile-link.sh
@@ -26,11 +26,21 @@
 
 function open_page()
 {
-       TMPCMD=$(echo $OPEN_CMD | sed "s:%s:$1:")
+       TMPCMD=$(echo $OPEN_CMD | sed "s|\"%s\"|$1|")
        $TMPCMD &
 }
 
 
+SESSION_ID=""
+if [ "$1" == "--ask-session-id" ]
+then
+       shift
+       SESSION_ID=$(gxmessage -entry -center -wrap -buttons "OK:0,Cancel:1" -default "OK" \
+               -name "popfile-link" -title "POPFile session ID" "Type in the ID of a running POPFile session to use")
+       test -z "$SESSION_ID" -o $? -ne 0 && \
+               exit 0
+fi
+
 test -z "$1" && \
        exit 1
 
@@ -39,7 +49,7 @@ test -z "$CM_DIR" -o ! -d "$HOME/$CM_DIR" && \
        exit 1
 
 OPEN_CMD=$(grep -Em 1 "^uri_open_command=" "$HOME/$CM_DIR/clawsrc" | cut -d '=' -f 2-)
-test -z "$OPEN_CMD" || \
+test -z "$OPEN_CMD" && \
        exit 1
 
 while [ -n "$1" ]
@@ -48,7 +58,12 @@ do
        if [ -n "$LINK" ]
        then
                LINK=${LINK:16}
-               open_page "$LINK"
+               if [ -n "$SESSION_ID" ]
+               then
+                       open_page "${LINK}\\&session=$SESSION_ID"
+               else
+                       open_page "$LINK"
+               fi
        fi
        shift
 done