[hamster-applet] no point in having the temporary flag of activity in the fact

[Toms Baugis <tbaugis src gnome org>]

commit bdc70e38bacbb2b631234dc88f877c75ff3c8a54
Author: Toms Bauģis <toms baugis gmail com>
Date:   Sat Aug 21 22:07:12 2010 +0100

    no point in having the temporary flag of activity in the fact

 src/hamster-time-tracker     |    5 ++---
 src/hamster/applet.py        |    5 ++---
 src/hamster/client.py        |    8 ++++----
 src/hamster/db.py            |    3 +--
 src/hamster/edit_activity.py |    7 +++----
 5 files changed, 12 insertions(+), 16 deletions(-)
---
diff --git a/src/hamster-time-tracker b/src/hamster-time-tracker
index cd396a4..c8e206b 100755
--- a/src/hamster-time-tracker
+++ b/src/hamster-time-tracker
@@ -407,12 +407,11 @@ class ProjectHamster(object):
         activity, temporary = self.new_name.get_value()
 
         fact = stuff.Fact(activity,
-                          tags = self.new_tags.get_text().decode("utf8", "replace"),
-                          temporary = temporary)
+                          tags = self.new_tags.get_text().decode("utf8", "replace"))
         if not fact.activity:
             return
 
-        runtime.storage.add_fact(fact)
+        runtime.storage.add_fact(fact, temporary)
         self.new_name.set_text("")
         self.new_tags.set_text("")
 
diff --git a/src/hamster/applet.py b/src/hamster/applet.py
index ecc51f2..f5dbdae 100755
--- a/src/hamster/applet.py
+++ b/src/hamster/applet.py
@@ -672,12 +672,11 @@ class HamsterApplet(object):
         activity, temporary = self.new_name.get_value()
 
         fact = stuff.Fact(activity,
-                          tags = self.new_tags.get_text().decode("utf8", "replace"),
-                          temporary = temporary)
+                          tags = self.new_tags.get_text().decode("utf8", "replace"))
         if not fact.activity:
             return
 
-        runtime.storage.add_fact(fact)
+        runtime.storage.add_fact(fact, temporary)
         self.new_name.set_text("")
         self.new_tags.set_text("")
         self.__show_toggle(False)
diff --git a/src/hamster/client.py b/src/hamster/client.py
index 007240b..f01fe50 100644
--- a/src/hamster/client.py
+++ b/src/hamster/client.py
@@ -163,7 +163,7 @@ class Storage(gobject.GObject):
         """returns fact by it's ID"""
         return from_dbus_fact(self.conn.GetFact(id))
 
-    def add_fact(self, fact):
+    def add_fact(self, fact, temporary_activity):
         """Add fact. activity name can use the
         `[-]start_time[-end_time] activity category, description #tag1 #tag2`
         syntax, or params can be stated explicitly.
@@ -188,7 +188,7 @@ class Storage(gobject.GObject):
         new_id = self.conn.AddFact(serialized,
                                    start_timestamp,
                                    end_timestamp,
-                                   fact.temporary)
+                                   temporary_activity)
 
         # TODO - the parsing should happen just once and preferably here
         # we should feed (serialized_activity, start_time, end_time) into AddFact and others
@@ -206,7 +206,7 @@ class Storage(gobject.GObject):
         "delete fact from database"
         self.conn.RemoveFact(fact_id)
 
-    def update_fact(self, fact_id, fact):
+    def update_fact(self, fact_id, fact, temporary_activity):
         """Update fact values. See add_fact for rules.
         Update is performed via remove/insert, so the
         fact_id after update should not be used anymore. Instead use the ID
@@ -224,7 +224,7 @@ class Storage(gobject.GObject):
                                        fact.serialized_name(),
                                        start_time,
                                        end_time,
-                                       fact.temporary)
+                                       temporary_activity)
 
         trophies.checker.check_update_based(fact_id, new_id, fact)
         return new_id
diff --git a/src/hamster/db.py b/src/hamster/db.py
index 3afbb74..76358c2 100644
--- a/src/hamster/db.py
+++ b/src/hamster/db.py
@@ -492,8 +492,7 @@ class Storage(storage.Storage):
     def __add_fact(self, activity_name, start_time, end_time = None, temporary = False):
         fact = stuff.Fact(activity_name,
                           start_time = start_time,
-                          end_time = end_time,
-                          temporary = temporary)
+                          end_time = end_time)
 
         if not fact.activity or start_time is None:  # sanity check
             return 0
diff --git a/src/hamster/edit_activity.py b/src/hamster/edit_activity.py
index e23919f..35419f3 100644
--- a/src/hamster/edit_activity.py
+++ b/src/hamster/edit_activity.py
@@ -200,15 +200,14 @@ class CustomFactController:
                           description = self.figure_description(),
                           tags = self.new_tags.get_text().decode('utf8'),
                           start_time = self._get_datetime("start"),
-                          end_time = end_time,
-                          temporary = temporary)
+                          end_time = end_time)
         if not fact.activity:
             return False
 
         if self.fact_id:
-            runtime.storage.update_fact(self.fact_id, fact)
+            runtime.storage.update_fact(self.fact_id, fact, temporary)
         else:
-            runtime.storage.add_fact(fact)
+            runtime.storage.add_fact(fact, temporary)
 
         self.close_window()