[X2Go-Commits] x2gomatebindings.git - build-main (branch) updated: 2d64da9939a9261dca99d739a545896fac7fb0ac
X2Go dev team
git-admin at x2go.org
Fri Jul 26 18:33:34 CEST 2013
The branch, build-main has been updated
via 2d64da9939a9261dca99d739a545896fac7fb0ac (commit)
from eca466be460f30cb34ce7f440e64f92c642fc2cb (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:
{suspend => bin}/x2gosuspend-session-gnome | 0
bin/x2goumount-session-gnome | 62 ++++++++++++++++++++++++++++
debian/changelog | 6 ++-
debian/rules | 1 -
debian/x2gognomebindings.install | 2 +
extension/nautilus-x2goumount.c | 4 +-
man/man8/x2gosuspend-session-gnome.8 | 23 +++++++++++
man/man8/x2goumount-session-gnome.8 | 23 +++++++++++
8 files changed, 117 insertions(+), 4 deletions(-)
rename {suspend => bin}/x2gosuspend-session-gnome (100%)
create mode 100755 bin/x2goumount-session-gnome
create mode 100644 man/man8/x2gosuspend-session-gnome.8
create mode 100644 man/man8/x2goumount-session-gnome.8
The diff of changes is:
diff --git a/suspend/x2gosuspend-session-gnome b/bin/x2gosuspend-session-gnome
similarity index 100%
rename from suspend/x2gosuspend-session-gnome
rename to bin/x2gosuspend-session-gnome
diff --git a/bin/x2goumount-session-gnome b/bin/x2goumount-session-gnome
new file mode 100755
index 0000000..7d160f2
--- /dev/null
+++ b/bin/x2goumount-session-gnome
@@ -0,0 +1,62 @@
+#!/usr/bin/perl
+
+# Copyright (C) 2007-2011 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
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the
+# Free Software Foundation, Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# 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>
+
+use strict;
+
+use lib "/usr/lib/x2go";
+use x2godbwrapper;
+
+my $fname=shift;
+open(F,"<$fname") or die "can't open $fname";
+my $dir=<F>;
+my $session=<F>;
+close(F);
+
+$session=~s/\n//;
+
+chomp($dir);
+my $uname=$ENV{'USER'};
+
+my $use_zenity=0;
+
+if($ENV{'GNOME_DESKTOP_SESSION_ID'} ne "")
+{
+ $use_zenity=1;
+}
+
+if(system( "fusermount -u $dir" ) == 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\"&");
+ }
+}
diff --git a/debian/changelog b/debian/changelog
index dbdcbff..e5c4c2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
-x2gognomebindings (2.0.1.2-0~x2go1) UNRELEASED; urgency=low
+x2gognomebindings (2.0.1.3-0~x2go1) UNRELEASED; urgency=low
+ * New upstream version (2.0.1.3):
+ - Move ,,x2goumount'' script into package as ,,x2goumount-session-gnome''.
+ - Move x2gosuspend-session-gnome to /bin folder within package.
+ - Add man apges for x2goumount-session-gnome, x2gosuspend-session-gnome.
* Add gnome-menus as dependency.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Sat, 24 Sep 2011 03:06:58 +0200
diff --git a/debian/rules b/debian/rules
index a79b305..0940e81 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,6 @@ install: build
$(MAKE) DESTDIR=$(CURDIR)/debian/x2gognomebindings install
$(MAKE) -C po DESTDIR=$(CURDIR)/debian/x2gognomebindings install
install x2gonautilus/x2gonautilus $(CURDIR)/debian/x2gognomebindings/usr/bin/
- install suspend/x2gosuspend-session-gnome $(CURDIR)/debian/x2gognomebindings/usr/bin/
install updatemenu/update-gnome-menu-x2go $(CURDIR)/debian/x2gognomebindings/usr/sbin/
cp -ar share $(CURDIR)/debian/x2gognomebindings/usr/
cp updatemenu/gnome-settingsx2go.menu $(CURDIR)/debian/x2gognomebindings/etc/xdg/menus
diff --git a/debian/x2gognomebindings.install b/debian/x2gognomebindings.install
index b437a9f..fb933aa 100644
--- a/debian/x2gognomebindings.install
+++ b/debian/x2gognomebindings.install
@@ -1 +1,3 @@
+bin/x2gosuspend-session-gnome usr/bin/
+bin/x2goumount-session-gnome usr/bin/
VERSION.x2gognomebindings usr/share/x2go/versions/
diff --git a/extension/nautilus-x2goumount.c b/extension/nautilus-x2goumount.c
index 80f33ed..8d7f63c 100644
--- a/extension/nautilus-x2goumount.c
+++ b/extension/nautilus-x2goumount.c
@@ -47,8 +47,8 @@ static void nautilus_x2goumount_execute (NautilusMenuItem *item)
GList *files;
files = (GList*)g_object_get_data (G_OBJECT (item), "files");
gchar* uri = nautilus_file_info_get_uri ((NautilusFileInfo *)files->data);
- char* cmd=malloc(strlen(uri)+strlen("x2goumount"));
- strcpy(cmd,"x2goumount ");
+ char* cmd=malloc(strlen(uri)+strlen("x2goumount-session-gnome"));
+ strcpy(cmd,"x2goumount-session-gnome ");
strcat(cmd, uri+7);
g_spawn_command_line_async (cmd, NULL);
g_free (uri);
diff --git a/man/man8/x2gosuspend-session-gnome.8 b/man/man8/x2gosuspend-session-gnome.8
new file mode 100644
index 0000000..749b7a9
--- /dev/null
+++ b/man/man8/x2gosuspend-session-gnome.8
@@ -0,0 +1,23 @@
+'\" -*- coding: utf-8 -*-
+.if \n(.g .ds T< \\FC
+.if \n(.g .ds T> \\F[\n[.fam]]
+.de URL
+\\$2 \(la\\$1\(ra\\$3
+..
+.if \n(.g .mso www.tmac
+.TH x2gosuspend-session-gnome 8 "18 May 2011" "Version 3.0.99.x" "X2go GNOME Bindings"
+.SH NAME
+x2gosuspend-session-gnome \- X2go GNOME Binding for X2go Server: Suspend X2go Sessions from GNOME Menu
+.SH SYNOPSIS
+'nh
+.fi
+.ad l
+x2gosuspend-session-gnome <session_id>
+
+.SH DESCRIPTION
+\fBx2gosuspend-gnome-session\fR is a component of the X2go GNOME bindings and a simple wrapper around the X2go Server
+script ,,x2gosuspend-session''--with the potentials to be customized for X2go on GNOME desktops.
+.PP
+.SH AUTHOR
+This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2go project
+(http://www.x2go.org).
diff --git a/man/man8/x2goumount-session-gnome.8 b/man/man8/x2goumount-session-gnome.8
new file mode 100644
index 0000000..f8d50ea
--- /dev/null
+++ b/man/man8/x2goumount-session-gnome.8
@@ -0,0 +1,23 @@
+'\" -*- coding: utf-8 -*-
+.if \n(.g .ds T< \\FC
+.if \n(.g .ds T> \\F[\n[.fam]]
+.de URL
+\\$2 \(la\\$1\(ra\\$3
+..
+.if \n(.g .mso www.tmac
+.TH x2goumount-session-gnome 8 "18 May 2011" "Version 3.0.99.x" "X2go GNOME Bindings"
+.SH NAME
+x2goumount-session-gnome \- X2go GNOME Binding for X2go Server: Unmount shared folder via Nautilus
+.SH SYNOPSIS
+'nh
+.fi
+.ad l
+x2goumount-session-gnome <arg1> <arg2> ...
+
+.SH DESCRIPTION
+\fBx2goumount-session-gnome\fR is a component of the X2go GNOME bindings. It is run if a user selects the ,,Unmount''
+action in the right-click context menu on X2go shared folder icons on the GNOME desktop.
+.PP
+.SH AUTHOR
+This manual has been written by Mike Gabriel <mike.gabriel at das-netzwerkteam.de> for the X2go project
+(http://www.x2go.org).
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).
More information about the x2go-commits
mailing list