Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Marko Mattila committed Apr 17, 2013
2 parents 06f20cd + 4eefd48 commit 57b556f
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 2 deletions.
2 changes: 2 additions & 0 deletions doc/html/.gitignore
@@ -0,0 +1,2 @@
*html
*index*
2 changes: 2 additions & 0 deletions rpm/transfer-engine.spec
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions src/main.cpp
Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions src/transferengine.cpp
Expand Up @@ -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


Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 57b556f

Please sign in to comment.