[X2go-Commits] x2goplasmabindings.git - build-main (branch) updated: 3.0.1.2-8-g0ce2085

X2Go dev team git-admin at x2go.org
Tue Sep 25 15:48:38 CEST 2012


The branch, build-main has been updated
       via  0ce20856aaeec6532b97b779dadfb4d87349439a (commit)
       via  54530d3b0fac05f75ddf6b67c3c222fafe2c81c5 (commit)
       via  78c1da66184da7d0373db6f9b8f692cca939694e (commit)
       via  30a9d0c9d5e2dfc905211fe67ae4c985a6b557af (commit)
       via  63c9497ec2bab589d9eaddfd51912eeda9064d78 (commit)
       via  2f677d6b032a3e16639bd331331fabed8b2229f5 (commit)
       via  4ef3207768721dd42ab304ff7105bf70c5c87ee6 (commit)
       via  15981eab0d50b154e4690b63e8541b5e04ac14a5 (commit)
      from  225349afbbf0fa11a28ed3b6aac1437da44b3ab2 (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/changelog     |   12 ++++++++++++
 debian/control       |   13 +++++++------
 fsitem.cpp           |    5 +++++
 plasmax2godialog.cpp |   10 +++++++---
 x2goplasmoid.cpp     |    2 +-
 5 files changed, 32 insertions(+), 10 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 569bae4..15379b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+x2goplasmabindings (3.0.1.3-0~x2go1) unstable; 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 at lists.berlios.de>.
+    + Priorty: optional.
+    + Depend on x2goserver >= 3.1.1.2.
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Tue, 25 Sep 2012 15:48:05 +0200
+
 x2goplasmabindings (3.0.1.2-0~x2go2) unstable; urgency=low
 
   [ Mike Gabriel ]
diff --git a/debian/control b/debian/control
index 6f665a0..04a42c4 100644
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,15 @@
 Source: x2goplasmabindings
 Section: x11
-Priority: extra
-Maintainer: Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
+Priority: optional
+Maintainer: X2Go Developers <x2go-dev at lists.berlios.de>
 Uploaders:
- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+ Mike Gabriel <mike.gabriel at das-netzwerkteam.de>,
+ Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>,
 Build-Depends:
  debhelper (>= 7.0.50~),
  cmake,
  kdelibs5-dev
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: http://code.x2go.org/releases/source/x2goplasmabindings
 Vcs-Git: git://code.x2g.org/x2goplasmabindings.git
 Vcs-Browser: http://code.x2go.org/gitweb?p=x2goplasmabindings.git;a=summary
@@ -16,7 +17,7 @@ Vcs-Browser: http://code.x2go.org/gitweb?p=x2goplasmabindings.git;a=summary
 Package: plasma-widget-x2go
 Architecture: any
 Depends:
- x2goserver (>=3.0.99.7-0~),
+ x2goserver (>=3.1.1.2-0~),
  ${shlibs:Depends},
  ${misc:Depends}
 Replaces:
@@ -25,7 +26,7 @@ Replaces:
 Description: Plasma widget for control X2go sessions
  X2go is a server-based computing environment with
     - session resuming
-    - low bandwith support
+    - low bandwidth support
     - LDAP support
     - client side mass storage mounting support
     - audio support
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 1e645d6..c8fb335 100644
--- a/plasmax2godialog.cpp
+++ b/plasmax2godialog.cpp
@@ -150,7 +150,11 @@ void PlasmaX2goDialog::slotUpdateItemsProcFinished(int, QProcess::ExitStatus exi
 			if (lstArr.count()>=2)
 			{
 				lstArr[1].replace(" ","");
-				if ((lstArr[1].indexOf("/tmp/spool_"+user.loginName())!=0) && (lstArr[1].indexOf("/tmp/mime_"+user.loginName())!=0))
+				if ((lstArr[1].indexOf("/tmp/spool_"+user.loginName())!=0) &&
+				    (lstArr[1].indexOf("/tmp/mime_"+user.loginName())!=0) &&
+				    (lstArr[1].indexOf("/tmp/.x2go-"+user.loginName()+"/spool")!=0) &&
+				    (lstArr[1].indexOf("/tmp/.x2go-"+user.loginName()+"/mimebox")!=0)
+				   )
 					actItems<<lstArr[1];
 			}
 		}
@@ -185,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).




More information about the x2go-commits mailing list