[X2Go-Commits] x2gomatebindings.git - master (branch) updated: 99d873b2835499a2db65fab809ecb8000ddf64af

[X2Go dev team]

The branch, master has been updated
       via  99d873b2835499a2db65fab809ecb8000ddf64af (commit)
      from  bbafab443c2e3fe62c387a28f72a2dbac7f0b275 (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 -----------------------------------------------------------------
commit 99d873b2835499a2db65fab809ecb8000ddf64af
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Jul 26 17:35:23 2013 +0200

    Use x2goumount-session to unmount shared folders.

-----------------------------------------------------------------------

Summary of changes:
 bin/x2goumount-session-mate |   26 +-------------------------
 debian/changelog            |    1 +
 2 files changed, 2 insertions(+), 25 deletions(-)

The diff of changes is:
diff --git a/bin/x2goumount-session-mate b/bin/x2goumount-session-mate
index 93e89b6..54191d0 100755
--- a/bin/x2goumount-session-mate
+++ b/bin/x2goumount-session-mate
@@ -23,9 +23,6 @@
 
 use strict;
 
-use lib "/usr/lib/x2go";
-use x2godbwrapper; 
-
 my $fname=join(" ", @ARGV);
 open(F,"<$fname") or die "can't open $fname";
 my $dir=<F>;
@@ -41,25 +38,4 @@ my $uname=$ENV{'USER'};
 
 my $use_zenity=0;
 
-if($ENV{'MATE_DESKTOP_SESSION_ID'} ne "")
-{
-     $use_zenity=1;
-}
-
-if(system( "cd \"$tmp_dir\" && fusermount -u \"$dir\" && cd - 1>/dev/null" ) == 0)
-{
-     unlink($fname);
-     db_deletemount( $session, $dir);
-     rmdir ($dir);
-}
-else
-{
-    if($use_zenity == 0)
-    {
-         system("kdialog --error \"Can't umount:\n $dir\"&");
-    }
-    else
-    {
-         system("zenity --error --text \"Can't umount:\n $dir\"&");
-    }
-}
+system("x2goumount-session $session $dir");
diff --git a/debian/changelog b/debian/changelog
index a57d4b8..8cb0f2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,5 +7,6 @@ x2gomatebindings (0.0.1.0-0~x2go1) UNRELEASED; urgency=low
     http://wiki.debian.org/ReleaseGoals/LAFileRemoval.
   * /debian/control:
     + Drop B-D: libgnomevfs2-dev.
+  * Use x2goumount-session to unmount shared folders.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Mon, 31 Dec 2012 13:40:45 +0100


hooks/post-receive
-- 
x2gomatebindings.git (x2gomatebindings upstream project)

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 "x2gomatebindings.git" (x2gomatebindings upstream project).