Commit 78fcd1fe2e5d4fb2d2f298d6830a78ef0d6a5a6a

  • avatar
  • Shane Bradley <shane.bradley @no…a.com>
  • Mon Feb 08 10:33:54 CET 2010
Missed a project file from the patch.
debian/patches/0001-maemo_changes.diff
(58 / 1)
  
64786478 };
64796479
64806480 #endif
6481* Unmerged path src/tools/messageserver/messageserver.pro
6481diff --git a/src/tools/messageserver/messageserver.pro b/src/tools/messageserver/messageserver.pro
6482index 6216729..b04ad88 100644
6483--- a/src/tools/messageserver/messageserver.pro
6484+++ b/src/tools/messageserver/messageserver.pro
6485@@ -2,6 +2,9 @@ TEMPLATE = app
6486
6487 include(../../../common.pri)
6488
6489+CONFIG -= x11
6490+CONFIG += console
6491+
6492 TARGET = messageserver
6493 target.path += $$QMF_INSTALL_ROOT/bin
6494 INSTALLS += target
6495@@ -10,22 +13,26 @@ DEPENDPATH += .
6496
6497 INCLUDEPATH += . ../../libraries/qtopiamail \
6498 ../../libraries/qtopiamail/support \
6499- ../../libraries/messageserver
6500+ ../../libraries/messageserver \
6501+ ../../libraries/sparql
6502
6503 LIBS += -L../../libraries/messageserver -lmessageserver \
6504- -L../../libraries/qtopiamail -lqtopiamail
6505+ -L../../libraries/qtopiamail -lqtopiamail \
6506+ -L../../libraries/sparql -lsparql
6507
6508 HEADERS += mailmessageclient.h \
6509 messageserver.h \
6510 servicehandler.h \
6511- newcountnotifier.h
6512+ newcountnotifier.h \
6513+ sparqlindexer.h
6514
6515 SOURCES += mailmessageclient.cpp \
6516 main.cpp \
6517 messageserver.cpp \
6518 prepareaccounts.cpp \
6519 newcountnotifier.cpp \
6520- servicehandler.cpp
6521+ servicehandler.cpp \
6522+ sparqlindexer.cpp
6523
6524 TRANSLATIONS += messageserver-ar.ts \
6525 messageserver-de.ts \
6526@@ -43,10 +50,11 @@ TRANSLATIONS += messageserver-ar.ts \
6527
6528 unix {
6529 # Uncomment this to shutdown cleanly on termination signal
6530- #DEFINES += HANDLE_SHUTDOWN_SIGNALS
6531+ DEFINES += HANDLE_SHUTDOWN_SIGNALS
6532 }
6533
6534 eventd.files = etc/event.d/messageserver
6535 eventd.path = /etc/event.d
6536
6537 INSTALLS += target eventd
6538+
64826539diff --git a/src/tools/messageserver/servicehandler.cpp b/src/tools/messageserver/servicehandler.cpp
64836540index 6112248..470891b 100644
64846541--- a/src/tools/messageserver/servicehandler.cpp