This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2godesktopsharing. commit e39b50c551868ebd26dca1fa3f99d26300dceb91 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Nov 12 16:31:58 2018 +0100 Don't create empty parameters in .x2godesktopsharing/settings as '<param>=@Invalid()' but really as empty strings. --- debian/changelog | 2 ++ sharetray.cpp | 17 +++++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b728ab3..098ba8b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,8 @@ x2godesktopsharing (3.1.1.5-0x2go1) UNRELEASED; urgency=medium - Rephrase notifications (we need a i18n run already anyway...). - Add a soothing notification to the local user when the local user actively disconnects the remote user. + - Don't create empty parameters in .x2godesktopsharing/settings as + '<param>=@Invalid()' but really as empty strings. * debian/*: + Convert to DH packaging style. Build against Qt5. * debian/control: diff --git a/sharetray.cpp b/sharetray.cpp index 33841ec..490f4b8 100644 --- a/sharetray.cpp +++ b/sharetray.cpp @@ -612,6 +612,9 @@ void ShareTray::loadSystemSettings() systemwideBlackList= st.value ( "blacklist" ).toStringList(); systemwideWhiteList= st.value ( "whitelist" ).toStringList(); + if ( ( systemwideBlackList.length() > 0 ) && ( systemwideBlackList[0] == "") ) systemwideBlackList.removeFirst(); + if ( ( systemwideWhiteList.length() > 0 ) && ( systemwideWhiteList[0] == "") ) systemwideWhiteList.removeFirst(); + /* the system-wide settings will be loaded on first usage and * copied into the user settings' "group" parameter and further-on * loaded from there... @@ -649,6 +652,9 @@ void ShareTray::loadUserSettings() userBlackList= st.value ( "blacklist" ).toStringList(); userWhiteList= st.value ( "whitelist" ).toStringList(); + if ( ( userBlackList.length() > 0 ) && ( userBlackList[0] == "") ) userBlackList.removeFirst(); + if ( ( userWhiteList.length() > 0 ) && ( userWhiteList[0] == "") ) userWhiteList.removeFirst(); + /* after first usage of x2godesktopsharing, the system-wide settings * get ignored, as they are always loaded */ @@ -674,8 +680,15 @@ void ShareTray::saveUserSettings() QSettings::NativeFormat ); st.setValue ( "group",sharingGroup ); - st.setValue ( "blacklist",userBlackList ); - st.setValue ( "whitelist",userWhiteList ); + if (userBlackList.length() > 0) + st.setValue ( "blacklist",userBlackList ); + else + st.setValue ( "blacklist", "" ); + + if (userWhiteList.length() > 0) + st.setValue ( "whitelist",userWhiteList ); + else + st.setValue ( "whitelist", "" ); } void ShareTray::setTrayIcon() -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git