Commit 57b556f6 authored by Marko Mattila's avatar Marko Mattila

Merge pull request #1 from zchydem/master

Config file is read from a new location now. Merging this because all the review comments have been fixed.
parents 06f20cdf 4eefd485
......@@ -20,6 +20,7 @@ BuildRequires: qt-devel-tools
%files
%defattr(-,root,root,-)
%dir %{_datadir}/nemo-transferengine
%{_libdir}/*.so*
%{_bindir}/nemo-transfer-engine
%{_datadir}/dbus-1/services/org.nemo.transferengine.service
......@@ -91,6 +92,7 @@ make docs
%install
rm -rf %{buildroot}
mkdir -p %{buildroot}/%{_datadir}/nemo-transferengine
%qmake_install
%define def_uid $(grep "^UID_MIN" /etc/login.defs | tr -s " " | cut -d " " -f2)
......
......@@ -33,8 +33,6 @@
int main(int argc, char *argv[])
{
QCoreApplication app(argc, argv);
QCoreApplication::setOrganizationName("nemomobile");
QCoreApplication::setApplicationName("nemo-transfer-engine");
QString translationPath("/usr/share/translations/");
QTranslator engineeringEnglish;
......
......@@ -46,6 +46,7 @@
#include <signal.h>
#define SHARE_PLUGINS_PATH "/usr/lib/nemo-transferengine/plugins"
#define CONFIG_PATH "/usr/share/nemo-transferengine/nemo-transfer-engine.conf"
#define FILE_WATCHER_TIMEOUT 5000
......@@ -74,6 +75,7 @@ TransferEngineSignalHandler::TransferEngineSignalHandler()
TransferEnginePrivate::TransferEnginePrivate(TransferEngine *parent):
m_notificationsEnabled(true),
m_settings(CONFIG_PATH, QSettings::IniFormat),
q_ptr(parent)
{
m_fileWatcherTimer = new QTimer(this);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment