~ubuntu-branches/ubuntu/quantal/akonadi/quantal

« back to all changes in this revision

Viewing changes to server/src/utils.cpp

Committer: Package Import Robot
Author(s): Jonathan Riddell
Date: 2012-01-24 23:43:13 UTC
mto: (3.1.12 sid)
mto: This revision was merged to the branch mainline in revision 69.
Revision ID: package-import@ubuntu.com-20120124234313-ooald4uh9w8jilyw

Tags: upstream-1.7.0

Import upstream version 1.7.0

files added:
cmake/modules/AkonadiMacros.cmake

cmake/modules/cmake-copyright.txt

server/src/storagejanitor.cpp

server/src/storagejanitor.h

server/tests/unittest/akdbustest.cpp

server/tests/unittest/akstandarddirstest.cpp

server/tests/unittest/dbconfigtest.cpp

server/tests/unittest/handlertest.cpp

shared/CMakeLists.txt

shared/akdbus.cpp

shared/akdbus.h

shared/akstandarddirs.cpp

shared/akstandarddirs.h

shared/aktest.h

files removed:
cmake/modules/FindGit.cmake

cmake/modules/FindQt4.cmake

files modified:
CMakeLists.txt

CTestCustom.cmake

Mainpage.dox

NEWS

agentserver/CMakeLists.txt

agentserver/agentserver.cpp

agentserver/main.cpp

cmake/modules/FindSoprano.cmake

interfaces/org.freedesktop.Akonadi.NotificationManager.xml

interfaces/org.freedesktop.Akonadi.NotificationSource.xml

interfaces/org.freedesktop.Akonadi.Resource.xml

libs/protocol_p.h

rds/CMakeLists.txt

rds/bridgeconnection.cpp

rds/bridgeserver.cpp

rds/main.cpp

server/CMakeLists.txt

server/akonadictl/CMakeLists.txt

server/akonadictl/akonadistarter.cpp

server/akonadictl/main.cpp

server/control/CMakeLists.txt

server/control/agentinstance.cpp

server/control/agentinstance.h

server/control/agentmanager.cpp

server/control/agentmanager.h

server/control/agentthreadinstance.cpp

server/control/agenttype.cpp

server/control/controlmanager.cpp

server/control/main.cpp

server/control/processcontrol.cpp

server/src/akonadi.cpp

server/src/akonadi.h

server/src/akonadiconnection.cpp

server/src/handler/create.cpp

server/src/handler/fetch.cpp

server/src/handler/fetchhelper.cpp

server/src/handler/list.cpp

server/src/handler/login.cpp

server/src/handler/login.h

server/src/handler/search.cpp

server/src/handler/select.cpp

server/src/handler/select.h

server/src/handler/status.cpp

server/src/handlerhelper.cpp

server/src/handlerhelper.h

server/src/main.cpp

server/src/nepomuk/org.kde.nepomuk.Query.xml

server/src/nepomuk/queryserviceclient.cpp

server/src/nepomuk/queryserviceclient.h

server/src/nepomuksearch.cpp

server/src/nepomuksearch.h

server/src/notificationmanager.cpp

server/src/preprocessorinstance.cpp

server/src/preprocessormanager.cpp

server/src/search/agentsearchengine.cpp

server/src/search/nepomuksearchengine.cpp

server/src/search/nepomuksearchengine.h

server/src/search/xesamsearchengine.cpp

server/src/storage/datastore.cpp

server/src/storage/datastore.h

server/src/storage/dbconfig.cpp

server/src/storage/dbconfig.h

server/src/storage/dbconfigmysql.cpp

server/src/storage/dbconfigmysqlembedded.cpp

server/src/storage/dbconfigpostgresql.cpp

server/src/storage/dbconfigsqlite.cpp

server/src/storage/entities.xsl

server/src/storage/itemretrievalmanager.cpp

server/src/storage/mysql-global-mobile.conf

server/src/storage/mysql-global.conf

server/src/storage/notificationcollector.cpp

server/src/storage/parthelper.cpp

server/src/tracer.cpp

server/src/utils.cpp

server/src/xesamsearch.cpp

server/tests/unittest/CMakeLists.txt

server/tests/unittest/dbinitializertest.cpp

server/tests/unittest/dbinitializertest.h

server/tests/unittest/imapstreamparsertest.cpp

shared/akapplication.cpp

shared/akapplication.h

shared/akdebug.cpp

Show diffs side-by-side

added added

removed removed

server/src/utils.cpp

#include "utils.h"

#include "libs/xdgbasedirs_p.h"

#include <akstandarddirs.h>

#include <libs/xdgbasedirs_p.h>

#include <QtCore/QDebug>

#include <QtCore/QDir>

QString Utils::preferredSocketDirectory( const QString &defaultDirectory )

{

const QString serverConfigFile = XdgBaseDirs::akonadiServerConfigFile( XdgBaseDirs::ReadWrite );

const QString serverConfigFile = AkStandardDirs::serverConfigFile( XdgBaseDirs::ReadWrite );

const QSettings serverSettings( serverConfigFile, QSettings::IniFormat );

#if defined(Q_OS_WINCE) || defined(Q_OS_WIN)

return QString();

}

const QString link = XdgBaseDirs::saveDir( "data", QLatin1String( "akonadi" ) ) + QLatin1Char( '/' ) + QLatin1String( "socket-" ) + hostname;

const QString link = AkStandardDirs::saveDir( "data" ) + QLatin1Char( '/' ) + QLatin1String( "socket-" ) + hostname;

const QString tmpl = QLatin1String( "akonadi-" ) + QLatin1String( pw_ent->pw_name ) + QLatin1String( ".XXXXXX" );

100

101

if ( checkSocketDirectory( link ) )

Older »