[X2Go-Commits] python-x2go.git - brokerclient (branch) updated: 0.0.36.1-37-g617488c

[X2Go dev team]

The branch, brokerclient has been updated
       via  617488cf69cf7a5c71871fa3b1629d341a2c7c4a (commit)
      from  e77f35f10c67781585e3590f860a14b7da07612f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 .../3.0.1.x/x2gomountdirs_X2goDropbox.patch        |   77 +++++++++++++++++++
 .../3.0.99.x/x2gomountdirs_X2goDropbox.patch       |   78 ++++++++++++++++++++
 2 files changed, 155 insertions(+)
 create mode 100644 patches/x2goserver/3.0.1.x/x2gomountdirs_X2goDropbox.patch
 create mode 100644 patches/x2goserver/3.0.99.x/x2gomountdirs_X2goDropbox.patch

The diff of changes is:
diff --git a/patches/x2goserver/3.0.1.x/x2gomountdirs_X2goDropbox.patch b/patches/x2goserver/3.0.1.x/x2gomountdirs_X2goDropbox.patch
new file mode 100644
index 0000000..71e1963
--- /dev/null
+++ b/patches/x2goserver/3.0.1.x/x2gomountdirs_X2goDropbox.patch
@@ -0,0 +1,77 @@
+--- a/x2gomountdirs      2010-12-16 23:11:29.000000000 +0100
++++ b/x2gomountdirs      2011-01-06 03:07:56.000000000 +0100
+@@ -69,6 +69,8 @@
+ my $ldir="$ENV{'HOME'}/media";
+ my $spooldir_lnk="$ENV{'HOME'}/.x2go/C-$session/spool";
+ my $spooldir="/tmp/spool_$ENV{'USER'}";
++my $dropboxdir_lnk="$ENV{'HOME'}/.x2go/C-$session/dropbox";
++my $dropboxdir="/tmp/dropbox_$ENV{'USER'}";
+ 
+ if(! -e $mdir)
+ {
+@@ -109,6 +111,19 @@
+ }
+ chmod(0700,$spooldir);
+ 
++if(! -e $dropboxdir)
++{
++   mkdir($dropboxdir);
++}
++chmod(0700,$dropboxdir);
++
++$dropboxdir="$dropboxdir/$session";
++if(! -e $dropboxdir)
++{
++   mkdir($dropboxdir);
++}
++chmod(0700,$dropboxdir);
++
+ if( -d $ldir)
+ {
+     rmdir($ldir);
+@@ -129,12 +144,23 @@
+    system ("ln -s $spooldir $spooldir_lnk");
+ }
+ 
++if( -d $dropboxdir_lnk)
++{
++    rmdir($dropboxdir_lnk);
++}
++
++if( ! -l $dropboxdir_lnk)
++{
++   system ("ln -s $dropboxdir $dropboxdir_lnk");
++}
++
+ my $uname=$ENV{'USER'};
+ 
+ my @dirs=split(':',$dirlist);
+ for(my $i=0;$i<@dirs;$i++)
+ {
+        my $printspool=0;
++       my $dropboxspool=0;
+        my $mntpath;
+        if(@dirs[$i]=~m/__PRINT_SPOOL_/)
+        {
+@@ -142,6 +168,12 @@
+             $printspool=1;
+             $mntpath=$spooldir;
+        }
++       elsif(@dirs[$i]=~m/__DROPBOX_SPOOL_/)
++       {
++            @dirs[$i]=~s/__DROPBOX_SPOOL_//;
++            $dropboxspool=1;
++            $mntpath=$dropboxdir;
++       }
+        else
+        {
+             my $p=@dirs[$i];
+@@ -197,7 +229,7 @@
+                            $useplasmoid=1;
+                      }
+                }
+-               if(! $printspool && ! $useplasmoid)
++               if(! $printspool && ! $dropboxspool && ! $useplasmoid)
+                {
+                    my $fname="$ENV{'HOME'}/Desktop";
+                    my $p=@dirs[$i];
diff --git a/patches/x2goserver/3.0.99.x/x2gomountdirs_X2goDropbox.patch b/patches/x2goserver/3.0.99.x/x2gomountdirs_X2goDropbox.patch
new file mode 100644
index 0000000..6f0fc4d
--- /dev/null
+++ b/patches/x2goserver/3.0.99.x/x2gomountdirs_X2goDropbox.patch
@@ -0,0 +1,78 @@
+--- a/x2gomountdirs      2011-02-25 17:12:05.000000000 +0100
++++ b/x2gomountdirs      2011-02-25 17:12:35.000000000 +0100
+@@ -72,6 +72,8 @@
+ my $ldir="$ENV{'HOME'}/media";
+ my $spooldir_lnk="$ENV{'HOME'}/.x2go/C-$session/spool";
+ my $spooldir="/tmp/spool_$ENV{'USER'}";
++my $dropboxdir_lnk="$ENV{'HOME'}/.x2go/C-$session/dropbox";
++my $dropboxdir="/tmp/dropbox_$ENV{'USER'}";
+ 
+ if(! -e $mdir)
+ {
+@@ -112,6 +114,19 @@
+ }
+ chmod(0700,$spooldir);
+ 
++if(! -e $dropboxdir)
++{
++   mkdir($dropboxdir);
++}
++chmod(0700,$dropboxdir);
++
++$dropboxdir="$dropboxdir/$session";
++if(! -e $dropboxdir)
++{
++   mkdir($dropboxdir);
++}
++chmod(0700,$dropboxdir);
++
+ if( -d $ldir)
+ {
+     rmdir($ldir);
+@@ -132,12 +147,23 @@
+    system ("ln -s $spooldir $spooldir_lnk");
+ }
+ 
++if( -d $dropboxdir_lnk)
++{
++    rmdir($dropboxdir_lnk);
++}
++
++if( ! -l $dropboxdir_lnk)
++{
++   system ("ln -s $dropboxdir $dropboxdir_lnk");
++}
++
+ my $uname=$ENV{'USER'};
+ 
+ my @dirs=split(':',$dirlist);
+ for(my $i=0;$i<@dirs;$i++)
+ {
+        my $printspool=0;
++       my $dropboxspool=0;
+        my $mntpath;
+        if(@dirs[$i]=~m/__PRINT_SPOOL_/)
+        {
+@@ -145,6 +171,12 @@
+             $printspool=1;
+             $mntpath=$spooldir;
+        }
++       elsif(@dirs[$i]=~m/__DROPBOX_SPOOL_/)
++       {
++            @dirs[$i]=~s/__DROPBOX_SPOOL_//;
++            $dropboxspool=1;
++            $mntpath=$dropboxdir;
++       }
+        else
+        {
+             my $p=@dirs[$i];
+@@ -197,7 +229,7 @@
+                            $useplasmoid=1;
+                      }
+                }
+-               if(! $printspool && ! $useplasmoid)
++               if(! $printspool && ! $dropboxspool && ! $useplasmoid)
+                {
+                    my $fname="$ENV{'HOME'}/Desktop";
+                    my $p=@dirs[$i];
+


hooks/post-receive
-- 
python-x2go.git (Python X2Go Client API)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "python-x2go.git" (Python X2Go Client API).