The branch, master has been updated via 78c1da66184da7d0373db6f9b8f692cca939694e (commit) from 30a9d0c9d5e2dfc905211fe67ae4c985a6b557af (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 78c1da66184da7d0373db6f9b8f692cca939694e Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Sep 25 14:58:44 2012 +0200 Make plasma-widget-x2go aware of new path names in x2goserver (>= 3.1.1.3). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + fsitem.cpp | 5 +++++ plasmax2godialog.cpp | 4 ++-- x2goplasmoid.cpp | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 1514ab2..ad5cc32 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ x2goplasmabindings (3.0.1.3-0~x2go1) UNRELEASED; urgency=low * New upstream version (3.0.1.3): - Make plasme-widget-x2go of new mount points of spool and mimebox share. + - Make plasma-widget-x2go aware of new path names in x2goserver (>= 3.1.1.3). * /debian/control: + Maintainer change in package: X2Go Developers <x2go-dev@lists.berlios.de>. + Priorty: optional. diff --git a/fsitem.cpp b/fsitem.cpp index 2b06224..bf2a7dd 100644 --- a/fsitem.cpp +++ b/fsitem.cpp @@ -47,9 +47,14 @@ void FsItem::setText(QString text) { intText=text; KUser user; + // x2goserver <= 3.1.1.2 text.replace("/tmp/"+user.loginName()+"_media/disk/",""); text.replace("/tmp/"+user.loginName()+"_media/cd/",""); text.replace("/tmp/"+user.loginName()+"_media/rm/",""); + // recent x2goserver + text.replace("/tmp/.x2go-"+user.loginName()+"/media/disk/",""); + text.replace("/tmp/.x2go-"+user.loginName()+"/media/cd/",""); + text.replace("/tmp/.x2go-"+user.loginName()+"/media/rm/",""); text.replace("_","/"); PlasmoidHoveredItem::setText(text); } diff --git a/plasmax2godialog.cpp b/plasmax2godialog.cpp index 038b57c..c8fb335 100644 --- a/plasmax2godialog.cpp +++ b/plasmax2godialog.cpp @@ -189,11 +189,11 @@ void PlasmaX2goDialog::appendItem(QString itemText) // choose icon KUser user; - if (itemText.indexOf("/tmp/"+user.loginName()+"_media/cd/")==0) + if ((itemText.indexOf("/tmp/"+user.loginName()+"_media/cd/")==0) || (itemText.indexOf("/tmp/.x2go-"+user.loginName()+"/media/cd/")==0)) { item->setIcon("media-optical"); } - else if (itemText.indexOf("/tmp/"+user.loginName()+"_media/rm/")==0) + else if ((itemText.indexOf("/tmp/"+user.loginName()+"_media/rm/")==0) || (itemText.indexOf("/tmp/.x2go-"+user.loginName()+"/media/rm/")==0)) { item->setIcon("drive-removable-media-usb-pendrive"); } diff --git a/x2goplasmoid.cpp b/x2goplasmoid.cpp index a4c785c..4445a91 100644 --- a/x2goplasmoid.cpp +++ b/x2goplasmoid.cpp @@ -55,7 +55,7 @@ x2goplasmoid::x2goplasmoid ( QObject *parent, const QVariantList &args ) setMinimumSize(22,22); KUser user; - stampFName="/tmp/"+user.loginName()+"_media/"+sessionId+".plasmoid"; + stampFName="/tmp/.x2go-"+user.loginName()+"/"+sessionId+".plasmoid"; slotUpdateStamp(); QTimer *timer = new QTimer(this); connect(timer, SIGNAL(timeout()), this, SLOT(slotUpdateStamp())); hooks/post-receive -- x2goplasmabindings.git (Plasma/KDE4 Widget 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 "x2goplasmabindings.git" (Plasma/KDE4 Widget for X2Go).