summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
44adcf2)
Only pass the XDG_APPS_INSTALL_DIR through #define and compute full desktop file path at runtime
endif(WIN32)
if(INDICATEQT_FOUND)
endif(WIN32)
if(INDICATEQT_FOUND)
- if(WANT_QTCLIENT)
- set(DESKTOP_FILE ${XDG_APPS_INSTALL_DIR}/quasselclient.desktop)
- endif(WANT_QTCLIENT)
- if(WANT_MONO)
- set(DESKTOP_FILE ${XDG_APPS_INSTALL_DIR}/quassel.desktop)
- endif(WANT_MONO)
- add_definitions(-DDESKTOP_FILE=${DESKTOP_FILE})
+ add_definitions(-DXDG_APPS_INSTALL_DIR=${XDG_APPS_INSTALL_DIR})
endif(INDICATEQT_FOUND)
# We need to create a version.gen
endif(INDICATEQT_FOUND)
# We need to create a version.gen
_server = QIndicate::Server::defaultInstance();
_server->setType("message.irc");
_server = QIndicate::Server::defaultInstance();
_server->setType("message.irc");
- _server->setDesktopFile(XSTR(DESKTOP_FILE));
+ QString desktopFile = QString("%1/%2.desktop")
+ .arg(XSTR(XDG_APPS_INSTALL_DIR))
+ .arg(QCoreApplication::applicationFilePath().section('/', -1));
+ _server->setDesktopFile(desktopFile);
connect(_server, SIGNAL(serverDisplay()), QtUi::mainWindow(), SLOT(forceActivated()));
if (_enabled) {
connect(_server, SIGNAL(serverDisplay()), QtUi::mainWindow(), SLOT(forceActivated()));
if (_enabled) {