The branch, master has been updated via e9168f26a14d6d2c5215285966a534b73b974118 (commit) from 4b8c2abb58aa34828aed15d5d7b336a785ca8bc9 (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 e9168f26a14d6d2c5215285966a534b73b974118 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Sep 27 19:10:19 2011 +0200 Differentiate between local and remote user, fixes display of wrong user name for remote user (2). ----------------------------------------------------------------------- Summary of changes: Doxyfile | 6 +++--- VERSION.x2godesktopsharing | 2 +- sharetray.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/Doxyfile b/Doxyfile index 03042a9..fc8159f 100644 --- a/Doxyfile +++ b/Doxyfile @@ -4,7 +4,7 @@ # Project related configuration options #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 -PROJECT_NAME = x2godesktopshare +PROJECT_NAME = x2godesktopsharing PROJECT_NUMBER = 1 OUTPUT_DIRECTORY = CREATE_SUBDIRS = NO @@ -93,7 +93,7 @@ WARN_LOGFILE = #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- -INPUT = /usr/src.cur/db-builds/x2godesktopshare/x2godesktopshare-3.0.1 +INPUT = /usr/src.cur/db-builds/x2godesktopsharing/x2godesktopsharing-3.0.1.3 INPUT_ENCODING = UTF-8 FILE_PATTERNS = *.c \ *.cc \ @@ -272,7 +272,7 @@ SKIP_FUNCTION_MACROS = YES # Configuration::additions related to external references #--------------------------------------------------------------------------- TAGFILES = -GENERATE_TAGFILE = x2godesktopshare.tag +GENERATE_TAGFILE = x2godesktopsharing.tag ALLEXTERNALS = NO EXTERNAL_GROUPS = YES PERL_PATH = /usr/bin/perl diff --git a/VERSION.x2godesktopsharing b/VERSION.x2godesktopsharing index cd0a3b6..e9aef23 100644 --- a/VERSION.x2godesktopsharing +++ b/VERSION.x2godesktopsharing @@ -1 +1 @@ -3.0.1.2 +3.0.1.3 diff --git a/sharetray.cpp b/sharetray.cpp index ca0f3a8..dafb0e1 100644 --- a/sharetray.cpp +++ b/sharetray.cpp @@ -440,7 +440,7 @@ void ShareTray::showList() void ShareTray::loadSettings() { - QSettings st ( QDir::homePath() +"/.x2godesktopshare/settings", + QSettings st ( QDir::homePath() +"/.x2godesktopsharing/settings", QSettings::NativeFormat ); blackList= st.value ( "blacklist" ).toStringList(); @@ -452,7 +452,7 @@ void ShareTray::loadSettings() void ShareTray::saveSettings() { - QSettings st ( QDir::homePath() +"/.x2godesktopshare/settings", + QSettings st ( QDir::homePath() +"/.x2godesktopsharing/settings", QSettings::NativeFormat ); st.setValue ( "blacklist",blackList ); hooks/post-receive -- x2godesktopsharing.git (Desktop Sharing 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 "x2godesktopsharing.git" (Desktop Sharing for X2go).