Updated patchmanager icon in notification

sailfishos-patches · Feb 1, 2017 · 45b2cab · 45b2cab
1 parent f3e2e69
commit 45b2cab
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/bin/patchmanager-daemon/main.cpp b/src/bin/patchmanager-daemon/main.cpp
@@ -57,6 +57,8 @@ int main(int argc, char **argv)
         exit(2);
     }
 
+    qputenv("DBUS_SESSION_BUS_ADDRESS", "unix:path=/run/user/100000/dbus/user_bus_socket");
+
     QCoreApplication app (argc, argv);
     PatchManagerObject patchManager;
     new PatchmanagerAdaptor(&patchManager);
@@ -69,8 +71,7 @@ int main(int argc, char **argv)
         return app.exec();
     } else if (arguments.count() == 2) {
         if (arguments.at(1) == "--unapply-all") {
-            patchManager.unapplyAllPatches();
-            return 0;
+            return patchManager.unapplyAllPatches() ? 0 : 2;
         }
     } else if (arguments.count() == 3) {
         QString patch = arguments.at(2);

diff --git a/src/bin/patchmanager-daemon/patchmanagerobject.cpp b/src/bin/patchmanager-daemon/patchmanagerobject.cpp
@@ -180,8 +180,8 @@ void PatchManagerObject::notify(const QString &patch, bool apply, bool success)
 
     Notification notification;
     notification.setAppName(qApp->translate("", "Patchmanager"));
-    notification.setHintValue("x-nemo-icon", "icon-l-developer-mode");
-    notification.setHintValue("x-nemo-preview-icon", "icon-l-developer-mode");
+    notification.setHintValue("x-nemo-icon", "icon-m-patchmanager2");
+    notification.setHintValue("x-nemo-preview-icon", "icon-m-patchmanager2");
     notification.setSummary(summary);
     notification.setBody(body);
     notification.setPreviewSummary(summary);
@@ -284,10 +284,11 @@ bool PatchManagerObject::isPatchApplied(const QString &patch)
 
 bool PatchManagerObject::applyPatch(const QString &patch)
 {
+    m_timer->stop();
+
     QVariantMap patchData = m_metadata[patch];
     QVariant displayName = patchData.contains("display_name") ? patchData["display_name"] : patchData["name"];
 
-    m_timer->stop();
     QProcess process;
     process.setProgram(AUSMT_INSTALL);
 
@@ -311,10 +312,11 @@ bool PatchManagerObject::applyPatch(const QString &patch)
 
 bool PatchManagerObject::unapplyPatch(const QString &patch)
 {
+    m_timer->stop();
+
     QVariantMap patchData = m_metadata[patch];
     QVariant displayName = patchData.contains("display_name") ? patchData["display_name"] : patchData["name"];
 
-    m_timer->stop();
     QProcess process;
     process.setProgram(AUSMT_REMOVE);