The branch, master has been updated via c00140e7bd8ac0c54f02535bc6befa30e7cb6acf (commit) from 114fd0ecaa06904e1adc5fc3d9ed68eac6aeffd3 (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 c00140e7bd8ac0c54f02535bc6befa30e7cb6acf Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jul 24 06:21:32 2013 +0200 MATE: Initial upstream version (0.0.1.0) - Starting x2gomatebindings as a fork of x2gognomebindings. ----------------------------------------------------------------------- Summary of changes: VERSION | 2 +- VERSION.x2gognomebindings | 1 - VERSION.x2gomatebindings | 1 + bin/{x2gonautilus => x2gocaja} | 5 +- ...pend-session-gnome => x2gosuspend-session-mate} | 3 +- ...mount-session-gnome => x2goumount-session-mate} | 7 +- debian/changelog | 87 +--- debian/control | 46 +- debian/copyright | 73 +-- debian/rules | 2 +- debian/x2gognomebindings.install | 11 - debian/x2gognomebindings.lintian-overrides | 3 - ...2gognomebindings.dirs => x2gomatebindings.dirs} | 0 ...2gognomebindings.docs => x2gomatebindings.docs} | 0 debian/x2gomatebindings.install | 8 + debian/x2gomatebindings.lintian-overrides | 3 + ...bindings.manpages => x2gomatebindings.manpages} | 0 ...bindings.postinst => x2gomatebindings.postinst} | 32 +- ...nomebindings.postrm => x2gomatebindings.postrm} | 24 +- ...ognomebindings.prerm => x2gomatebindings.prerm} | 36 +- extension/Makefile.am | 18 +- extension/Makefile.in | 541 -------------------- ...2goumount-module.c => caja-x2goumount-module.c} | 18 +- extension/caja-x2goumount.c | 220 ++++++++ extension/caja-x2goumount.h | 57 +++ extension/nautilus-x2goumount.c | 221 -------- extension/nautilus-x2goumount.h | 55 -- ...ors-xml-ignore => 005_MATE-monitors-xml-ignore} | 6 +- man/man1/x2gocaja.1 | 22 + man/man1/x2gosuspend-session-caja.1 | 23 + man/man1/x2goumount-session-caja.1 | 23 + man/man8/x2gonautilus.8 | 22 - man/man8/x2gosuspend-session-gnome.8 | 23 - man/man8/x2goumount-session-gnome.8 | 23 - po/POTFILES.in | 2 +- po/de.po | 4 +- ...pdate-gnome-menu-x2go => update-mate-menu-x2go} | 47 +- share/applications/x2gocaja.desktop | 9 + share/applications/x2gonautilus.desktop | 10 - ...2gosuspend.desktop => x2gosuspend-mate.desktop} | 7 +- ...nome-mime-application-sshfscdrom-x2go-gnome.svg | 1 - ...gnome-mime-application-sshfsdisk-x2go-gnome.svg | 1 - ...-mime-application-sshfsremovable-x2go-gnome.svg | 1 - .../mate-mime-application-sshfscdrom-x2go-mate.svg | 1 + .../mate-mime-application-sshfsdisk-x2go-mate.svg | 1 + ...e-mime-application-sshfsremovable-x2go-mate.svg | 1 + .../{sshfs-x2go-gnome.xml => sshfs-x2go-mate.xml} | 12 +- ...s.features => x2goserver-matebindings.features} | 3 +- ...-settings-x2go.menu => mate-settings-x2go.menu} | 4 +- 49 files changed, 544 insertions(+), 1176 deletions(-) delete mode 100644 VERSION.x2gognomebindings create mode 100644 VERSION.x2gomatebindings rename bin/{x2gonautilus => x2gocaja} (86%) rename bin/{x2gosuspend-session-gnome => x2gosuspend-session-mate} (87%) rename bin/{x2goumount-session-gnome => x2goumount-session-mate} (85%) delete mode 100644 debian/x2gognomebindings.install delete mode 100644 debian/x2gognomebindings.lintian-overrides rename debian/{x2gognomebindings.dirs => x2gomatebindings.dirs} (100%) rename debian/{x2gognomebindings.docs => x2gomatebindings.docs} (100%) create mode 100644 debian/x2gomatebindings.install create mode 100644 debian/x2gomatebindings.lintian-overrides rename debian/{x2gognomebindings.manpages => x2gomatebindings.manpages} (100%) rename debian/{x2gognomebindings.postinst => x2gomatebindings.postinst} (68%) rename debian/{x2gognomebindings.postrm => x2gomatebindings.postrm} (68%) rename debian/{x2gognomebindings.prerm => x2gomatebindings.prerm} (63%) delete mode 100644 extension/Makefile.in rename extension/{nautilus-x2goumount-module.c => caja-x2goumount-module.c} (69%) create mode 100644 extension/caja-x2goumount.c create mode 100644 extension/caja-x2goumount.h delete mode 100644 extension/nautilus-x2goumount.c delete mode 100644 extension/nautilus-x2goumount.h rename lib/x2go/extensions/pre-runcommand.d/{005_GNOME-monitors-xml-ignore => 005_MATE-monitors-xml-ignore} (87%) create mode 100644 man/man1/x2gocaja.1 create mode 100644 man/man1/x2gosuspend-session-caja.1 create mode 100644 man/man1/x2goumount-session-caja.1 delete mode 100644 man/man8/x2gonautilus.8 delete mode 100644 man/man8/x2gosuspend-session-gnome.8 delete mode 100644 man/man8/x2goumount-session-gnome.8 rename sbin/{update-gnome-menu-x2go => update-mate-menu-x2go} (61%) create mode 100644 share/applications/x2gocaja.desktop delete mode 100644 share/applications/x2gonautilus.desktop rename share/applications/{x2gosuspend.desktop => x2gosuspend-mate.desktop} (56%) delete mode 120000 share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfscdrom-x2go-gnome.svg delete mode 120000 share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsdisk-x2go-gnome.svg delete mode 120000 share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsremovable-x2go-gnome.svg create mode 120000 share/icons/mate/scalable/mimetypes/mate-mime-application-sshfscdrom-x2go-mate.svg create mode 120000 share/icons/mate/scalable/mimetypes/mate-mime-application-sshfsdisk-x2go-mate.svg create mode 120000 share/icons/mate/scalable/mimetypes/mate-mime-application-sshfsremovable-x2go-mate.svg rename share/mime/packages/{sshfs-x2go-gnome.xml => sshfs-x2go-mate.xml} (58%) rename share/x2go/x2gofeature.d/{x2goserver-gnomebindings.features => x2goserver-matebindings.features} (90%) rename xdg-menus/{gnome-settings-x2go.menu => mate-settings-x2go.menu} (72%) The diff of changes is: diff --git a/VERSION b/VERSION index b2d03ec..e24fe27 120000 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -VERSION.x2gognomebindings \ No newline at end of file +VERSION.x2gomatebindings \ No newline at end of file diff --git a/VERSION.x2gognomebindings b/VERSION.x2gognomebindings deleted file mode 100644 index 8ffe039..0000000 --- a/VERSION.x2gognomebindings +++ /dev/null @@ -1 +0,0 @@ -2.0.1.7 diff --git a/VERSION.x2gomatebindings b/VERSION.x2gomatebindings new file mode 100644 index 0000000..0866607 --- /dev/null +++ b/VERSION.x2gomatebindings @@ -0,0 +1 @@ +0.0.1.0 diff --git a/bin/x2gonautilus b/bin/x2gocaja similarity index 86% rename from bin/x2gonautilus rename to bin/x2gocaja index 13c5fc3..03f69e8 100755 --- a/bin/x2gonautilus +++ b/bin/x2gocaja @@ -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,6 +19,7 @@ # # Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> # Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> +# Copyright (C) 2013 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> use strict; @@ -26,4 +27,4 @@ my $fname=shift; open(F,"<$fname") or die "can't open $fname"; my $dir=<F>; close(F); -system( "nautilus $dir" ); +system( "caja $dir" ); diff --git a/bin/x2gosuspend-session-gnome b/bin/x2gosuspend-session-mate similarity index 87% rename from bin/x2gosuspend-session-gnome rename to bin/x2gosuspend-session-mate index 10ae9b6..2e8ccfc 100755 --- a/bin/x2gosuspend-session-gnome +++ b/bin/x2gosuspend-session-mate @@ -1,6 +1,6 @@ #!/bin/bash -# 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,5 +19,6 @@ # # Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> # Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> +# Copyright (C) 2013 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> x2gosuspend-session $X2GO_SESSION diff --git a/bin/x2goumount-session-gnome b/bin/x2goumount-session-mate similarity index 85% rename from bin/x2goumount-session-gnome rename to bin/x2goumount-session-mate index 99366dd..93e89b6 100755 --- a/bin/x2goumount-session-gnome +++ b/bin/x2goumount-session-mate @@ -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,6 +19,7 @@ # # Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> # Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> +# Copyright (C) 2013 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> use strict; @@ -40,12 +41,12 @@ my $uname=$ENV{'USER'}; my $use_zenity=0; -if($ENV{'GNOME_DESKTOP_SESSION_ID'} ne "") +if($ENV{'MATE_DESKTOP_SESSION_ID'} ne "") { $use_zenity=1; } -if(system( "cd $tmp_dir && fusermount -u $dir && cd - >/dev/null" ) == 0) +if(system( "cd \"$tmp_dir\" && fusermount -u \"$dir\" && cd - 1>/dev/null" ) == 0) { unlink($fname); db_deletemount( $session, $dir); diff --git a/debian/changelog b/debian/changelog index b2e31ad..0825cfb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,87 +1,6 @@ -x2gognomebindings (2.0.2.0-0~x2go2) UNRELEASED; urgency=low +x2gomatebindings (0.0.1.0-0~x2go1) UNRELEASED; urgency=low - * New upstream version (2.0.2.0): - - Continue development (for GNOMEv2 and MATE). + * Initial upstream version (0.0.1.0): + - Starting x2gomatebindings as a fork of x2gognomebindings. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Mon, 31 Dec 2012 13:40:45 +0100 - -x2gognomebindings (2.0.1.7-0~x2go1) unstable; urgency=low - - * /debian/control: - + Maintainer change in package: X2Go Developers <x2go-dev@lists.berlios.de>. - + Priorty: optional. - + This package is a GNOME2-only package, so conflicting with gnome-session - (>= 3). (Fixes: #10). - - -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 24 Oct 2012 16:06:38 +0200 - -x2gognomebindings (2.0.1.6-0~x2go1) unstable; urgency=low - - * New upstream version (2.0.1.6): - - Make sure we run fusermount from within a directory that - the user has read access to. - * Depend on desktop-file-utils (postinst uses script - ,,update-desktop-database''). - - -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Mon, 02 Jul 2012 14:31:41 +0200 - -x2gognomebindings (2.0.1.5-0~x2go1) unstable; urgency=low - - * New upstream version (2.0.1.5): - - Let GNOME sessions started via X2Go ignore GNOME's monitor settings - in ~/.config/monitors.xml. - * Depend on x2goserver (>=3.1.0.2). Earlier versions have a bug in - x2goruncommand that let's execution of X2Go server extensions fail. - - -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sun, 15 Apr 2012 18:30:12 +0200 - -x2gognomebindings (2.0.1.4-0~x2go1) unstable; urgency=low - - * New upstream version (2.0.1.4): - - Apply implicit.diff patch from Jan Engelhardt (OpenSUSE). - - Add x2gofeature support (feature provided: X2GO_GNOMEBINDINGS). - - -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 22 Feb 2012 14:55:40 +0100 - -x2gognomebindings (2.0.1.3-0~x2go1) unstable; urgency=low - - * New upstream version (2.0.1.3): - - Move ,,x2goumount'' script into source project as ,,x2goumount-session-gnome''. - - Move x2gosuspend-session-gnome to /bin folder within source project. - - Add man pages for x2goumount-session-gnome, x2gosuspend-session-gnome. - - Add simple man page for x2gonautilus. - - Place x2go-suspend.desktop icon in GNOME Network submenu. - - Define unique MIME name spaces for X2go SSHFS GNOME icons. - - Rename sshfs.xml to sshfs-x2go-gnome.xml. - - Use desktop icon names that contain the name of the desktop session. - - Allow blanks in desktop icon names. - - Provide more GNOME'ish way to derive icon path name from GNOME object - URI. - - Let x2goumount-session-gnome be able to handle icons with blanks in - their name. - * Add gnome-menus as dependency. - * Now fully use debhelper for packaging. Fixed lintian issues. - * Use source format 3.0 (native). - * Add linitian-overrides an man pages to package. - * Depend on x2goserver (>=3.0.99.6). - - -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 12 Oct 2011 11:30:51 +0200 - -x2gognomebindings (2.0.1.2-0~x2go1) unstable; urgency=low - - * Adds x2goversion support - - -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sun, 29 May 2011 22:36:34 +0200 - -x2gognomebindings (2.0.1.1-0~x2go1) unstable; urgency=low - - * Changed upstream version numbering scheme - - -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Mon, 21 Mar 2011 23:21:56 +0100 - -x2gognomebindings (2.0.1-1) unstable; urgency=low - - * Initial release. - - -- Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> Wed, 27 Aug 2008 15:28:36 +0200 - diff --git a/debian/control b/debian/control index a0530f7..7b10b5e 100644 --- a/debian/control +++ b/debian/control @@ -1,5 +1,5 @@ -Source: x2gognomebindings -Section: gnome +Source: x2gomatebindings +Section: mate Priority: optional Maintainer: X2Go Developers <x2go-dev@lists.berlios.de> Uploaders: @@ -8,42 +8,40 @@ Uploaders: Build-Depends: autotools-dev, debhelper (>= 7.0.50~), - gnome-pkg-tools, + mate-common, intltool, - libglade2-dev (>= 2.4), - libglib2.0-dev (>= 2.4), - libgnome2-dev (>= 2.7), - libgnomeui-dev (>= 2.7), - libgtk2.0-dev (>= 2.4), - libnautilus-extension-dev (>= 2.14), + libcaja-extension-dev (>= 1.6.0), + libgnomevfs2-dev, pkg-config -Standards-Version: 3.9.2 -Homepage: http://code.x2go.org/releases/source/x2gognomebindings -Vcs-Git: git://code.x2go.org/x2gognomebindings.git -Vcs-Browser: http://code.x2go.org/gitweb?p=x2gognomebindings.git;a=summary +Standards-Version: 3.9.4 +Homepage: http://code.x2go.org/releases/source/x2gomatebindings +Vcs-Git: git://code.x2go.org/x2gomatebindings.git +Vcs-Browser: http://code.x2go.org/gitweb?p=x2gomatebindings.git;a=summary -Package: x2gognomebindings +Package: x2gomatebindings Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, - x2goserver (>=3.1.0.2-0~), + x2goserver (>=4.0.1.4-0~), x2goserver-extensions, zenity, - gnome-menus, - gnome-colors-common, + mate-menus, desktop-file-utils, - gnome-session (<< 3), + mate-session-manager (>= 1.6.0), Conflicts: - gnome-session (>= 3) -Description: Description: x2gognomebindings (GNOME mimetypes for X2go) - X2go is a server based computing environment with + x2gognomebindings (<< 2.0.2.0), +Breaks: + x2gognomebindings (<< 2.0.2.0), +Description: Description: x2gomatebindings (MATE mimetypes for X2Go) + X2Go is a server based computing environment with - session resuming - low bandwidth support - LDAP support - - client side mass storage mounting support + - client-side mass storage mounting support + - client-side printinh support - audio support - authentication by smartcard and USB stick . - x2gognomebindings contains MIME type information for X2go if used with - GNOME v2 desktops. This package cannot be installed on GNOME-3 desktops. + x2gomatebindings contains MIME type information for X2Go if used with + MATE desktops. diff --git a/debian/copyright b/debian/copyright index f93bbbe..b71dbb6 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,36 +1,37 @@ -This package was debianized by Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> on -Thu, 1 Feb 2007 14:11:03 +0100. - -It was downloaded from www.obviously-nice.de - -Upstream Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> - -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 Oleksandr Shneyder -oleksandr.shneyder@obviously-nice.de - -Copyright (C) 2007 Heinz-Markus Graesing -heinz-m.graesing@obviously-nice.de - -On Debian systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL'. - -The Debian packaging is (C) 2007, Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> and -is licensed under the GPL, see above. - +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: X2Go MATE Bindings +Upstream-Contact: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +Source: http://wiki.x2go.org + +Files: * +Copyright: + 2007-2011, Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> + 2007-2011, Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> + 20013, Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +License: GPL-2+ + +Files: debian/* +Copyright: 2013, Mike Gabriel <sunweaver@debian.org> +License: GPL-2+ + +License: GPL-2+ + 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 package; if not, write to the Free + Software Foundation, Inc., 51 Franklin St, Fifth Floor, + Boston, MA 02110-1301 USA + . + On Debian systems, the full text of the GNU General Public + License version 2 can be found in the file + `/usr/share/common-licenses/GPL-2'. diff --git a/debian/rules b/debian/rules index c4d4f8f..9e454c7 100755 --- a/debian/rules +++ b/debian/rules @@ -9,5 +9,5 @@ override_dh_auto_configure: dh_auto_configure override_dh_auto_install: - make -C po DESTDIR=../debian/x2gognomebindings install + make -C po DESTDIR=../debian/x2gomatebindings install dh_auto_install diff --git a/debian/x2gognomebindings.install b/debian/x2gognomebindings.install deleted file mode 100644 index 9a644df..0000000 --- a/debian/x2gognomebindings.install +++ /dev/null @@ -1,11 +0,0 @@ -bin/x2gosuspend-session-gnome usr/bin/ -bin/x2goumount-session-gnome usr/bin/ -bin/x2gonautilus usr/bin/ -sbin/update-gnome-menu-x2go usr/sbin/ -VERSION.x2gognomebindings usr/share/x2go/versions/ -# Installed into DESTDIR by Makefile -#extension/libnautilus-x2goumount.la usr/lib/nautilus/extensions-2.0/ -#extension/libnautilus-x2goumount.so usr/lib/nautilus/extensions-2.0/ -share/* usr/share/ -lib/* usr/lib/ -xdg-menus/* etc/xdg/menus/ \ No newline at end of file diff --git a/debian/x2gognomebindings.lintian-overrides b/debian/x2gognomebindings.lintian-overrides deleted file mode 100644 index ad92f39..0000000 --- a/debian/x2gognomebindings.lintian-overrides +++ /dev/null @@ -1,3 +0,0 @@ -x2gognomebindings: postinst-has-useless-call-to-ldconfig -x2gognomebindings: postrm-has-useless-call-to-ldconfig -x2gognomebindings: pkg-has-shlibs-control-file-but-no-actual-shared-libs diff --git a/debian/x2gognomebindings.dirs b/debian/x2gomatebindings.dirs similarity index 100% rename from debian/x2gognomebindings.dirs rename to debian/x2gomatebindings.dirs diff --git a/debian/x2gognomebindings.docs b/debian/x2gomatebindings.docs similarity index 100% rename from debian/x2gognomebindings.docs rename to debian/x2gomatebindings.docs diff --git a/debian/x2gomatebindings.install b/debian/x2gomatebindings.install new file mode 100644 index 0000000..2802203 --- /dev/null +++ b/debian/x2gomatebindings.install @@ -0,0 +1,8 @@ +bin/x2gosuspend-session-mate usr/bin/ +bin/x2goumount-session-mate usr/bin/ +bin/x2gonautilus usr/bin/ +sbin/update-mate-menu-x2go usr/sbin/ +VERSION.x2gomatebindings usr/share/x2go/versions/ +share/* usr/share/ +lib/* usr/lib/ +xdg-menus/* etc/xdg/menus/ \ No newline at end of file diff --git a/debian/x2gomatebindings.lintian-overrides b/debian/x2gomatebindings.lintian-overrides new file mode 100644 index 0000000..1b30077 --- /dev/null +++ b/debian/x2gomatebindings.lintian-overrides @@ -0,0 +1,3 @@ +x2gomatebindings: postinst-has-useless-call-to-ldconfig +x2gomatebindings: postrm-has-useless-call-to-ldconfig +x2gomatebindings: pkg-has-shlibs-control-file-but-no-actual-shared-libs diff --git a/debian/x2gognomebindings.manpages b/debian/x2gomatebindings.manpages similarity index 100% rename from debian/x2gognomebindings.manpages rename to debian/x2gomatebindings.manpages diff --git a/debian/x2gognomebindings.postinst b/debian/x2gomatebindings.postinst similarity index 68% rename from debian/x2gognomebindings.postinst rename to debian/x2gomatebindings.postinst index 4d973f4..386a887 100755 --- a/debian/x2gognomebindings.postinst +++ b/debian/x2gomatebindings.postinst @@ -1,5 +1,5 @@ #!/bin/sh -# postinst script for x2gognomebindings +# postinst script for x2gomatebindings # # see: dh_installdeb(1) @@ -19,20 +19,20 @@ set -e case "$1" in - configure) - update-gnome-menu-x2go - update-icon-caches /usr/share/icons/gnome - update-desktop-database - update-mime-database /usr/share/mime - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; + configure) + update-mate-menu-x2go + update-icon-caches /usr/share/icons/mate + update-desktop-database + update-mime-database /usr/share/mime + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; esac # dh_installdeb will replace this with shell code automatically @@ -41,5 +41,3 @@ esac #DEBHELPER# exit 0 - - diff --git a/debian/x2gognomebindings.postrm b/debian/x2gomatebindings.postrm similarity index 68% rename from debian/x2gognomebindings.postrm rename to debian/x2gomatebindings.postrm index c45f8cd..3334c70 100755 --- a/debian/x2gognomebindings.postrm +++ b/debian/x2gomatebindings.postrm @@ -1,5 +1,5 @@ #!/bin/sh -# postrm script for x2gognomebindings +# postrm script for x2gomatebindings # # see: dh_installdeb(1) @@ -20,16 +20,16 @@ set -e case "$1" in - purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - update-icon-caches /usr/share/icons/gnome - update-desktop-database - update-mime-database /usr/share/mime - ;; - - *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 1 - ;; + purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + update-icon-caches /usr/share/icons/mate + update-desktop-database + update-mime-database /usr/share/mime + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 + ;; esac # dh_installdeb will replace this with shell code automatically @@ -38,5 +38,3 @@ esac #DEBHELPER# exit 0 - - diff --git a/debian/x2gognomebindings.prerm b/debian/x2gomatebindings.prerm similarity index 63% rename from debian/x2gognomebindings.prerm rename to debian/x2gomatebindings.prerm index 9995a32..1efba26 100755 --- a/debian/x2gognomebindings.prerm +++ b/debian/x2gomatebindings.prerm @@ -18,24 +18,22 @@ set -e case "$1" in - remove|upgrade|deconfigure) - update-gnome-menu-x2go --remove - ### for ubuntu ### - if [ -d /usr/lib/nautilus/extensions-2.0 ] - then - rm /usr/lib/nautilus/extensions-2.0/libnautilus-x2goumount.la - rm /usr/lib/nautilus/extensions-2.0/libnautilus-x2goumount.so - fi - - ;; - - failed-upgrade) - ;; - - *) - echo "prerm called with unknown argument \`$1'" >&2 - exit 1 - ;; + remove|upgrade|deconfigure) + update-gnome-menu-x2go --remove + ### for ubuntu ### + #if [ -d /usr/lib/caja/extensions-2.0 ]; then + # rm /usr/lib/caja/extensions-2.0/libcaja-x2goumount.la + # rm /usr/lib/caja/extensions-2.0/libcaja-x2goumount.so + #fi + ;; + + failed-upgrade) + ;; + + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; esac # dh_installdeb will replace this with shell code automatically @@ -44,5 +42,3 @@ esac #DEBHELPER# exit 0 - - diff --git a/extension/Makefile.am b/extension/Makefile.am index aeba75b..ccfc9dd 100644 --- a/extension/Makefile.am +++ b/extension/Makefile.am @@ -1,14 +1,14 @@ INCLUDES = \ - $(NAUTILUS_X2GOUMOUNT_CFLAGS) + $(CAJA_X2GOUMOUNT_CFLAGS) -nautilus_extensiondir = $(NAUTILUS_EXTENSIONS_DIR) -nautilus_extension_LTLIBRARIES = libnautilus-x2goumount.la +caja_extensiondir = $(CAJA_EXTENSIONS_DIR) +caja_extension_LTLIBRARIES = libcaja-x2goumount.la -libnautilus_x2goumount_la_SOURCES = \ - nautilus-x2goumount.c \ - nautilus-x2goumount.h \ - nautilus-x2goumount-module.c +libcaja_x2goumount_la_SOURCES = \ + caja-x2goumount.c \ + caja-x2goumount.h \ + caja-x2goumount-module.c -libnautilus_x2goumount_la_LDFLAGS = -module -avoid-version -libnautilus_x2goumount_la_LIBADD = $(NAUTILUS_X2GOUMOUNT_LIBS) +libcaja_x2goumount_la_LDFLAGS = -module -avoid-version +libcaja_x2goumount_la_LIBADD = $(CAJA_X2GOUMOUNT_LIBS) diff --git a/extension/Makefile.in b/extension/Makefile.in deleted file mode 100644 index 5a27ae1..0000000 --- a/extension/Makefile.in +++ /dev/null @@ -1,541 +0,0 @@ -# Makefile.in generated by automake 1.10.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -subdir = extension -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(nautilus_extensiondir)" -nautilus_extensionLTLIBRARIES_INSTALL = $(INSTALL) -LTLIBRARIES = $(nautilus_extension_LTLIBRARIES) -am__DEPENDENCIES_1 = -libnautilus_x2goumount_la_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_libnautilus_x2goumount_la_OBJECTS = nautilus-x2goumount.lo \ - nautilus-x2goumount-module.lo -libnautilus_x2goumount_la_OBJECTS = \ - $(am_libnautilus_x2goumount_la_OBJECTS) -libnautilus_x2goumount_la_LINK = $(LIBTOOL) --tag=CC \ - $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(AM_CFLAGS) $(CFLAGS) $(libnautilus_x2goumount_la_LDFLAGS) \ - $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(libnautilus_x2goumount_la_SOURCES) -DIST_SOURCES = $(libnautilus_x2goumount_la_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ -ALL_LINGUAS = @ALL_LINGUAS@ -AMTAR = @AMTAR@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BINDIR = @BINDIR@ -CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DATADIR = @DATADIR@ -DATADIRNAME = @DATADIRNAME@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DSYMUTIL = @DSYMUTIL@ -ECHO = @ECHO@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -GCONFTOOL = @GCONFTOOL@ -GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ -GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -GLIB_REQUIRED = @GLIB_REQUIRED@ -GMOFILES = @GMOFILES@ -GMSGFMT = @GMSGFMT@ -GREP = @GREP@ -GTK_REQUIRED = @GTK_REQUIRED@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -INSTOBJEXT = @INSTOBJEXT@ -INTLLIBS = @INTLLIBS@ -INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@ -INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@ -INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@ -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@ -INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@ -INTLTOOL_MERGE = @INTLTOOL_MERGE@ -INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@ -INTLTOOL_PERL = @INTLTOOL_PERL@ -INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@ -INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@ -INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@ -INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@ -INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@ -INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@ -INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@ -INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@ -INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@ -INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@ -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@ -INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@ -INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -LOCALEDIR = @LOCALEDIR@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -MKINSTALLDIRS = @MKINSTALLDIRS@ -MSGFMT = @MSGFMT@ -MSGFMT_OPTS = @MSGFMT_OPTS@ -MSGMERGE = @MSGMERGE@ -NAUTILUS_EXTENSIONS_DIR = @NAUTILUS_EXTENSIONS_DIR@ -NAUTILUS_X2GOUMOUNT_CFLAGS = @NAUTILUS_X2GOUMOUNT_CFLAGS@ -NAUTILUS_X2GOUMOUNT_LIBS = @NAUTILUS_X2GOUMOUNT_LIBS@ -NMEDIT = @NMEDIT@ -OBJEXT = @OBJEXT@ -OPTIONAL_SUBDIR = @OPTIONAL_SUBDIR@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -PKG_CONFIG = @PKG_CONFIG@ -POFILES = @POFILES@ -POSUB = @POSUB@ -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -USE_NLS = @USE_NLS@ -VERSION = @VERSION@ -WARN_CFLAGS = @WARN_CFLAGS@ -XGETTEXT = @XGETTEXT@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_F77 = @ac_ct_F77@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -INCLUDES = \ - $(NAUTILUS_X2GOUMOUNT_CFLAGS) - -nautilus_extensiondir = $(NAUTILUS_EXTENSIONS_DIR) -nautilus_extension_LTLIBRARIES = libnautilus-x2goumount.la -libnautilus_x2goumount_la_SOURCES = \ - nautilus-x2goumount.c \ - nautilus-x2goumount.h \ - nautilus-x2goumount-module.c - -libnautilus_x2goumount_la_LDFLAGS = -module -avoid-version -libnautilus_x2goumount_la_LIBADD = $(NAUTILUS_X2GOUMOUNT_LIBS) -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu extension/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu extension/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install-nautilus_extensionLTLIBRARIES: $(nautilus_extension_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(nautilus_extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(nautilus_extensiondir)" - @list='$(nautilus_extension_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(nautilus_extensionLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(nautilus_extensiondir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(nautilus_extensionLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(nautilus_extensiondir)/$$f"; \ - else :; fi; \ - done - -uninstall-nautilus_extensionLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(nautilus_extension_LTLIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(nautilus_extensiondir)/$$p'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(nautilus_extensiondir)/$$p"; \ - done - -clean-nautilus_extensionLTLIBRARIES: - -test -z "$(nautilus_extension_LTLIBRARIES)" || rm -f $(nautilus_extension_LTLIBRARIES) - @list='$(nautilus_extension_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libnautilus-x2goumount.la: $(libnautilus_x2goumount_la_OBJECTS) $(libnautilus_x2goumount_la_DEPENDENCIES) - $(libnautilus_x2goumount_la_LINK) -rpath $(nautilus_extensiondir) $(libnautilus_x2goumount_la_OBJECTS) $(libnautilus_x2goumount_la_LIBADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-x2goumount-module.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nautilus-x2goumount.Plo@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LTLIBRARIES) -installdirs: - for dir in "$(DESTDIR)$(nautilus_extensiondir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool \ - clean-nautilus_extensionLTLIBRARIES mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: install-nautilus_extensionLTLIBRARIES - -install-dvi: install-dvi-am - -install-exec-am: - -install-html: install-html-am - -install-info: install-info-am - -install-man: - -install-pdf: install-pdf-am - -install-ps: install-ps-am - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-nautilus_extensionLTLIBRARIES - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-nautilus_extensionLTLIBRARIES ctags \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man \ - install-nautilus_extensionLTLIBRARIES install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am \ - uninstall-nautilus_extensionLTLIBRARIES - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/extension/nautilus-x2goumount-module.c b/extension/caja-x2goumount-module.c similarity index 69% rename from extension/nautilus-x2goumount-module.c rename to extension/caja-x2goumount-module.c index 8e75e45..430b02c 100644 --- a/extension/nautilus-x2goumount-module.c +++ b/extension/caja-x2goumount-module.c @@ -1,6 +1,8 @@ -/* Nautilus x2goumount +/* Caja x2goumount * Copyright (C) 2005 The GNOME Foundation - * + * Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> + * Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> + * Copyright (C) 2013 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> * * This Program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -21,10 +23,10 @@ #include <config.h> #include <stdio.h> #include <glib/gi18n-lib.h> -#include "nautilus-x2goumount.h" -void nautilus_module_initialize (GTypeModule*module) +#include "caja-x2goumount.h" +void caja_module_initialize (GTypeModule*module) { - nautilus_x2goumount_register_type (module); + caja_x2goumount_register_type (module); if(!bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR)) { printf("failed bind domain %s %s\n",GETTEXT_PACKAGE, LOCALEDIR); @@ -33,15 +35,15 @@ void nautilus_module_initialize (GTypeModule*module) textdomain(GETTEXT_PACKAGE); } -void nautilus_module_shutdown (void) +void caja_module_shutdown (void) { } -void nautilus_module_list_types (const GType **types, int *num_types) +void caja_module_list_types (const GType **types, int *num_types) { static GType type_list[1]; - type_list[0] = NAUTILUS_X2GOUMOUNT_TYPE; + type_list[0] = CAJA_X2GOUMOUNT_TYPE; *types = type_list; *num_types = 1; diff --git a/extension/caja-x2goumount.c b/extension/caja-x2goumount.c new file mode 100644 index 0000000..01fe882 --- /dev/null +++ b/extension/caja-x2goumount.c @@ -0,0 +1,220 @@ +/* Caja x2goumount + * Copyright (C) 2005 The GNOME Foundation + * Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> + * Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> + * Copyright (C) 2013 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> + * + * 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 Library; see the file COPYING. If not, + * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#include <config.h> +#include <glib/gi18n.h> +#include <string.h> +#include <libgnomevfs/gnome-vfs-utils.h> +#include <libgnomevfs/gnome-vfs-file-info.h> +#include <libgnomevfs/gnome-vfs-ops.h> +#include <caja/libcaja-extension/caja-extension-types.h> +#include <caja/libcaja-extension/caja-file-info.h> +#include <caja/libcaja-extension/caja-menu-provider.h> +#include "caja-x2goumount.h" + +static GObjectClass *parent_class = NULL; +static GType x2goumount_type = 0; + +GType caja_x2goumount_get_type (void) +{ + return x2goumount_type; +} + +#ifndef HAVE_CAJA_MENU_PROVIDER_EMIT_ITEMS_UPDATED_SIGNAL +static void caja_menu_provider_emit_items_updated_signal (CajaMenuProvider *provider) +{ +} +#endif + +static void caja_x2goumount_execute (CajaMenuItem *item) +{ + GList *files; + files = (GList*)g_object_get_data (G_OBJECT (item), "files"); + gchar* uri = caja_file_info_get_uri ((CajaFileInfo *)files->data); + gchar *file_path = g_filename_from_uri (uri, NULL, NULL); + char* cmd=malloc(strlen(file_path)+strlen("x2goumount-session-mate")); + strcpy(cmd,"x2goumount-session-mate "); + strcat(cmd, file_path); + g_spawn_command_line_async (cmd, NULL); + g_free (uri); + g_free (file_path); +} + +static const gchar* get_verified_icon_name (const gchar* icon_name) +{ + if (icon_name[0] == '/') + { + if (!g_file_test (icon_name, G_FILE_TEST_IS_REGULAR)) + { + return NULL; + } + } + else if (strlen (icon_name) == 0) + { + return NULL; + } + + return icon_name; +} + +static CajaMenuItem *caja_x2goumount_create_menu_item (GList *files) +{ + CajaMenuItem *item; + + + item = caja_menu_item_new ("CajaX2GoUmount::umount", + _("Unmount SSHFS Drive"), + _("Unmount SSHFS Drive"), + 0l); + + g_signal_connect_data (item, + "activate", + G_CALLBACK (caja_x2goumount_execute), + 0, + 0, + 0); + + g_object_set_data_full (G_OBJECT (item), + "files", + caja_file_info_list_copy (files), + (GDestroyNotify) caja_file_info_list_free); + return item; +} + +static GList *caja_x2goumount_get_file_items (CajaMenuProvider *provider, GtkWidget *window, GList *files) +{ + GList *items = NULL; + int create_menu=FALSE; + int f_items=0; + CajaMenuItem *item; + CajaX2GoUmount* self = CAJA_X2GOUMOUNT (provider); + + g_return_val_if_fail (CAJA_IS_X2GOUMOUNT (self), NULL); + + + if (!self->dispose_has_run) + { + GList* iter1; + for (iter1 = files; iter1; iter1 = iter1->next) + { + f_items++; + gchar* tmp_filename = caja_file_info_get_name ((CajaFileInfo *)iter1->data); + if (tmp_filename) + { + gchar* tmp_mimetype = caja_file_info_get_mime_type ((CajaFileInfo *)iter1->data); + if(strstr(tmp_mimetype,"sshfs")) + { + create_menu=TRUE; + } + g_free (tmp_filename); + g_free (tmp_mimetype); + } + } + if( f_items==1 && create_menu) + { + item = caja_x2goumount_create_menu_item (files); + items = g_list_append (items, item); + } + } + return items; +} + +static GList *caja_x2goumount_get_background_items (CajaMenuProvider *provider, GtkWidget *window, CajaFileInfo *current_folder) +{ + GList *items = NULL; + GList *files = NULL; + + files = g_list_append (files, current_folder); + items = caja_x2goumount_get_file_items (provider, window, files); + g_list_free (files); + + return items; +} + +static void caja_x2goumount_instance_dispose (GObject *obj) +{ + Caja2GoUmount* self = CAJA_X2GOUMOUNT (obj); + + if (!self->dispose_has_run) + { + self->dispose_has_run = TRUE; + G_OBJECT_CLASS (parent_class)->dispose (obj); + } +} + + +static void caja_x2goumount_instance_finalize (GObject* obj) +{ + G_OBJECT_CLASS (parent_class)->finalize (obj); +} + +static void caja_x2goumount_class_init (CajaX2GoUmountClass *x2goumount_class) +{ + GObjectClass *gobject_class = G_OBJECT_CLASS (x2goumount_class); + gobject_class->dispose = caja_x2goumount_instance_dispose; + gobject_class->finalize = caja_x2goumount_instance_finalize; +} + +static void caja_x2goumount_instance_init (GTypeInstance *instance, gpointer klass) +{ + CajaX2GoUmount* self = CAJA_X2GOUMOUNT (instance); + self->dispose_has_run = FALSE; + parent_class = g_type_class_peek_parent (klass); +} + +static void caja_x2goumount_menu_provider_iface_init (CajaMenuProviderIface *iface) +{ + iface->get_file_items = caja_x2goumount_get_file_items; + iface->get_background_items = caja_x2goumount_get_background_items; +} + +void caja_x2goumount_register_type (GTypeModule *module) +{ + static const GTypeInfo info = { + sizeof (CajaX2GoUmountClass), + (GBaseInitFunc) NULL, + (GBaseFinalizeFunc) NULL, + (GClassInitFunc) caja_x2goumount_class_init, + NULL, + NULL, + sizeof (CajaX2GoUmount), + 0, + (GInstanceInitFunc)caja_x2goumount_instance_init, + }; + + static const GInterfaceInfo menu_provider_iface_info = { + (GInterfaceInitFunc) caja_x2goumount_menu_provider_iface_init, + NULL, + NULL + }; + + x2goumount_type = g_type_module_register_type (module, + G_TYPE_OBJECT, + "CajaX2GoUmount", + &info, 0); + + g_type_module_add_interface (module, + x2goumount_type, + CAJA_TYPE_MENU_PROVIDER, + &menu_provider_iface_info); +} + diff --git a/extension/caja-x2goumount.h b/extension/caja-x2goumount.h new file mode 100644 index 0000000..cd539d3 --- /dev/null +++ b/extension/caja-x2goumount.h @@ -0,0 +1,57 @@ +/* Caja x2goumount + * Copyright (C) 2005 The GNOME Foundation + * Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> + * Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> + * Copyright (C) 2013 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> + * + * 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 Library; see the file COPYING. If not, + * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifndef CAJA_X2GOUMOUNT_H +#define CAJA_X2GOUMOUNT_H + +#include <glib-object.h> + +G_BEGIN_DECLS + +#define CAJA_X2GOUMOUNT_TYPE (caja_x2goumount_get_type ()) +#define CAJA_X2GOUMOUNT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CAJA_X2GOUMOUNT_TYPE, CajaX2GoUmount)) +#define CAJA_X2GOUMOUNT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CAJA_X2GOUMOUNT_TYPE, CajaX2GoUmountClass)) +#define CAJA_IS_X2GOUMOUNT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), CAJA_X2GOUMOUNT_TYPE)) +#define CAJA_IS_X2GOUMOUNT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CAJA_X2GOUMOUNT_TYPE)) +#define CAJA_X2GOUMOUNT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((obj), CAJA_X2GOUMOUNT_TYPE, CajaX2GoUmountClass)) + +typedef struct _CajaX2GoUmount CajaX2GoUmount; +typedef struct _CajaX2GoUmountClass CajaX2GoUmountClass; + +struct _CajaX2GoUmount +{ + GObject __parent; + gboolean dispose_has_run; +}; + +struct _CajaX2GoUmountClass +{ + GObjectClass __parent; +}; + +GType caja_x2goumount_get_type (void); +void caja_x2goumount_register_type (GTypeModule *module); + +G_END_DECLS + +#endif /* CAJA_X2GOUMOUNT_H */ + diff --git a/extension/nautilus-x2goumount.c b/extension/nautilus-x2goumount.c deleted file mode 100644 index 081abbe..0000000 --- a/extension/nautilus-x2goumount.c +++ /dev/null @@ -1,221 +0,0 @@ -/* Nautilus x2goumount - * Copyright (C) 2005 The GNOME Foundation - * - * 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 Library; see the file COPYING. If not, - * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include <config.h> -#include <glib/gi18n.h> -#include <string.h> -#include <libgnomevfs/gnome-vfs-utils.h> -#include <libgnomevfs/gnome-vfs-file-info.h> -#include <libgnomevfs/gnome-vfs-ops.h> -#include <nautilus/libnautilus-extension/nautilus-extension-types.h> -#include <nautilus/libnautilus-extension/nautilus-file-info.h> -#include <nautilus/libnautilus-extension/nautilus-menu-provider.h> -#include "nautilus-x2goumount.h" - -static GObjectClass *parent_class = NULL; -static GType x2goumount_type = 0; - -GType nautilus_x2goumount_get_type (void) -{ - return x2goumount_type; -} - -#ifndef HAVE_NAUTILUS_MENU_PROVIDER_EMIT_ITEMS_UPDATED_SIGNAL -static void nautilus_menu_provider_emit_items_updated_signal (NautilusMenuProvider *provider) -{ -} -#endif - -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); - gchar *file_path = g_filename_from_uri (uri, NULL, NULL); - char* cmd=malloc(strlen(file_path)+strlen("x2goumount-session-gnome")); - strcpy(cmd,"x2goumount-session-gnome "); - strcat(cmd, file_path); - g_spawn_command_line_async (cmd, NULL); - g_free (uri); - g_free (file_path); -} - -static const gchar* get_verified_icon_name (const gchar* icon_name) -{ - if (icon_name[0] == '/') - { - if (!g_file_test (icon_name, G_FILE_TEST_IS_REGULAR)) - { - return NULL; - } - } - else if (strlen (icon_name) == 0) - { - return NULL; - } - - return icon_name; -} - -static NautilusMenuItem *nautilus_x2goumount_create_menu_item (GList *files) -{ - NautilusMenuItem *item; - - - item = nautilus_menu_item_new ("NautilusX2goumount::umount", - _("Umount SSHFS Drive"), - _("Umount SSHFS Drive"), - 0l); - - g_signal_connect_data (item, - "activate", - G_CALLBACK (nautilus_x2goumount_execute), - 0, - 0, - 0); - - g_object_set_data_full (G_OBJECT (item), - "files", - nautilus_file_info_list_copy (files), - (GDestroyNotify) nautilus_file_info_list_free); - - - - return item; -} - -static GList *nautilus_x2goumount_get_file_items (NautilusMenuProvider *provider, GtkWidget *window, GList *files) -{ - GList *items = NULL; - int create_menu=FALSE; - int f_items=0; - NautilusMenuItem *item; - NautilusX2goumount* self = NAUTILUS_X2GOUMOUNT (provider); - - g_return_val_if_fail (NAUTILUS_IS_X2GOUMOUNT (self), NULL); - - - if (!self->dispose_has_run) - { - GList* iter1; - for (iter1 = files; iter1; iter1 = iter1->next) - { - f_items++; - gchar* tmp_filename = nautilus_file_info_get_name ((NautilusFileInfo *)iter1->data); - if (tmp_filename) - { - gchar* tmp_mimetype = nautilus_file_info_get_mime_type ((NautilusFileInfo *)iter1->data); - if(strstr(tmp_mimetype,"sshfs")) - { - create_menu=TRUE; - } - g_free (tmp_filename); - g_free (tmp_mimetype); - } - } - if( f_items==1 && create_menu) - { - item = nautilus_x2goumount_create_menu_item (files); - items = g_list_append (items, item); - } - } - return items; -} - -static GList *nautilus_x2goumount_get_background_items (NautilusMenuProvider *provider, GtkWidget *window, NautilusFileInfo *current_folder) -{ - GList *items = NULL; - GList *files = NULL; - - files = g_list_append (files, current_folder); - items = nautilus_x2goumount_get_file_items (provider, window, files); - g_list_free (files); - - return items; -} - -static void nautilus_x2goumount_instance_dispose (GObject *obj) -{ - NautilusX2goumount* self = NAUTILUS_X2GOUMOUNT (obj); - - if (!self->dispose_has_run) - { - self->dispose_has_run = TRUE; - G_OBJECT_CLASS (parent_class)->dispose (obj); - } -} - - -static void nautilus_x2goumount_instance_finalize (GObject* obj) -{ - G_OBJECT_CLASS (parent_class)->finalize (obj); -} - -static void nautilus_x2goumount_class_init (NautilusX2goumountClass *x2goumount_class) -{ - GObjectClass *gobject_class = G_OBJECT_CLASS (x2goumount_class); - gobject_class->dispose = nautilus_x2goumount_instance_dispose; - gobject_class->finalize = nautilus_x2goumount_instance_finalize; -} - -static void nautilus_x2goumount_instance_init (GTypeInstance *instance, gpointer klass) -{ - NautilusX2goumount* self = NAUTILUS_X2GOUMOUNT (instance); - self->dispose_has_run = FALSE; - parent_class = g_type_class_peek_parent (klass); -} - -static void nautilus_x2goumount_menu_provider_iface_init (NautilusMenuProviderIface *iface) -{ - iface->get_file_items = nautilus_x2goumount_get_file_items; - iface->get_background_items = nautilus_x2goumount_get_background_items; -} - -void nautilus_x2goumount_register_type (GTypeModule *module) -{ - static const GTypeInfo info = { - sizeof (NautilusX2goumountClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) nautilus_x2goumount_class_init, - NULL, - NULL, - sizeof (NautilusX2goumount), - 0, - (GInstanceInitFunc)nautilus_x2goumount_instance_init, - }; - - static const GInterfaceInfo menu_provider_iface_info = { - (GInterfaceInitFunc) nautilus_x2goumount_menu_provider_iface_init, - NULL, - NULL - }; - - x2goumount_type = g_type_module_register_type (module, - G_TYPE_OBJECT, - "NautilusX2goumount", - &info, 0); - - g_type_module_add_interface (module, - x2goumount_type, - NAUTILUS_TYPE_MENU_PROVIDER, - &menu_provider_iface_info); - -} - diff --git a/extension/nautilus-x2goumount.h b/extension/nautilus-x2goumount.h deleted file mode 100644 index 46c3426..0000000 --- a/extension/nautilus-x2goumount.h +++ /dev/null @@ -1,55 +0,0 @@ -/* Nautilus x2goumount - * Copyright (C) 2005 The GNOME Foundation - * - * - * 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 Library; see the file COPYING. If not, - * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef NAUTILUS_X2GOUMOUNT_H -#define NAUTILUS_X2GOUMOUNT_H - -#include <glib-object.h> - -G_BEGIN_DECLS - -#define NAUTILUS_X2GOUMOUNT_TYPE (nautilus_x2goumount_get_type ()) -#define NAUTILUS_X2GOUMOUNT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), NAUTILUS_X2GOUMOUNT_TYPE, NautilusX2goumount)) -#define NAUTILUS_X2GOUMOUNT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NAUTILUS_X2GOUMOUNT_TYPE, NautilusX2goumountClass)) -#define NAUTILUS_IS_X2GOUMOUNT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), NAUTILUS_X2GOUMOUNT_TYPE)) -#define NAUTILUS_IS_X2GOUMOUNT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NAUTILUS_X2GOUMOUNT_TYPE)) -#define NAUTILUS_X2GOUMOUNT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((obj), NAUTILUS_X2GOUMOUNT_TYPE, NautilusX2goumountClass)) - -typedef struct _NautilusX2goumount NautilusX2goumount; -typedef struct _NautilusX2goumountClass NautilusX2goumountClass; - -struct _NautilusX2goumount -{ - GObject __parent; - gboolean dispose_has_run; -}; - -struct _NautilusX2goumountClass -{ - GObjectClass __parent; -}; - -GType nautilus_x2goumount_get_type (void); -void nautilus_x2goumount_register_type (GTypeModule *module); - -G_END_DECLS - -#endif /* NAUTILUS_X2GOUMOUNT_H */ - diff --git a/lib/x2go/extensions/pre-runcommand.d/005_GNOME-monitors-xml-ignore b/lib/x2go/extensions/pre-runcommand.d/005_MATE-monitors-xml-ignore similarity index 87% rename from lib/x2go/extensions/pre-runcommand.d/005_GNOME-monitors-xml-ignore rename to lib/x2go/extensions/pre-runcommand.d/005_MATE-monitors-xml-ignore index c8d416a..2f77bed 100755 --- a/lib/x2go/extensions/pre-runcommand.d/005_GNOME-monitors-xml-ignore +++ b/lib/x2go/extensions/pre-runcommand.d/005_MATE-monitors-xml-ignore @@ -17,12 +17,12 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2012 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# Copyright (C) 2012-2013 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> X2GO_SESSION=$1 -# GNOME's monitors.xml breaks full screen mode of X2Go/NX -if echo $X2GO_SESSION | egrep "$USER-[[:digit:]]{2,}-[[:digit:]]+_stDGNOME_dp.*" >/dev/null; then +# MATE's monitors.xml breaks full screen mode of X2Go/NX +if echo $X2GO_SESSION | egrep "$USER-[[:digit:]]{2,}-[[:digit:]]+_stDMATE_dp.*" >/dev/null; then test -w ~/.config/monitors.xml && mv ~/.config/monitors.xml ~/.config/monitors.xml.disabled-for-X2Go-session-start (sleep 20; test -w ~/.config/monitors.xml.disabled-for-X2Go-session-start && mv ~/.config/monitors.xml.disabled-for-X2Go-session-start ~/.config/monitors.xml;)& fi diff --git a/man/man1/x2gocaja.1 b/man/man1/x2gocaja.1 new file mode 100644 index 0000000..fe0df86 --- /dev/null +++ b/man/man1/x2gocaja.1 @@ -0,0 +1,22 @@ +'\" -*- 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 x2gocaja 1 "July 2013" "Version 0.0.1.x" "X2Go MATE Bindings" +.SH NAME +x2gocaja \- X2Go MATE Wrapper for Browsing X2Go Shared Folders with Caja +.SH SYNOPSIS +'nh +.fi +.ad l +\fBx2gocaja\fR \fI<path>\fR + +.SH DESCRIPTION +\fBx2gocaja\fR is a component of the X2Go MATE bindings and a simple wrapper for MATE's +file manager Caja when browsing X2Go client-side shared folders. +.SH AUTHOR +This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> for the X2Go project +(http://www.x2go.org). diff --git a/man/man1/x2gosuspend-session-caja.1 b/man/man1/x2gosuspend-session-caja.1 new file mode 100644 index 0000000..9776535 --- /dev/null +++ b/man/man1/x2gosuspend-session-caja.1 @@ -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-mate 1 "July 2013" "Version 0.0.1.x" "X2Go MATE Bindings" +.SH NAME +x2gosuspend-session-mate \- Suspend X2Go Sessions from MATE Menu +.SH SYNOPSIS +'nh +.fi +.ad l +\fBx2gosuspend-session-mate\fR + +.SH DESCRIPTION +\fBx2gosuspend-session-mate\fR is a component of the X2Go MATE bindings and a simple wrapper around the X2Go Server +script ,,x2gosuspend-session'' for suspending the current X2Go session. +.PP +.SH AUTHOR +This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> for the X2Go project +(http://www.x2go.org). diff --git a/man/man1/x2goumount-session-caja.1 b/man/man1/x2goumount-session-caja.1 new file mode 100644 index 0000000..de800e4 --- /dev/null +++ b/man/man1/x2goumount-session-caja.1 @@ -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-mate 1 "July 2013" "Version 2.0.2.x" "X2Go MATE Bindings" +.SH NAME +x2goumount-session-mate \- MATE Binding for X2Go Server: Unmount shared folder via Caja +.SH SYNOPSIS +'nh +.fi +.ad l +\fBx2goumount-session-mate\fR \fI<mount-point> <session-id>\fR + +.SH DESCRIPTION +\fBx2goumount-session-mate\fR is a component of the X2Go MATE bindings. It is run if a user selects the ,,Unmount'' +action in the right-click context menu of X2Go shared folder icons on the MATE desktop. +.PP +.SH AUTHOR +This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> for the X2Go project +(http://www.x2go.org). diff --git a/man/man8/x2gonautilus.8 b/man/man8/x2gonautilus.8 deleted file mode 100644 index d99667f..0000000 --- a/man/man8/x2gonautilus.8 +++ /dev/null @@ -1,22 +0,0 @@ -'\" -*- 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 x2gonautilus 8 "18 May 2011" "Version 3.0.99.x" "X2go GNOME Bindings" -.SH NAME -x2gonautilus \- X2go GNOME Wrapper for Browsing X2go Shared Folders with Nautilus -.SH SYNOPSIS -'nh -.fi -.ad l -x2gonautilus <path> - -.SH DESCRIPTION -\fBx2gonautilus\fR is a component of the X2go GNOME bindings and a simple wrapper GNOME's Nautilus -file browser for X2go-base shared folders. -.SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> for the X2go project -(http://www.x2go.org). diff --git a/man/man8/x2gosuspend-session-gnome.8 b/man/man8/x2gosuspend-session-gnome.8 deleted file mode 100644 index 749b7a9..0000000 --- a/man/man8/x2gosuspend-session-gnome.8 +++ /dev/null @@ -1,23 +0,0 @@ -'\" -*- 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@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 deleted file mode 100644 index f8d50ea..0000000 --- a/man/man8/x2goumount-session-gnome.8 +++ /dev/null @@ -1,23 +0,0 @@ -'\" -*- 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@das-netzwerkteam.de> for the X2go project -(http://www.x2go.org). diff --git a/po/POTFILES.in b/po/POTFILES.in index dba3931..f84de3e 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1 +1 @@ -extension/nautilus-x2goumount.c +extension/caja-x2goumount.c diff --git a/po/de.po b/po/de.po index 6b2c0f0..68b7bf8 100644 --- a/po/de.po +++ b/po/de.po @@ -16,6 +16,6 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -#: ../extension/nautilus-x2goumount.c:77 ../extension/nautilus-x2goumount.c:78 -msgid "Umount SSHFS Drive" +#: ../extension/caja-x2goumount.c:77 ../extension/caja-x2goumount.c:78 +msgid "Unmount SSHFS Drive" msgstr "Laufwerkeinbindung lösen" diff --git a/sbin/update-gnome-menu-x2go b/sbin/update-mate-menu-x2go similarity index 61% rename from sbin/update-gnome-menu-x2go rename to sbin/update-mate-menu-x2go index 9d4de0f..30ff981 100755 --- a/sbin/update-gnome-menu-x2go +++ b/sbin/update-mate-menu-x2go @@ -19,6 +19,7 @@ # # Copyright (C) 2007-2011 Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> # Copyright (C) 2007-2011 Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> +# Copyright (C) 2013 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> use strict; @@ -26,24 +27,20 @@ my $mode=shift; if( $mode eq "--help" ) { print "Usage: $0 [--remove]\n"; - print " Add or remove \"Suspend X2Go session\" button to gnome-settings menu \n"; + print " Add (or remove) \"Suspend X2Go session\" button to (from) MATE's Settings menu.\n"; exit; } my $menu; -if ( -e "/etc/xdg/menus/gnome-settings.menu" ) +if ( -e "/etc/xdg/menus/mate-settings.menu" ) { - $menu="/etc/xdg/menus/gnome-settings.menu"; -} -elsif ( -e "/etc/xdg/menus/settings.menu" ) -{ - $menu="/etc/xdg/menus/settings.menu"; + $menu="/etc/xdg/menus/mate-settings.menu"; } else { - die "Settings menu not found in /etc/xdg/menus"; + die "MATE Settings menu not found in /etc/xdg/menus"; } -my $menustr="<MergeFile>/etc/xdg/menus/gnome-settings-x2go.menu</MergeFile>\n"; +my $menustr="<MergeFile>/etc/xdg/menus/mate-settings-x2go.menu</MergeFile>\n"; open(FILE,"<$menu"); my @ln=<FILE>; @@ -51,22 +48,22 @@ close(FILE); my $text=join("",@ln); if( $mode eq "--remove" ) -{ - if($text =~ m/$menustr/) - { - $text =~ s/\n$menustr//; - open(FILE,">$menu"); - print FILE $text; - close(FILE); - } +{ + if($text =~ m/$menustr/) + { + $text =~ s/\n$menustr//; + open(FILE,">$menu"); + print FILE $text; + close(FILE); + } } else { - if(! ($text =~ m/$menustr/)) - { - $text =~ s/<\/Layout>/<\/Layout>\n$menustr/; - open(FILE,">$menu"); - print FILE $text; - close(FILE); - } -} \ No newline at end of file + if(! ($text =~ m/$menustr/)) + { + $text =~ s/<\/Layout>/<\/Layout>\n$menustr/; + open(FILE,">$menu"); + print FILE $text; + close(FILE); + } +} diff --git a/share/applications/x2gocaja.desktop b/share/applications/x2gocaja.desktop new file mode 100644 index 0000000..8532e38 --- /dev/null +++ b/share/applications/x2gocaja.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=x2gocaja +MimeType=application/sshfsdisk-x2go-mate;application/sshfscdrom-x2go-mate;application/sshfsremovable-x2go-mate +Exec=x2gocaja %f +Type=Application +Terminal=false +NoDisplay=true +Icon=file-manager + diff --git a/share/applications/x2gonautilus.desktop b/share/applications/x2gonautilus.desktop deleted file mode 100644 index c653e6d..0000000 --- a/share/applications/x2gonautilus.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=x2gonautilus -MimeType=application/sshfsdisk-x2go-gnome;application/sshfscdrom-x2go-gnome;application/sshfsremovable-x2go-gnome -Exec=x2gonautilus %f -Type=Application -Terminal=false -NoDisplay=true -Icon=file-manager - diff --git a/share/applications/x2gosuspend.desktop b/share/applications/x2gosuspend-mate.desktop similarity index 56% rename from share/applications/x2gosuspend.desktop rename to share/applications/x2gosuspend-mate.desktop index 65745e8..c8716b0 100644 --- a/share/applications/x2gosuspend.desktop +++ b/share/applications/x2gosuspend-mate.desktop @@ -1,10 +1,9 @@ [Desktop Entry] -Encoding=UTF-8 Name=Suspend X2Go session Name[de]=X2Go Sitzung unterbrechen Icon=exit -Exec=x2gosuspend-session-gnome +Exec=x2gosuspend-session-mate Terminal=false Type=Application -Categories=GNOME;GTK;Network -OnlyShowIn=GNOME; +Categories=MATE;GTK;Network +OnlyShowIn=MATE; diff --git a/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfscdrom-x2go-gnome.svg b/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfscdrom-x2go-gnome.svg deleted file mode 120000 index 20f78dd..0000000 --- a/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfscdrom-x2go-gnome.svg +++ /dev/null @@ -1 +0,0 @@ -/usr/share/icons/gnome-colors-common/scalable/devices/drive-optical.svg \ No newline at end of file diff --git a/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsdisk-x2go-gnome.svg b/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsdisk-x2go-gnome.svg deleted file mode 120000 index 3a2e8f9..0000000 --- a/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsdisk-x2go-gnome.svg +++ /dev/null @@ -1 +0,0 @@ -/usr/share/icons/gnome-colors-common/scalable/devices/drive-harddisk.svg \ No newline at end of file diff --git a/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsremovable-x2go-gnome.svg b/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsremovable-x2go-gnome.svg deleted file mode 120000 index 7ca88a1..0000000 --- a/share/icons/gnome/scalable/mimetypes/gnome-mime-application-sshfsremovable-x2go-gnome.svg +++ /dev/null @@ -1 +0,0 @@ -/usr/share/icons/gnome-colors-common/scalable/devices/drive-removable-media.svg \ No newline at end of file diff --git a/share/icons/mate/scalable/mimetypes/mate-mime-application-sshfscdrom-x2go-mate.svg b/share/icons/mate/scalable/mimetypes/mate-mime-application-sshfscdrom-x2go-mate.svg new file mode 120000 index 0000000..3e5bac2 --- /dev/null +++ b/share/icons/mate/scalable/mimetypes/mate-mime-application-sshfscdrom-x2go-mate.svg @@ -0,0 +1 @@ +/usr/share/icons/ContrastHigh-SVG/scalable/devices/drive-optical.svg \ No newline at end of file diff --git a/share/icons/mate/scalable/mimetypes/mate-mime-application-sshfsdisk-x2go-mate.svg b/share/icons/mate/scalable/mimetypes/mate-mime-application-sshfsdisk-x2go-mate.svg new file mode 120000 index 0000000..44eb608 --- /dev/null +++ b/share/icons/mate/scalable/mimetypes/mate-mime-application-sshfsdisk-x2go-mate.svg @@ -0,0 +1 @@ +/usr/share/icons/ContrastHigh-SVG/scalable/devices/drive-harddisk.svg \ No newline at end of file diff --git a/share/icons/mate/scalable/mimetypes/mate-mime-application-sshfsremovable-x2go-mate.svg b/share/icons/mate/scalable/mimetypes/mate-mime-application-sshfsremovable-x2go-mate.svg new file mode 120000 index 0000000..29db1f2 --- /dev/null +++ b/share/icons/mate/scalable/mimetypes/mate-mime-application-sshfsremovable-x2go-mate.svg @@ -0,0 +1 @@ +/usr/share/icons/ContrastHigh-SVG/scalable/devices/drive-removable-media.svg \ No newline at end of file diff --git a/share/mime/packages/sshfs-x2go-gnome.xml b/share/mime/packages/sshfs-x2go-mate.xml similarity index 58% rename from share/mime/packages/sshfs-x2go-gnome.xml rename to share/mime/packages/sshfs-x2go-mate.xml index 506101e..3b327a7 100644 --- a/share/mime/packages/sshfs-x2go-gnome.xml +++ b/share/mime/packages/sshfs-x2go-mate.xml @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info"> - <mime-type type="application/sshfscdrom-x2go-gnome"> + <mime-type type="application/sshfscdrom-x2go-mate"> <comment>SSHFS CDROM</comment> <comment xml:lang="de">SSHFS CDROM</comment> - <glob pattern="* (sshfs-cdrom-gnome)"/> + <glob pattern="* (sshfs-cdrom-mate)"/> </mime-type> - <mime-type type="application/sshfsdisk-x2go-gnome"> + <mime-type type="application/sshfsdisk-x2go-mate"> <comment>SSHFS Disk</comment> <comment xml:lang="de">SSHFS Freigabe</comment> - <glob pattern="* (sshfs-disk-gnome)"/> + <glob pattern="* (sshfs-disk-mate)"/> </mime-type> - <mime-type type="application/sshfsremovable-x2go-gnome"> + <mime-type type="application/sshfsremovable-x2go-mate"> <comment>SSHFS Removable</comment> <comment xml:lang="de">SSHFS Gerät</comment> - <glob pattern="* (sshfs-removable-gnome)"/> + <glob pattern="* (sshfs-removable-mate)"/> </mime-type> </mime-info> diff --git a/share/x2go/x2gofeature.d/x2goserver-gnomebindings.features b/share/x2go/x2gofeature.d/x2goserver-matebindings.features similarity index 90% rename from share/x2go/x2gofeature.d/x2goserver-gnomebindings.features rename to share/x2go/x2gofeature.d/x2goserver-matebindings.features index fb25030..3df4209 100755 --- a/share/x2go/x2gofeature.d/x2goserver-gnomebindings.features +++ b/share/x2go/x2gofeature.d/x2goserver-matebindings.features @@ -19,6 +19,7 @@ # # Copyright (C) 2011 Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> # Copyright (C) 2011 Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> +# Copyright (C) 2011-2013 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go` @@ -29,7 +30,7 @@ X2GO_FEATURE=$1 # check for X2go server core features case "$X2GO_FEATURE" in - "X2GO_GNOMEBINDINGS") echo "ok"; exit 0;; + "X2GO_MATEBINDINGS") echo "ok"; exit 0;; *) exit -1;; esac diff --git a/xdg-menus/gnome-settings-x2go.menu b/xdg-menus/mate-settings-x2go.menu similarity index 72% rename from xdg-menus/gnome-settings-x2go.menu rename to xdg-menus/mate-settings-x2go.menu index 0f7207c..637b918 100644 --- a/xdg-menus/gnome-settings-x2go.menu +++ b/xdg-menus/mate-settings-x2go.menu @@ -2,12 +2,12 @@ <Menu> <Name>Desktop</Name> <Include> - <Filename>x2gosuspend.desktop</Filename> + <Filename>x2gosuspend-mate.desktop</Filename> </Include> <Layout> <Merge type="menus"/> <Separator/> - <Filename>x2gosuspend.desktop</Filename> + <Filename>x2gosuspend-mate.desktop</Filename> <Merge type="files"/> </Layout> </Menu> 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).