Hrvoje Senjan 2015-03-07 20:11:44 +00:00 committed by Git OBS Bridge
parent 93f3c6d06a
commit 46c10fea5b

View File

@ -1,8 +1,8 @@
diff --git a/autotests/Process.cpp b/autotests/Process.cpp
index a7a0507..afa4bf1 100644
--- a/autotests/Process.cpp
+++ b/autotests/Process.cpp
@@ -83,7 +83,7 @@ void Modifier::initTestCase()
diff --git a/autotests/core/Process.cpp b/autotests/core/Process.cpp
index 664dc93..0a3f281 100644
--- a/autotests/core/Process.cpp
+++ b/autotests/core/Process.cpp
@@ -85,7 +85,7 @@ void Modifier::initTestCase()
// qDebug() << env;
s_process->setEnvironment(env);
@ -12,10 +12,10 @@ index a7a0507..afa4bf1 100644
diff --git a/src/lib/core/manager_p.cpp b/src/lib/core/manager_p.cpp
index 077c634..7be66dd 100644
index 09003c1..984c910 100644
--- a/src/lib/core/manager_p.cpp
+++ b/src/lib/core/manager_p.cpp
@@ -94,11 +94,11 @@ Manager *Manager::self()
@@ -64,11 +64,11 @@ Manager *Manager::self()
->property("org.kde.KActivities.core.disableAutostart")
.toBool()) {
qCDebug(KAMD_CORELIB) << "Starting the activity manager daemon";
@ -30,19 +30,10 @@ index 077c634..7be66dd 100644
}
diff --git a/src/service/Application.cpp b/src/service/Application.cpp
index 6b0e3e1..3894540 100644
index eef0eb4..6e2f7d7 100644
--- a/src/service/Application.cpp
+++ b/src/service/Application.cpp
@@ -280,7 +280,7 @@ int main(int argc, char **argv)
application.setApplicationName(QStringLiteral("ActivityManager"));
application.setOrganizationDomain(QStringLiteral("kde.org"));
- // KAboutData about("kactivitymanagerd", Q_NULLPTR, ki18n("KDE Activity Manager"), "3.0",
+ // KAboutData about("kactivitymanagerd5", Q_NULLPTR, ki18n("KDE Activity Manager"), "3.0",
// ki18n("KDE Activity Management Service"),
// KAboutData::License_GPL,
// ki18n("(c) 2010, 2011, 2012 Ivan Cukic"), KLocalizedString(),
@@ -333,7 +333,7 @@ int main(int argc, char **argv)
@@ -360,7 +360,7 @@ int main(int argc, char **argv)
// Starting the dameon
QProcess::startDetached(
@ -52,10 +43,10 @@ index 6b0e3e1..3894540 100644
);
diff --git a/src/service/CMakeLists.txt b/src/service/CMakeLists.txt
index 4b4978b..2220f34 100644
index 68ad30b..750a85d 100644
--- a/src/service/CMakeLists.txt
+++ b/src/service/CMakeLists.txt
@@ -62,9 +62,9 @@ qt5_add_dbus_adaptor (
@@ -63,9 +63,9 @@ qt5_add_dbus_adaptor (
Features.h Features
)
@ -67,7 +58,7 @@ index 4b4978b..2220f34 100644
Qt5::Core
Qt5::DBus
Qt5::Widgets
@@ -84,7 +84,7 @@ install (FILES
@@ -85,7 +85,7 @@ install (FILES
)
install (TARGETS
@ -77,7 +68,7 @@ index 4b4978b..2220f34 100644
install (FILES
diff --git a/src/service/files/kactivitymanagerd.desktop b/src/service/files/kactivitymanagerd.desktop
index be5faa1..3c9b9a9 100644
index b3d698f..a662bcf 100644
--- a/src/service/files/kactivitymanagerd.desktop
+++ b/src/service/files/kactivitymanagerd.desktop
@@ -4,7 +4,7 @@ Icon=preferences-activities