From e8f0e3a1ec527229569dce4d0d8d7169f99623f3 Mon Sep 17 00:00:00 2001
From: Yves <yves@marcoz.org>
Date: Tue, 14 Feb 2012 15:43:35 -0800
Subject: [PATCH] psa: removing feedingit from /usr/bin

---
 FeedingIt-Sync/FeedingIt-Sync.pro            |    2 +-
 FeedingIt-Sync/dbus/feedingit_status.service |    2 +-
 FeedingIt-Sync/qml/Articles.qml              |    6 ++++++
 FeedingIt-Sync/qml/main.qml                  |    1 +
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/FeedingIt-Sync/FeedingIt-Sync.pro b/FeedingIt-Sync/FeedingIt-Sync.pro
index 184e171..a66a899 100644
--- a/FeedingIt-Sync/FeedingIt-Sync.pro
+++ b/FeedingIt-Sync/FeedingIt-Sync.pro
@@ -61,7 +61,7 @@ icon.files = feedingit.png
 desktopfiles.path = /usr/share/applications
 desktopfiles.files = feedingit.desktop
 
-binfile.path = /usr/bin/
+binfile.path = /usr/share/feedingit/
 binfile.files = feedingit
 
 backup.path = /usr/share/backup-framework/applications
diff --git a/FeedingIt-Sync/dbus/feedingit_status.service b/FeedingIt-Sync/dbus/feedingit_status.service
index cef9213..5e85d8b 100644
--- a/FeedingIt-Sync/dbus/feedingit_status.service
+++ b/FeedingIt-Sync/dbus/feedingit_status.service
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.marcoz.feedingit
-Exec=/usr/bin/feedingit dbus
+Exec=/usr/bin/nice /usr/bin/python /usr/share/feedingit/update_feeds.py --daemon
diff --git a/FeedingIt-Sync/qml/Articles.qml b/FeedingIt-Sync/qml/Articles.qml
index 25ec145..44b4021 100644
--- a/FeedingIt-Sync/qml/Articles.qml
+++ b/FeedingIt-Sync/qml/Articles.qml
@@ -35,6 +35,12 @@ Item {
         articlePage.mainArticleId = controller.getPreviousId(articlePage.feedid,articlePage.mainArticleId, settings.hideReadArticles)
     }
 
+    function lockMovement() {
+        // Prevents the 2 flickables from moving when we're closing the page
+        flickableFront.isSwitchable = false;
+        flickableBack.isSwitchable = false;
+    }
+
     Component.onCompleted: {
         webViewFront.html = controller.getArticle(articlePage.feedid, articlePage.mainArticleId);
     }
diff --git a/FeedingIt-Sync/qml/main.qml b/FeedingIt-Sync/qml/main.qml
index 738bb2f..4dfbc33 100644
--- a/FeedingIt-Sync/qml/main.qml
+++ b/FeedingIt-Sync/qml/main.qml
@@ -305,6 +305,7 @@ PageStackWindow {
                 visible: false
                 ToolIcon { iconId: "toolbar-back";
                     onClicked: {
+                        articlePage.lockMovement();
                         window.articlesReloadRequest();
                         pageStack.pop();
                     }
-- 
1.7.9.5