x2go-commits July 2013

x2go-commits@lists.x2go.org

2 participants
625 discussions

x2golxdebindings.git - build-main (branch) updated: 1.0.1.3-6-g6d4f031
by git-admin＠x2go.org 28 Jul '13

28 Jul '13

The branch, build-main has been updated via 6d4f031cb799b284f4c21b8795975e14a98bbaaf (commit) from c20a5a5c916358a2360cea25be2d59f76eeef39a (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: debian/… [View More]

1 0

x2golxdebindings.git - build-main (branch) updated: 1.0.1.3-4-g2bec515
by git-admin＠x2go.org 28 Jul '13

28 Jul '13

The branch, build-main has been updated via 2bec515499195ff73726e176283b92f0cbc221ee (commit) from 4c42f72f33c0520c97504d58cf8f1403151e8090 (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: debian/… [View More]changelog | 3 ++- ...nome-mime-application-sshfscdrom-x2go-lxde.png} | 0 ...gnome-mime-application-sshfsdisk-x2go-lxde.png} | 0 ...-mime-application-sshfsremovable-x2go-lxde.png} | 0 ...nome-mime-application-sshfscdrom-x2go-lxde.png} | 0 ...gnome-mime-application-sshfsdisk-x2go-lxde.png} | 0 ...-mime-application-sshfsremovable-x2go-lxde.png} | 0 ...nome-mime-application-sshfscdrom-x2go-lxde.png} | 0 ...gnome-mime-application-sshfsdisk-x2go-lxde.png} | 0 ...-mime-application-sshfsremovable-x2go-lxde.png} | 0 ...nome-mime-application-sshfscdrom-x2go-lxde.png} | 0 ...gnome-mime-application-sshfsdisk-x2go-lxde.png} | 0 ...-mime-application-sshfsremovable-x2go-lxde.png} | 0 ...nome-mime-application-sshfscdrom-x2go-lxde.png} | 0 ...gnome-mime-application-sshfsdisk-x2go-lxde.png} | 0 ...-mime-application-sshfsremovable-x2go-lxde.png} | 0 ...nome-mime-application-sshfscdrom-x2go-lxde.png} | 0 ...gnome-mime-application-sshfsdisk-x2go-lxde.png} | 0 ...-mime-application-sshfsremovable-x2go-lxde.png} | 0 ...nome-mime-application-sshfscdrom-x2go-lxde.png} | 0 ...gnome-mime-application-sshfsdisk-x2go-lxde.png} | 0 ...-mime-application-sshfsremovable-x2go-lxde.png} | 0 ...nome-mime-application-sshfscdrom-x2go-lxde.png} | 0 ...gnome-mime-application-sshfsdisk-x2go-lxde.png} | 0 ...-mime-application-sshfsremovable-x2go-lxde.png} | 0 ...nome-mime-application-sshfscdrom-x2go-lxde.png} | 0 ...gnome-mime-application-sshfsdisk-x2go-lxde.png} | 0 ...-mime-application-sshfsremovable-x2go-lxde.png} | 0 ...nome-mime-application-sshfscdrom-x2go-lxde.png} | 0 ...gnome-mime-application-sshfsdisk-x2go-lxde.png} | 0 ...-mime-application-sshfsremovable-x2go-lxde.png} | 0 share/mime/packages/sshfs-x2go-lxde.xml | 3 +++ 32 files changed, 5 insertions(+), 1 deletion(-) rename share/icons/nuoveXT2/128x128/mimetypes/{application-sshfscdrom-x2go-lxde.png => gnome-mime-application-sshfscdrom-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/128x128/mimetypes/{application-sshfsdisk-x2go-lxde.png => gnome-mime-application-sshfsdisk-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/128x128/mimetypes/{application-sshfsremovable-x2go-lxde.png => gnome-mime-application-sshfsremovable-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/16x16/mimetypes/{application-sshfscdrom-x2go-lxde.png => gnome-mime-application-sshfscdrom-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/16x16/mimetypes/{application-sshfsdisk-x2go-lxde.png => gnome-mime-application-sshfsdisk-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/16x16/mimetypes/{application-sshfsremovable-x2go-lxde.png => gnome-mime-application-sshfsremovable-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/22x22/mimetypes/{application-sshfscdrom-x2go-lxde.png => gnome-mime-application-sshfscdrom-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/22x22/mimetypes/{application-sshfsdisk-x2go-lxde.png => gnome-mime-application-sshfsdisk-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/22x22/mimetypes/{application-sshfsremovable-x2go-lxde.png => gnome-mime-application-sshfsremovable-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/24x24/mimetypes/{application-sshfscdrom-x2go-lxde.png => gnome-mime-application-sshfscdrom-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/24x24/mimetypes/{application-sshfsdisk-x2go-lxde.png => gnome-mime-application-sshfsdisk-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/24x24/mimetypes/{application-sshfsremovable-x2go-lxde.png => gnome-mime-application-sshfsremovable-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/32x32/mimetypes/{application-sshfscdrom-x2go-lxde.png => gnome-mime-application-sshfscdrom-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/32x32/mimetypes/{application-sshfsdisk-x2go-lxde.png => gnome-mime-application-sshfsdisk-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/32x32/mimetypes/{application-sshfsremovable-x2go-lxde.png => gnome-mime-application-sshfsremovable-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/36x36/mimetypes/{application-sshfscdrom-x2go-lxde.png => gnome-mime-application-sshfscdrom-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/36x36/mimetypes/{application-sshfsdisk-x2go-lxde.png => gnome-mime-application-sshfsdisk-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/36x36/mimetypes/{application-sshfsremovable-x2go-lxde.png => gnome-mime-application-sshfsremovable-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/48x48/mimetypes/{application-sshfscdrom-x2go-lxde.png => gnome-mime-application-sshfscdrom-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/48x48/mimetypes/{application-sshfsdisk-x2go-lxde.png => gnome-mime-application-sshfsdisk-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/48x48/mimetypes/{application-sshfsremovable-x2go-lxde.png => gnome-mime-application-sshfsremovable-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/64x64/mimetypes/{application-sshfscdrom-x2go-lxde.png => gnome-mime-application-sshfscdrom-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/64x64/mimetypes/{application-sshfsdisk-x2go-lxde.png => gnome-mime-application-sshfsdisk-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/64x64/mimetypes/{application-sshfsremovable-x2go-lxde.png => gnome-mime-application-sshfsremovable-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/72x72/mimetypes/{application-sshfscdrom-x2go-lxde.png => gnome-mime-application-sshfscdrom-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/72x72/mimetypes/{application-sshfsdisk-x2go-lxde.png => gnome-mime-application-sshfsdisk-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/72x72/mimetypes/{application-sshfsremovable-x2go-lxde.png => gnome-mime-application-sshfsremovable-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/96x96/mimetypes/{application-sshfscdrom-x2go-lxde.png => gnome-mime-application-sshfscdrom-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/96x96/mimetypes/{application-sshfsdisk-x2go-lxde.png => gnome-mime-application-sshfsdisk-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/96x96/mimetypes/{application-sshfsremovable-x2go-lxde.png => gnome-mime-application-sshfsremovable-x2go-lxde.png} (100%) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index eb3ccbc..8de55d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,8 @@ x2golxdebindings (1.0.2.0-0~x2go1) UNRELEASED; urgency=low * New upstream version (1.0.2.0): - - Continue development... + - Use generic-icon tag in MIME package xml file to point + to the correct icons for shared folders/devices. (Fixes: #17). * /debian/control: + Add dependency: shared-mime-info. diff --git a/share/icons/nuoveXT2/128x128/mimetypes/application-sshfscdrom-x2go-lxde.png b/share/icons/nuoveXT2/128x128/mimetypes/gnome-mime-application-sshfscdrom-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/128x128/mimetypes/application-sshfscdrom-x2go-lxde.png rename to share/icons/nuoveXT2/128x128/mimetypes/gnome-mime-application-sshfscdrom-x2go-lxde.png diff --git a/share/icons/nuoveXT2/128x128/mimetypes/application-sshfsdisk-x2go-lxde.png b/share/icons/nuoveXT2/128x128/mimetypes/gnome-mime-application-sshfsdisk-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/128x128/mimetypes/application-sshfsdisk-x2go-lxde.png rename to share/icons/nuoveXT2/128x128/mimetypes/gnome-mime-application-sshfsdisk-x2go-lxde.png diff --git a/share/icons/nuoveXT2/128x128/mimetypes/application-sshfsremovable-x2go-lxde.png b/share/icons/nuoveXT2/128x128/mimetypes/gnome-mime-application-sshfsremovable-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/128x128/mimetypes/application-sshfsremovable-x2go-lxde.png rename to share/icons/nuoveXT2/128x128/mimetypes/gnome-mime-application-sshfsremovable-x2go-lxde.png diff --git a/share/icons/nuoveXT2/16x16/mimetypes/application-sshfscdrom-x2go-lxde.png b/share/icons/nuoveXT2/16x16/mimetypes/gnome-mime-application-sshfscdrom-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/16x16/mimetypes/application-sshfscdrom-x2go-lxde.png rename to share/icons/nuoveXT2/16x16/mimetypes/gnome-mime-application-sshfscdrom-x2go-lxde.png diff --git a/share/icons/nuoveXT2/16x16/mimetypes/application-sshfsdisk-x2go-lxde.png b/share/icons/nuoveXT2/16x16/mimetypes/gnome-mime-application-sshfsdisk-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/16x16/mimetypes/application-sshfsdisk-x2go-lxde.png rename to share/icons/nuoveXT2/16x16/mimetypes/gnome-mime-application-sshfsdisk-x2go-lxde.png diff --git a/share/icons/nuoveXT2/16x16/mimetypes/application-sshfsremovable-x2go-lxde.png b/share/icons/nuoveXT2/16x16/mimetypes/gnome-mime-application-sshfsremovable-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/16x16/mimetypes/application-sshfsremovable-x2go-lxde.png rename to share/icons/nuoveXT2/16x16/mimetypes/gnome-mime-application-sshfsremovable-x2go-lxde.png diff --git a/share/icons/nuoveXT2/22x22/mimetypes/application-sshfscdrom-x2go-lxde.png b/share/icons/nuoveXT2/22x22/mimetypes/gnome-mime-application-sshfscdrom-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/22x22/mimetypes/application-sshfscdrom-x2go-lxde.png rename to share/icons/nuoveXT2/22x22/mimetypes/gnome-mime-application-sshfscdrom-x2go-lxde.png diff --git a/share/icons/nuoveXT2/22x22/mimetypes/application-sshfsdisk-x2go-lxde.png b/share/icons/nuoveXT2/22x22/mimetypes/gnome-mime-application-sshfsdisk-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/22x22/mimetypes/application-sshfsdisk-x2go-lxde.png rename to share/icons/nuoveXT2/22x22/mimetypes/gnome-mime-application-sshfsdisk-x2go-lxde.png diff --git a/share/icons/nuoveXT2/22x22/mimetypes/application-sshfsremovable-x2go-lxde.png b/share/icons/nuoveXT2/22x22/mimetypes/gnome-mime-application-sshfsremovable-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/22x22/mimetypes/application-sshfsremovable-x2go-lxde.png rename to share/icons/nuoveXT2/22x22/mimetypes/gnome-mime-application-sshfsremovable-x2go-lxde.png diff --git a/share/icons/nuoveXT2/24x24/mimetypes/application-sshfscdrom-x2go-lxde.png b/share/icons/nuoveXT2/24x24/mimetypes/gnome-mime-application-sshfscdrom-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/24x24/mimetypes/application-sshfscdrom-x2go-lxde.png rename to share/icons/nuoveXT2/24x24/mimetypes/gnome-mime-application-sshfscdrom-x2go-lxde.png diff --git a/share/icons/nuoveXT2/24x24/mimetypes/application-sshfsdisk-x2go-lxde.png b/share/icons/nuoveXT2/24x24/mimetypes/gnome-mime-application-sshfsdisk-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/24x24/mimetypes/application-sshfsdisk-x2go-lxde.png rename to share/icons/nuoveXT2/24x24/mimetypes/gnome-mime-application-sshfsdisk-x2go-lxde.png diff --git a/share/icons/nuoveXT2/24x24/mimetypes/application-sshfsremovable-x2go-lxde.png b/share/icons/nuoveXT2/24x24/mimetypes/gnome-mime-application-sshfsremovable-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/24x24/mimetypes/application-sshfsremovable-x2go-lxde.png rename to share/icons/nuoveXT2/24x24/mimetypes/gnome-mime-application-sshfsremovable-x2go-lxde.png diff --git a/share/icons/nuoveXT2/32x32/mimetypes/application-sshfscdrom-x2go-lxde.png b/share/icons/nuoveXT2/32x32/mimetypes/gnome-mime-application-sshfscdrom-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/32x32/mimetypes/application-sshfscdrom-x2go-lxde.png rename to share/icons/nuoveXT2/32x32/mimetypes/gnome-mime-application-sshfscdrom-x2go-lxde.png diff --git a/share/icons/nuoveXT2/32x32/mimetypes/application-sshfsdisk-x2go-lxde.png b/share/icons/nuoveXT2/32x32/mimetypes/gnome-mime-application-sshfsdisk-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/32x32/mimetypes/application-sshfsdisk-x2go-lxde.png rename to share/icons/nuoveXT2/32x32/mimetypes/gnome-mime-application-sshfsdisk-x2go-lxde.png diff --git a/share/icons/nuoveXT2/32x32/mimetypes/application-sshfsremovable-x2go-lxde.png b/share/icons/nuoveXT2/32x32/mimetypes/gnome-mime-application-sshfsremovable-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/32x32/mimetypes/application-sshfsremovable-x2go-lxde.png rename to share/icons/nuoveXT2/32x32/mimetypes/gnome-mime-application-sshfsremovable-x2go-lxde.png diff --git a/share/icons/nuoveXT2/36x36/mimetypes/application-sshfscdrom-x2go-lxde.png b/share/icons/nuoveXT2/36x36/mimetypes/gnome-mime-application-sshfscdrom-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/36x36/mimetypes/application-sshfscdrom-x2go-lxde.png rename to share/icons/nuoveXT2/36x36/mimetypes/gnome-mime-application-sshfscdrom-x2go-lxde.png diff --git a/share/icons/nuoveXT2/36x36/mimetypes/application-sshfsdisk-x2go-lxde.png b/share/icons/nuoveXT2/36x36/mimetypes/gnome-mime-application-sshfsdisk-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/36x36/mimetypes/application-sshfsdisk-x2go-lxde.png rename to share/icons/nuoveXT2/36x36/mimetypes/gnome-mime-application-sshfsdisk-x2go-lxde.png diff --git a/share/icons/nuoveXT2/36x36/mimetypes/application-sshfsremovable-x2go-lxde.png b/share/icons/nuoveXT2/36x36/mimetypes/gnome-mime-application-sshfsremovable-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/36x36/mimetypes/application-sshfsremovable-x2go-lxde.png rename to share/icons/nuoveXT2/36x36/mimetypes/gnome-mime-application-sshfsremovable-x2go-lxde.png diff --git a/share/icons/nuoveXT2/48x48/mimetypes/application-sshfscdrom-x2go-lxde.png b/share/icons/nuoveXT2/48x48/mimetypes/gnome-mime-application-sshfscdrom-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/48x48/mimetypes/application-sshfscdrom-x2go-lxde.png rename to share/icons/nuoveXT2/48x48/mimetypes/gnome-mime-application-sshfscdrom-x2go-lxde.png diff --git a/share/icons/nuoveXT2/48x48/mimetypes/application-sshfsdisk-x2go-lxde.png b/share/icons/nuoveXT2/48x48/mimetypes/gnome-mime-application-sshfsdisk-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/48x48/mimetypes/application-sshfsdisk-x2go-lxde.png rename to share/icons/nuoveXT2/48x48/mimetypes/gnome-mime-application-sshfsdisk-x2go-lxde.png diff --git a/share/icons/nuoveXT2/48x48/mimetypes/application-sshfsremovable-x2go-lxde.png b/share/icons/nuoveXT2/48x48/mimetypes/gnome-mime-application-sshfsremovable-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/48x48/mimetypes/application-sshfsremovable-x2go-lxde.png rename to share/icons/nuoveXT2/48x48/mimetypes/gnome-mime-application-sshfsremovable-x2go-lxde.png diff --git a/share/icons/nuoveXT2/64x64/mimetypes/application-sshfscdrom-x2go-lxde.png b/share/icons/nuoveXT2/64x64/mimetypes/gnome-mime-application-sshfscdrom-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/64x64/mimetypes/application-sshfscdrom-x2go-lxde.png rename to share/icons/nuoveXT2/64x64/mimetypes/gnome-mime-application-sshfscdrom-x2go-lxde.png diff --git a/share/icons/nuoveXT2/64x64/mimetypes/application-sshfsdisk-x2go-lxde.png b/share/icons/nuoveXT2/64x64/mimetypes/gnome-mime-application-sshfsdisk-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/64x64/mimetypes/application-sshfsdisk-x2go-lxde.png rename to share/icons/nuoveXT2/64x64/mimetypes/gnome-mime-application-sshfsdisk-x2go-lxde.png diff --git a/share/icons/nuoveXT2/64x64/mimetypes/application-sshfsremovable-x2go-lxde.png b/share/icons/nuoveXT2/64x64/mimetypes/gnome-mime-application-sshfsremovable-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/64x64/mimetypes/application-sshfsremovable-x2go-lxde.png rename to share/icons/nuoveXT2/64x64/mimetypes/gnome-mime-application-sshfsremovable-x2go-lxde.png diff --git a/share/icons/nuoveXT2/72x72/mimetypes/application-sshfscdrom-x2go-lxde.png b/share/icons/nuoveXT2/72x72/mimetypes/gnome-mime-application-sshfscdrom-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/72x72/mimetypes/application-sshfscdrom-x2go-lxde.png rename to share/icons/nuoveXT2/72x72/mimetypes/gnome-mime-application-sshfscdrom-x2go-lxde.png diff --git a/share/icons/nuoveXT2/72x72/mimetypes/application-sshfsdisk-x2go-lxde.png b/share/icons/nuoveXT2/72x72/mimetypes/gnome-mime-application-sshfsdisk-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/72x72/mimetypes/application-sshfsdisk-x2go-lxde.png rename to share/icons/nuoveXT2/72x72/mimetypes/gnome-mime-application-sshfsdisk-x2go-lxde.png diff --git a/share/icons/nuoveXT2/72x72/mimetypes/application-sshfsremovable-x2go-lxde.png b/share/icons/nuoveXT2/72x72/mimetypes/gnome-mime-application-sshfsremovable-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/72x72/mimetypes/application-sshfsremovable-x2go-lxde.png rename to share/icons/nuoveXT2/72x72/mimetypes/gnome-mime-application-sshfsremovable-x2go-lxde.png diff --git a/share/icons/nuoveXT2/96x96/mimetypes/application-sshfscdrom-x2go-lxde.png b/share/icons/nuoveXT2/96x96/mimetypes/gnome-mime-application-sshfscdrom-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/96x96/mimetypes/application-sshfscdrom-x2go-lxde.png rename to share/icons/nuoveXT2/96x96/mimetypes/gnome-mime-application-sshfscdrom-x2go-lxde.png diff --git a/share/icons/nuoveXT2/96x96/mimetypes/application-sshfsdisk-x2go-lxde.png b/share/icons/nuoveXT2/96x96/mimetypes/gnome-mime-application-sshfsdisk-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/96x96/mimetypes/application-sshfsdisk-x2go-lxde.png rename to share/icons/nuoveXT2/96x96/mimetypes/gnome-mime-application-sshfsdisk-x2go-lxde.png diff --git a/share/icons/nuoveXT2/96x96/mimetypes/application-sshfsremovable-x2go-lxde.png b/share/icons/nuoveXT2/96x96/mimetypes/gnome-mime-application-sshfsremovable-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/96x96/mimetypes/application-sshfsremovable-x2go-lxde.png rename to share/icons/nuoveXT2/96x96/mimetypes/gnome-mime-application-sshfsremovable-x2go-lxde.png diff --git a/share/mime/packages/sshfs-x2go-lxde.xml b/share/mime/packages/sshfs-x2go-lxde.xml index b2f4979..87f12a2 100644 --- a/share/mime/packages/sshfs-x2go-lxde.xml +++ b/share/mime/packages/sshfs-x2go-lxde.xml @@ -4,15 +4,18 @@ <comment>SSHFS CDROM</comment> <comment xml:lang="de">SSHFS CDROM</comment> <glob pattern="* (sshfs-cdrom-lxde)"/> + <generic-icon name="gnome-mime-application-sshfscdrom-x2go-lxde"/> </mime-type> <mime-type type="application/sshfsdisk-x2go-lxde"> <comment>SSHFS Disk</comment> <comment xml:lang="de">SSHFS Freigabe</comment> <glob pattern="* (sshfs-disk-lxde)"/> + <generic-icon name="gnome-mime-application-sshfsdisk-x2go-lxde"/> </mime-type> <mime-type type="application/sshfsremovable-x2go-lxde"> <comment>SSHFS Removable</comment> <comment xml:lang="de">SSHFS Gerät</comment> <glob pattern="* (sshfs-removable-lxde)"/> + <generic-icon name="gnome-mime-application-sshremovable-x2go-lxde"/> </mime-type> </mime-info> hooks/post-receive -- x2golxdebindings.git (LXDE 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 "x2golxdebindings.git" (LXDE bindings for X2Go). [View Less]

1 0

x2golxdebindings.git - build-main (branch) updated: 1.0.1.3-1-gcad85d0
by git-admin＠x2go.org 28 Jul '13

28 Jul '13

The branch, build-main has been updated via cad85d0b7091b04c288c1f950d2711ea4bfc3502 (commit) from bfa49ae19a5a05d39927dab0dc01dae998623eaa (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: debian/… [View More]

1 0

x2golxdebindings.git - build-main (branch) updated: 1.0.1.3-3-g4c42f72
by git-admin＠x2go.org 28 Jul '13

28 Jul '13

The branch, build-main has been updated via 4c42f72f33c0520c97504d58cf8f1403151e8090 (commit) from d40ab6b895e3174c931c3a346d647a6cf987f3c3 (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: debian/… [View More]

1 0

x2golxdebindings.git - build-main (branch) updated: 1.0.1.3-2-gd40ab6b
by git-admin＠x2go.org 28 Jul '13

28 Jul '13

The branch, build-main has been updated via d40ab6b895e3174c931c3a346d647a6cf987f3c3 (commit) from cad85d0b7091b04c288c1f950d2711ea4bfc3502 (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: debian/… [View More]

1 0

x2golxdebindings.git - master (branch) updated: 1.0.1.3-7-g728e765
by git-admin＠x2go.org 28 Jul '13

28 Jul '13

The branch, master has been updated via 728e765d74cda5413275c2a4f7de1a9715f98cb9 (commit) from 6d4f031cb799b284f4c21b8795975e14a98bbaaf (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 728e765d74cda5413275c2a4f7de1a9715f98cb9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]

1 0

x2golxdebindings.git - master (branch) updated: 1.0.1.3-6-g6d4f031
by git-admin＠x2go.org 28 Jul '13

28 Jul '13

The branch, master has been updated via 6d4f031cb799b284f4c21b8795975e14a98bbaaf (commit) from c20a5a5c916358a2360cea25be2d59f76eeef39a (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 6d4f031cb799b284f4c21b8795975e14a98bbaaf Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]> Date: Sun Jul 28 15:09:27 2013 +0200 /debian/{postinst,postrm}: Update icon caches. (Adds to fixing #17). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ debian/x2golxdebindings.postinst | 2 ++ debian/x2golxdebindings.postrm | 3 +++ 3 files changed, 7 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 8de55d6..b891eaf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ x2golxdebindings (1.0.2.0-0~x2go1) UNRELEASED; urgency=low to the correct icons for shared folders/devices. (Fixes: #17). * /debian/control: + Add dependency: shared-mime-info. + * /debian/{postinst,postrm}: + + Update icon caches. (Adds to fixing #17). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Mon, 31 Dec 2012 16:40:08 +0100 diff --git a/debian/x2golxdebindings.postinst b/debian/x2golxdebindings.postinst index 3f79e1b..96851c4 100755 --- a/debian/x2golxdebindings.postinst +++ b/debian/x2golxdebindings.postinst @@ -21,8 +21,10 @@ set -e case "$1" in configure) + update-icon-caches /usr/share/icons/nuoveXT2 update-desktop-database update-mime-database /usr/share/mime + ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/debian/x2golxdebindings.postrm b/debian/x2golxdebindings.postrm index c6ec555..ca53b90 100755 --- a/debian/x2golxdebindings.postrm +++ b/debian/x2golxdebindings.postrm @@ -21,8 +21,11 @@ set -e case "$1" in purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + + update-icon-caches /usr/share/icons/nuoveXT2 update-desktop-database update-mime-database /usr/share/mime + ;; *) hooks/post-receive -- x2golxdebindings.git (LXDE 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 "x2golxdebindings.git" (LXDE bindings for X2Go). [View Less]

1 0

x2golxdebindings.git - master (branch) updated: 1.0.1.3-5-gc20a5a5
by git-admin＠x2go.org 28 Jul '13

28 Jul '13

The branch, master has been updated via c20a5a5c916358a2360cea25be2d59f76eeef39a (commit) from 2bec515499195ff73726e176283b92f0cbc221ee (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 c20a5a5c916358a2360cea25be2d59f76eeef39a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]> Date: Sun Jul 28 15:06:47 2013 +0200 fix postinst/postrm scripts ----------------------------------------------------------------------- Summary of changes: debian/x2golxdebindings.postinst | 27 ++++++++++++++------------- debian/x2golxdebindings.postrm | 20 ++++++++++---------- 2 files changed, 24 insertions(+), 23 deletions(-) The diff of changes is: diff --git a/debian/x2golxdebindings.postinst b/debian/x2golxdebindings.postinst index c907544..3f79e1b 100755 --- a/debian/x2golxdebindings.postinst +++ b/debian/x2golxdebindings.postinst @@ -1,5 +1,5 @@ #!/bin/sh -# postinst script for x2gognomebindings +# postinst script for x2golxdebindings # # see: dh_installdeb(1) @@ -19,18 +19,19 @@ set -e case "$1" in - configure) - 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-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 diff --git a/debian/x2golxdebindings.postrm b/debian/x2golxdebindings.postrm index 04e5665..c6ec555 100755 --- a/debian/x2golxdebindings.postrm +++ b/debian/x2golxdebindings.postrm @@ -1,5 +1,5 @@ #!/bin/sh -# postrm script for x2gognomebindings +# postrm script for x2golxdebindings # # see: dh_installdeb(1) @@ -20,15 +20,15 @@ set -e case "$1" in - purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - 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-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 hooks/post-receive -- x2golxdebindings.git (LXDE 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 "x2golxdebindings.git" (LXDE bindings for X2Go). [View Less]

1 0

x2golxdebindings.git - master (branch) updated: 1.0.1.3-4-g2bec515
by git-admin＠x2go.org 28 Jul '13

28 Jul '13

The branch, master has been updated via 2bec515499195ff73726e176283b92f0cbc221ee (commit) from 4c42f72f33c0520c97504d58cf8f1403151e8090 (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 2bec515499195ff73726e176283b92f0cbc221ee Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]> Date: Sun Jul 28 13:56:00 2013 +0200 Use generic-icon tag in MIME package xml file to point to the correct icons for shared folders/devices. (Fixes: #17). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 ++- ...nome-mime-application-sshfscdrom-x2go-lxde.png} | 0 ...gnome-mime-application-sshfsdisk-x2go-lxde.png} | 0 ...-mime-application-sshfsremovable-x2go-lxde.png} | 0 ...nome-mime-application-sshfscdrom-x2go-lxde.png} | 0 ...gnome-mime-application-sshfsdisk-x2go-lxde.png} | 0 ...-mime-application-sshfsremovable-x2go-lxde.png} | 0 ...nome-mime-application-sshfscdrom-x2go-lxde.png} | 0 ...gnome-mime-application-sshfsdisk-x2go-lxde.png} | 0 ...-mime-application-sshfsremovable-x2go-lxde.png} | 0 ...nome-mime-application-sshfscdrom-x2go-lxde.png} | 0 ...gnome-mime-application-sshfsdisk-x2go-lxde.png} | 0 ...-mime-application-sshfsremovable-x2go-lxde.png} | 0 ...nome-mime-application-sshfscdrom-x2go-lxde.png} | 0 ...gnome-mime-application-sshfsdisk-x2go-lxde.png} | 0 ...-mime-application-sshfsremovable-x2go-lxde.png} | 0 ...nome-mime-application-sshfscdrom-x2go-lxde.png} | 0 ...gnome-mime-application-sshfsdisk-x2go-lxde.png} | 0 ...-mime-application-sshfsremovable-x2go-lxde.png} | 0 ...nome-mime-application-sshfscdrom-x2go-lxde.png} | 0 ...gnome-mime-application-sshfsdisk-x2go-lxde.png} | 0 ...-mime-application-sshfsremovable-x2go-lxde.png} | 0 ...nome-mime-application-sshfscdrom-x2go-lxde.png} | 0 ...gnome-mime-application-sshfsdisk-x2go-lxde.png} | 0 ...-mime-application-sshfsremovable-x2go-lxde.png} | 0 ...nome-mime-application-sshfscdrom-x2go-lxde.png} | 0 ...gnome-mime-application-sshfsdisk-x2go-lxde.png} | 0 ...-mime-application-sshfsremovable-x2go-lxde.png} | 0 ...nome-mime-application-sshfscdrom-x2go-lxde.png} | 0 ...gnome-mime-application-sshfsdisk-x2go-lxde.png} | 0 ...-mime-application-sshfsremovable-x2go-lxde.png} | 0 share/mime/packages/sshfs-x2go-lxde.xml | 3 +++ 32 files changed, 5 insertions(+), 1 deletion(-) rename share/icons/nuoveXT2/128x128/mimetypes/{application-sshfscdrom-x2go-lxde.png => gnome-mime-application-sshfscdrom-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/128x128/mimetypes/{application-sshfsdisk-x2go-lxde.png => gnome-mime-application-sshfsdisk-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/128x128/mimetypes/{application-sshfsremovable-x2go-lxde.png => gnome-mime-application-sshfsremovable-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/16x16/mimetypes/{application-sshfscdrom-x2go-lxde.png => gnome-mime-application-sshfscdrom-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/16x16/mimetypes/{application-sshfsdisk-x2go-lxde.png => gnome-mime-application-sshfsdisk-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/16x16/mimetypes/{application-sshfsremovable-x2go-lxde.png => gnome-mime-application-sshfsremovable-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/22x22/mimetypes/{application-sshfscdrom-x2go-lxde.png => gnome-mime-application-sshfscdrom-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/22x22/mimetypes/{application-sshfsdisk-x2go-lxde.png => gnome-mime-application-sshfsdisk-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/22x22/mimetypes/{application-sshfsremovable-x2go-lxde.png => gnome-mime-application-sshfsremovable-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/24x24/mimetypes/{application-sshfscdrom-x2go-lxde.png => gnome-mime-application-sshfscdrom-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/24x24/mimetypes/{application-sshfsdisk-x2go-lxde.png => gnome-mime-application-sshfsdisk-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/24x24/mimetypes/{application-sshfsremovable-x2go-lxde.png => gnome-mime-application-sshfsremovable-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/32x32/mimetypes/{application-sshfscdrom-x2go-lxde.png => gnome-mime-application-sshfscdrom-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/32x32/mimetypes/{application-sshfsdisk-x2go-lxde.png => gnome-mime-application-sshfsdisk-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/32x32/mimetypes/{application-sshfsremovable-x2go-lxde.png => gnome-mime-application-sshfsremovable-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/36x36/mimetypes/{application-sshfscdrom-x2go-lxde.png => gnome-mime-application-sshfscdrom-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/36x36/mimetypes/{application-sshfsdisk-x2go-lxde.png => gnome-mime-application-sshfsdisk-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/36x36/mimetypes/{application-sshfsremovable-x2go-lxde.png => gnome-mime-application-sshfsremovable-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/48x48/mimetypes/{application-sshfscdrom-x2go-lxde.png => gnome-mime-application-sshfscdrom-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/48x48/mimetypes/{application-sshfsdisk-x2go-lxde.png => gnome-mime-application-sshfsdisk-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/48x48/mimetypes/{application-sshfsremovable-x2go-lxde.png => gnome-mime-application-sshfsremovable-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/64x64/mimetypes/{application-sshfscdrom-x2go-lxde.png => gnome-mime-application-sshfscdrom-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/64x64/mimetypes/{application-sshfsdisk-x2go-lxde.png => gnome-mime-application-sshfsdisk-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/64x64/mimetypes/{application-sshfsremovable-x2go-lxde.png => gnome-mime-application-sshfsremovable-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/72x72/mimetypes/{application-sshfscdrom-x2go-lxde.png => gnome-mime-application-sshfscdrom-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/72x72/mimetypes/{application-sshfsdisk-x2go-lxde.png => gnome-mime-application-sshfsdisk-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/72x72/mimetypes/{application-sshfsremovable-x2go-lxde.png => gnome-mime-application-sshfsremovable-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/96x96/mimetypes/{application-sshfscdrom-x2go-lxde.png => gnome-mime-application-sshfscdrom-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/96x96/mimetypes/{application-sshfsdisk-x2go-lxde.png => gnome-mime-application-sshfsdisk-x2go-lxde.png} (100%) rename share/icons/nuoveXT2/96x96/mimetypes/{application-sshfsremovable-x2go-lxde.png => gnome-mime-application-sshfsremovable-x2go-lxde.png} (100%) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index eb3ccbc..8de55d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,8 @@ x2golxdebindings (1.0.2.0-0~x2go1) UNRELEASED; urgency=low * New upstream version (1.0.2.0): - - Continue development... + - Use generic-icon tag in MIME package xml file to point + to the correct icons for shared folders/devices. (Fixes: #17). * /debian/control: + Add dependency: shared-mime-info. diff --git a/share/icons/nuoveXT2/128x128/mimetypes/application-sshfscdrom-x2go-lxde.png b/share/icons/nuoveXT2/128x128/mimetypes/gnome-mime-application-sshfscdrom-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/128x128/mimetypes/application-sshfscdrom-x2go-lxde.png rename to share/icons/nuoveXT2/128x128/mimetypes/gnome-mime-application-sshfscdrom-x2go-lxde.png diff --git a/share/icons/nuoveXT2/128x128/mimetypes/application-sshfsdisk-x2go-lxde.png b/share/icons/nuoveXT2/128x128/mimetypes/gnome-mime-application-sshfsdisk-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/128x128/mimetypes/application-sshfsdisk-x2go-lxde.png rename to share/icons/nuoveXT2/128x128/mimetypes/gnome-mime-application-sshfsdisk-x2go-lxde.png diff --git a/share/icons/nuoveXT2/128x128/mimetypes/application-sshfsremovable-x2go-lxde.png b/share/icons/nuoveXT2/128x128/mimetypes/gnome-mime-application-sshfsremovable-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/128x128/mimetypes/application-sshfsremovable-x2go-lxde.png rename to share/icons/nuoveXT2/128x128/mimetypes/gnome-mime-application-sshfsremovable-x2go-lxde.png diff --git a/share/icons/nuoveXT2/16x16/mimetypes/application-sshfscdrom-x2go-lxde.png b/share/icons/nuoveXT2/16x16/mimetypes/gnome-mime-application-sshfscdrom-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/16x16/mimetypes/application-sshfscdrom-x2go-lxde.png rename to share/icons/nuoveXT2/16x16/mimetypes/gnome-mime-application-sshfscdrom-x2go-lxde.png diff --git a/share/icons/nuoveXT2/16x16/mimetypes/application-sshfsdisk-x2go-lxde.png b/share/icons/nuoveXT2/16x16/mimetypes/gnome-mime-application-sshfsdisk-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/16x16/mimetypes/application-sshfsdisk-x2go-lxde.png rename to share/icons/nuoveXT2/16x16/mimetypes/gnome-mime-application-sshfsdisk-x2go-lxde.png diff --git a/share/icons/nuoveXT2/16x16/mimetypes/application-sshfsremovable-x2go-lxde.png b/share/icons/nuoveXT2/16x16/mimetypes/gnome-mime-application-sshfsremovable-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/16x16/mimetypes/application-sshfsremovable-x2go-lxde.png rename to share/icons/nuoveXT2/16x16/mimetypes/gnome-mime-application-sshfsremovable-x2go-lxde.png diff --git a/share/icons/nuoveXT2/22x22/mimetypes/application-sshfscdrom-x2go-lxde.png b/share/icons/nuoveXT2/22x22/mimetypes/gnome-mime-application-sshfscdrom-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/22x22/mimetypes/application-sshfscdrom-x2go-lxde.png rename to share/icons/nuoveXT2/22x22/mimetypes/gnome-mime-application-sshfscdrom-x2go-lxde.png diff --git a/share/icons/nuoveXT2/22x22/mimetypes/application-sshfsdisk-x2go-lxde.png b/share/icons/nuoveXT2/22x22/mimetypes/gnome-mime-application-sshfsdisk-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/22x22/mimetypes/application-sshfsdisk-x2go-lxde.png rename to share/icons/nuoveXT2/22x22/mimetypes/gnome-mime-application-sshfsdisk-x2go-lxde.png diff --git a/share/icons/nuoveXT2/22x22/mimetypes/application-sshfsremovable-x2go-lxde.png b/share/icons/nuoveXT2/22x22/mimetypes/gnome-mime-application-sshfsremovable-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/22x22/mimetypes/application-sshfsremovable-x2go-lxde.png rename to share/icons/nuoveXT2/22x22/mimetypes/gnome-mime-application-sshfsremovable-x2go-lxde.png diff --git a/share/icons/nuoveXT2/24x24/mimetypes/application-sshfscdrom-x2go-lxde.png b/share/icons/nuoveXT2/24x24/mimetypes/gnome-mime-application-sshfscdrom-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/24x24/mimetypes/application-sshfscdrom-x2go-lxde.png rename to share/icons/nuoveXT2/24x24/mimetypes/gnome-mime-application-sshfscdrom-x2go-lxde.png diff --git a/share/icons/nuoveXT2/24x24/mimetypes/application-sshfsdisk-x2go-lxde.png b/share/icons/nuoveXT2/24x24/mimetypes/gnome-mime-application-sshfsdisk-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/24x24/mimetypes/application-sshfsdisk-x2go-lxde.png rename to share/icons/nuoveXT2/24x24/mimetypes/gnome-mime-application-sshfsdisk-x2go-lxde.png diff --git a/share/icons/nuoveXT2/24x24/mimetypes/application-sshfsremovable-x2go-lxde.png b/share/icons/nuoveXT2/24x24/mimetypes/gnome-mime-application-sshfsremovable-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/24x24/mimetypes/application-sshfsremovable-x2go-lxde.png rename to share/icons/nuoveXT2/24x24/mimetypes/gnome-mime-application-sshfsremovable-x2go-lxde.png diff --git a/share/icons/nuoveXT2/32x32/mimetypes/application-sshfscdrom-x2go-lxde.png b/share/icons/nuoveXT2/32x32/mimetypes/gnome-mime-application-sshfscdrom-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/32x32/mimetypes/application-sshfscdrom-x2go-lxde.png rename to share/icons/nuoveXT2/32x32/mimetypes/gnome-mime-application-sshfscdrom-x2go-lxde.png diff --git a/share/icons/nuoveXT2/32x32/mimetypes/application-sshfsdisk-x2go-lxde.png b/share/icons/nuoveXT2/32x32/mimetypes/gnome-mime-application-sshfsdisk-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/32x32/mimetypes/application-sshfsdisk-x2go-lxde.png rename to share/icons/nuoveXT2/32x32/mimetypes/gnome-mime-application-sshfsdisk-x2go-lxde.png diff --git a/share/icons/nuoveXT2/32x32/mimetypes/application-sshfsremovable-x2go-lxde.png b/share/icons/nuoveXT2/32x32/mimetypes/gnome-mime-application-sshfsremovable-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/32x32/mimetypes/application-sshfsremovable-x2go-lxde.png rename to share/icons/nuoveXT2/32x32/mimetypes/gnome-mime-application-sshfsremovable-x2go-lxde.png diff --git a/share/icons/nuoveXT2/36x36/mimetypes/application-sshfscdrom-x2go-lxde.png b/share/icons/nuoveXT2/36x36/mimetypes/gnome-mime-application-sshfscdrom-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/36x36/mimetypes/application-sshfscdrom-x2go-lxde.png rename to share/icons/nuoveXT2/36x36/mimetypes/gnome-mime-application-sshfscdrom-x2go-lxde.png diff --git a/share/icons/nuoveXT2/36x36/mimetypes/application-sshfsdisk-x2go-lxde.png b/share/icons/nuoveXT2/36x36/mimetypes/gnome-mime-application-sshfsdisk-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/36x36/mimetypes/application-sshfsdisk-x2go-lxde.png rename to share/icons/nuoveXT2/36x36/mimetypes/gnome-mime-application-sshfsdisk-x2go-lxde.png diff --git a/share/icons/nuoveXT2/36x36/mimetypes/application-sshfsremovable-x2go-lxde.png b/share/icons/nuoveXT2/36x36/mimetypes/gnome-mime-application-sshfsremovable-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/36x36/mimetypes/application-sshfsremovable-x2go-lxde.png rename to share/icons/nuoveXT2/36x36/mimetypes/gnome-mime-application-sshfsremovable-x2go-lxde.png diff --git a/share/icons/nuoveXT2/48x48/mimetypes/application-sshfscdrom-x2go-lxde.png b/share/icons/nuoveXT2/48x48/mimetypes/gnome-mime-application-sshfscdrom-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/48x48/mimetypes/application-sshfscdrom-x2go-lxde.png rename to share/icons/nuoveXT2/48x48/mimetypes/gnome-mime-application-sshfscdrom-x2go-lxde.png diff --git a/share/icons/nuoveXT2/48x48/mimetypes/application-sshfsdisk-x2go-lxde.png b/share/icons/nuoveXT2/48x48/mimetypes/gnome-mime-application-sshfsdisk-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/48x48/mimetypes/application-sshfsdisk-x2go-lxde.png rename to share/icons/nuoveXT2/48x48/mimetypes/gnome-mime-application-sshfsdisk-x2go-lxde.png diff --git a/share/icons/nuoveXT2/48x48/mimetypes/application-sshfsremovable-x2go-lxde.png b/share/icons/nuoveXT2/48x48/mimetypes/gnome-mime-application-sshfsremovable-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/48x48/mimetypes/application-sshfsremovable-x2go-lxde.png rename to share/icons/nuoveXT2/48x48/mimetypes/gnome-mime-application-sshfsremovable-x2go-lxde.png diff --git a/share/icons/nuoveXT2/64x64/mimetypes/application-sshfscdrom-x2go-lxde.png b/share/icons/nuoveXT2/64x64/mimetypes/gnome-mime-application-sshfscdrom-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/64x64/mimetypes/application-sshfscdrom-x2go-lxde.png rename to share/icons/nuoveXT2/64x64/mimetypes/gnome-mime-application-sshfscdrom-x2go-lxde.png diff --git a/share/icons/nuoveXT2/64x64/mimetypes/application-sshfsdisk-x2go-lxde.png b/share/icons/nuoveXT2/64x64/mimetypes/gnome-mime-application-sshfsdisk-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/64x64/mimetypes/application-sshfsdisk-x2go-lxde.png rename to share/icons/nuoveXT2/64x64/mimetypes/gnome-mime-application-sshfsdisk-x2go-lxde.png diff --git a/share/icons/nuoveXT2/64x64/mimetypes/application-sshfsremovable-x2go-lxde.png b/share/icons/nuoveXT2/64x64/mimetypes/gnome-mime-application-sshfsremovable-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/64x64/mimetypes/application-sshfsremovable-x2go-lxde.png rename to share/icons/nuoveXT2/64x64/mimetypes/gnome-mime-application-sshfsremovable-x2go-lxde.png diff --git a/share/icons/nuoveXT2/72x72/mimetypes/application-sshfscdrom-x2go-lxde.png b/share/icons/nuoveXT2/72x72/mimetypes/gnome-mime-application-sshfscdrom-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/72x72/mimetypes/application-sshfscdrom-x2go-lxde.png rename to share/icons/nuoveXT2/72x72/mimetypes/gnome-mime-application-sshfscdrom-x2go-lxde.png diff --git a/share/icons/nuoveXT2/72x72/mimetypes/application-sshfsdisk-x2go-lxde.png b/share/icons/nuoveXT2/72x72/mimetypes/gnome-mime-application-sshfsdisk-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/72x72/mimetypes/application-sshfsdisk-x2go-lxde.png rename to share/icons/nuoveXT2/72x72/mimetypes/gnome-mime-application-sshfsdisk-x2go-lxde.png diff --git a/share/icons/nuoveXT2/72x72/mimetypes/application-sshfsremovable-x2go-lxde.png b/share/icons/nuoveXT2/72x72/mimetypes/gnome-mime-application-sshfsremovable-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/72x72/mimetypes/application-sshfsremovable-x2go-lxde.png rename to share/icons/nuoveXT2/72x72/mimetypes/gnome-mime-application-sshfsremovable-x2go-lxde.png diff --git a/share/icons/nuoveXT2/96x96/mimetypes/application-sshfscdrom-x2go-lxde.png b/share/icons/nuoveXT2/96x96/mimetypes/gnome-mime-application-sshfscdrom-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/96x96/mimetypes/application-sshfscdrom-x2go-lxde.png rename to share/icons/nuoveXT2/96x96/mimetypes/gnome-mime-application-sshfscdrom-x2go-lxde.png diff --git a/share/icons/nuoveXT2/96x96/mimetypes/application-sshfsdisk-x2go-lxde.png b/share/icons/nuoveXT2/96x96/mimetypes/gnome-mime-application-sshfsdisk-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/96x96/mimetypes/application-sshfsdisk-x2go-lxde.png rename to share/icons/nuoveXT2/96x96/mimetypes/gnome-mime-application-sshfsdisk-x2go-lxde.png diff --git a/share/icons/nuoveXT2/96x96/mimetypes/application-sshfsremovable-x2go-lxde.png b/share/icons/nuoveXT2/96x96/mimetypes/gnome-mime-application-sshfsremovable-x2go-lxde.png similarity index 100% rename from share/icons/nuoveXT2/96x96/mimetypes/application-sshfsremovable-x2go-lxde.png rename to share/icons/nuoveXT2/96x96/mimetypes/gnome-mime-application-sshfsremovable-x2go-lxde.png diff --git a/share/mime/packages/sshfs-x2go-lxde.xml b/share/mime/packages/sshfs-x2go-lxde.xml index b2f4979..87f12a2 100644 --- a/share/mime/packages/sshfs-x2go-lxde.xml +++ b/share/mime/packages/sshfs-x2go-lxde.xml @@ -4,15 +4,18 @@ <comment>SSHFS CDROM</comment> <comment xml:lang="de">SSHFS CDROM</comment> <glob pattern="* (sshfs-cdrom-lxde)"/> + <generic-icon name="gnome-mime-application-sshfscdrom-x2go-lxde"/> </mime-type> <mime-type type="application/sshfsdisk-x2go-lxde"> <comment>SSHFS Disk</comment> <comment xml:lang="de">SSHFS Freigabe</comment> <glob pattern="* (sshfs-disk-lxde)"/> + <generic-icon name="gnome-mime-application-sshfsdisk-x2go-lxde"/> </mime-type> <mime-type type="application/sshfsremovable-x2go-lxde"> <comment>SSHFS Removable</comment> <comment xml:lang="de">SSHFS Gerät</comment> <glob pattern="* (sshfs-removable-lxde)"/> + <generic-icon name="gnome-mime-application-sshremovable-x2go-lxde"/> </mime-type> </mime-info> hooks/post-receive -- x2golxdebindings.git (LXDE 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 "x2golxdebindings.git" (LXDE bindings for X2Go). [View Less]

1 0

python-x2go.git - master (branch) updated: 0.4.0.5-5-ga919329
by git-admin＠x2go.org 28 Jul '13

28 Jul '13

The branch, master has been updated via a919329fc9b918fa4e28f1350c17beffa25d57fd (commit) from 07a1fd1954cd03dcf36b7fad83a730bb87cb4e8f (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 a919329fc9b918fa4e28f1350c17beffa25d57fd Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de… [View More]> Date: Sun Jul 28 15:04:20 2013 +0200 When resuming session be tolerant towards disrupted connections. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2go/backends/control/_stdout.py | 84 +++++++++++++++++++------------------- 2 files changed, 44 insertions(+), 41 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index d5131cc..726086e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ python-x2go (0.4.0.6-0~x2go1) UNRELEASED; urgency=low * New upstream version (0.4.0.6): - Use XFCE as desktop environment in example scripts. - Make Python X2Go aware of the MATE desktop environment. + - When resuming session be tolerant towards disrupted connections. -- Mike Gabriel <mike.gabriel(a)das-netzwertkeam.de> Fri, 19 Jul 2013 17:45:24 +0200 diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index 4a9fbb8..480dcdc 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -1305,51 +1305,53 @@ class X2GoControlSessionSTDOUT(paramiko.SSHClient): @raise X2GoUserException: if the remote user is not allowed to launch/resume X2Go sessions. """ - if not self.is_x2gouser(self.get_transport().get_username()): - raise x2go_exceptions.X2GoUserException('remote user %s is not allowed to run X2Go commands' % self.get_transport().get_username()) + if self.get_transport() is not None: - session_info = None - try: - if session_name is not None: - if session_list: - session_info = session_list[session_name] - else: - session_info = self.list_sessions()[session_name] - except KeyError: - _success = False - - _terminal = self._terminal_backend(self, - profile_name=self.profile_name, - session_info=session_info, - info_backend=self._info_backend, - list_backend=self._list_backend, - proxy_backend=self._proxy_backend, - client_rootdir=self.client_rootdir, - session_instance=session_instance, - sessions_rootdir=self.sessions_rootdir, - **kwargs) - - _success = False - try: - if session_name is not None: - _success = _terminal.resume() - else: - _success = _terminal.start() - except x2go_exceptions.X2GoTerminalSessionException: - _success = False + if not self.is_x2gouser(self.get_transport().get_username()): + raise x2go_exceptions.X2GoUserException('remote user %s is not allowed to run X2Go commands' % self.get_transport().get_username()) - if _success: - while not _terminal.ok(): - gevent.sleep(.2) + session_info = None + try: + if session_name is not None: + if session_list: + session_info = session_list[session_name] + else: + session_info = self.list_sessions()[session_name] + except KeyError: + _success = False + + _terminal = self._terminal_backend(self, + profile_name=self.profile_name, + session_info=session_info, + info_backend=self._info_backend, + list_backend=self._list_backend, + proxy_backend=self._proxy_backend, + client_rootdir=self.client_rootdir, + session_instance=session_instance, + sessions_rootdir=self.sessions_rootdir, + **kwargs) - if _terminal.ok(): - self.associated_terminals[_terminal.get_session_name()] = _terminal - self.get_transport().reverse_tunnels[_terminal.get_session_name()] = { - 'sshfs': (0, None), - 'snd': (0, None), - } + _success = False + try: + if session_name is not None: + _success = _terminal.resume() + else: + _success = _terminal.start() + except x2go_exceptions.X2GoTerminalSessionException: + _success = False + + if _success: + while not _terminal.ok(): + gevent.sleep(.2) + + if _terminal.ok(): + self.associated_terminals[_terminal.get_session_name()] = _terminal + self.get_transport().reverse_tunnels[_terminal.get_session_name()] = { + 'sshfs': (0, None), + 'snd': (0, None), + } - return _terminal or None + return _terminal or None return None hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API). [View Less]

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits July 2013