[X2Go-Commits] x2gognomebindings.git - master (branch) updated: 2.0.1.7-19-g3e2021b

X2Go dev team git-admin at x2go.org
Sun Jul 28 11:47:29 CEST 2013


The branch, master has been updated
       via  3e2021b76598ba555ce85f6dada6dfa9af1c8ac9 (commit)
      from  76ad459ab3285e7ee402c9af3b021fdbceeb14e7 (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 3e2021b76598ba555ce85f6dada6dfa9af1c8ac9
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Jul 28 11:45:49 2013 +0200

    x2goumount-session-gnome: Fix script when used with X2Go Server (>= 4.1.0.0).

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

Summary of changes:
 bin/x2goumount-session-gnome |   29 +++--------------------------
 debian/changelog             |    2 ++
 debian/control               |    2 +-
 3 files changed, 6 insertions(+), 27 deletions(-)

The diff of changes is:
diff --git a/bin/x2goumount-session-gnome b/bin/x2goumount-session-gnome
index 99366dd..bb9d1d8 100755
--- a/bin/x2goumount-session-gnome
+++ b/bin/x2goumount-session-gnome
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (C) 2007-2011 X2go Project - http://wiki.x2go.org
+# Copyright (C) 2007-2013 X2Go Project - http://wiki.x2go.org
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,12 +19,10 @@
 #
 # Copyright (C) 2007-2011  Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
 # Copyright (C) 2007-2011  Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
+# Copyright (C) 2013 Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 
 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>;
@@ -40,25 +38,4 @@ my $uname=$ENV{'USER'};
 
 my $use_zenity=0;
 
-if($ENV{'GNOME_DESKTOP_SESSION_ID'} ne "")
-{
-     $use_zenity=1;
-}
-
-if(system( "cd $tmp_dir && fusermount -u $dir && cd - >/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 069c031..d0631e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ x2gognomebindings (2.0.2.0-0~x2go2) UNRELEASED; urgency=low
     - Remove build-cruft.
     - Drop inclusion of libgnome-vfs header files as they are not used.
     - Class name change: NautilusX2goumount -> NautilusX2GoUmount.
+    - x2goumount-session-gnome: Fix script when used with X2Go Server
+      (>= 4.1.0.0).
   * /debian/control:
     + Drop B-D: libglade2-dev.
     + Drop B-D: libglib2.0-dev.
diff --git a/debian/control b/debian/control
index b7735f0..937f8fa 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Architecture: any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
- x2goserver (>=3.1.0.2-0~),
+ x2goserver (>=4.0.1.4-0~),
  x2goserver-extensions,
  zenity,
  gnome-menus,


hooks/post-receive
-- 
x2gognomebindings.git (GNOME bindings for X2Go)

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 "x2gognomebindings.git" (GNOME bindings for X2Go).




More information about the x2go-commits mailing list