Skip to content

Commit

Permalink
Merge pull request #6 from sailfishos-patches/dev/unapply-all
Browse files Browse the repository at this point in the history
Fix something wrong happened with patch file
  • Loading branch information
SfietKonstantin authored Aug 14, 2016
2 parents f453867 + d078439 commit 6d5c221
Showing 1 changed file with 0 additions and 39 deletions.
39 changes: 0 additions & 39 deletions src/bin/patchmanager-daemon/patch/unified_diff.patch
Original file line number Diff line number Diff line change
Expand Up @@ -40,42 +40,3 @@ index ca5c814..c330236 100644
}
}
}
index ca5c814..4fd6f01 100644
--- a/usr/share/jolla-settings/pages/sailfishos/mainpage.qml
+++ b/usr/share/jolla-settings/pages/sailfishos/mainpage.qml
@@ -127,6 +127,23 @@ Page {
iface: "org.nemomobile.lipstick"
}

+ DBusInterface {
+ id: patchmanagerBus
+ busType: DBusInterface.SystemBus
+ destination: "org.SfietKonstantin.patchmanager"
+ path: "/org/SfietKonstantin/patchmanager"
+ iface: "org.SfietKonstantin.patchmanager"
+ }
+
+ function unapplyAllCallback(arg) {
+ if (arg) {
+ // Let the UI smoothly fade out first before doing anything scary
+ shutdownBus.call("setShutdownMode", ["upgrade"])
+ // Clear the cache and the system update notification
+ storeIf.clearOsUpdateCheckCache()
+ }
+ }
+
SilicaFlickable {
anchors.fill: parent
contentHeight: content.height
@@ -250,10 +267,7 @@ Page {
}
}
} else if (storeIf.mayInstall) {
- // Let the UI smoothly fade out first before doing anything scary
- shutdownBus.call("setShutdownMode", ["upgrade"])
- // Clear the cache and the system update notification
- storeIf.clearOsUpdateCheckCache()
+ patchmanagerBus.call("unapplyAllPatches", [], unapplyAllCallback)
}
}
}

0 comments on commit 6d5c221

Please sign in to comment.