Merge lp:~ken-vandine/friends/lp1248143 into lp:friends

[Ken VanDine]

Undo revert for the default polling frequency and ensure interval is set before using it in the timeout.

Undo revert for the default polling frequency and ensure interval is set before using it in the timeout.

[Robert Bruce Park (robru)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'data/com.canonical.friends.gschema.xml'
--- data/com.canonical.friends.gschema.xml	2013-11-05 12:17:33 +0000
+++ data/com.canonical.friends.gschema.xml	2013-11-05 18:57:18 +0000
@@ -2,9 +2,9 @@
   <schema id="com.canonical.friends" path="/com/canonical/friends/">
 
     <key name="interval" type="i">
-      <default>15</default>
+      <default>60</default>
       <summary>Refresh interval in minutes.</summary>
-      <range min="5" max="30"/>
+      <range min="15" max="600"/>
       <description>
         The number of minutes friends-service will wait in between
         attempts at downloading new messages.
 
=== modified file 'service/src/service.vala'
--- service/src/service.vala	2013-11-05 12:17:33 +0000
+++ service/src/service.vala	2013-11-05 18:57:18 +0000
@@ -126,6 +126,9 @@
             model.set_schema_full (SCHEMA);
         }
 
+        var settings = new Settings ("com.canonical.friends");
+        settings.bind("interval", this, "interval", 0);
+
         if (model is Dee.Model)
         {
             debug ("Model with %u rows", model.get_n_rows());
@@ -161,7 +164,7 @@
                     debug ("NOT LEADER");
             });
 
-            Timeout.add_seconds (300, () => {
+            Timeout.add_seconds (interval * 60, () => {
                 shared_model.flush_revision_queue();
                 debug ("Storing model with %u rows", model.get_n_rows());
                 resources.store ((Dee.SequenceModel)model, "com.canonical.Friends.Streams");
@@ -169,9 +172,6 @@
             });
         }
 
-        var settings = new Settings ("com.canonical.friends");
-        settings.bind("interval", this, "interval", 0);
-
         Bus.get_proxy.begin<Dispatcher>(BusType.SESSION,
             "com.canonical.Friends.Dispatcher",
             "/com/canonical/friends/Dispatcher",