Merge branch 'master' of git://git.sugarlabs.org/sugar-toolkit/mainline

src/sugar/acme-volume-alsa.c

@@ -292,7 +292,7 @@ bail:
 static void
 acme_volume_alsa_close (AcmeVolumeAlsa *self)
 {
-	self->_priv->timer_id = g_timeout_add (4000,
+	self->_priv->timer_id = g_timeout_add_seconds (4,
 			(GSourceFunc) acme_volume_alsa_close_real, self);
 }
 

src/sugar/activity/activity.py

@@ -184,8 +184,8 @@ class ActivityToolbar(gtk.Toolbar):
 
     def __title_changed_cb(self, entry):
         if not self._update_title_sid:
-            self._update_title_sid = gobject.timeout_add(
-                                                1000, self.__update_title_cb)
+            self._update_title_sid = gobject.timeout_add_seconds(
+                                                1, self.__update_title_cb)
 
     def __update_title_cb(self):
         title = self.title.get_text()
@@ -507,13 +507,7 @@ class Activity(Window, gtk.Container):
         share_scope = SCOPE_PRIVATE
 
         if handle.object_id:
-            self._jobject = datastore.get(handle.object_id)
-            # TODO: Don't create so many objects until we have versioning
-            # support in the datastore
-            #self._jobject.object_id = ''
-            #del self._jobject.metadata['ctime']
-            del self._jobject.metadata['mtime']
-            
+            self._jobject = datastore.get(handle.object_id)            
             self.set_title(self._jobject.metadata['title'])
                 
             if self._jobject.metadata.has_key('share-scope'):

src/sugar/eggdesktopfile.c

@@ -955,7 +955,7 @@ end_startup_notification (GdkDisplay *display,
 					     NULL);
 }
 
-#define EGG_DESKTOP_FILE_SN_TIMEOUT_LENGTH (30 /* seconds */ * 1000)
+#define EGG_DESKTOP_FILE_SN_TIMEOUT_LENGTH 30 /* seconds */
 
 typedef struct {
   GdkDisplay *display;
@@ -985,7 +985,7 @@ set_startup_notification_timeout (GdkDisplay *display,
   sn_data->display = g_object_ref (display);
   sn_data->startup_id = g_strdup (startup_id);
 
-  g_timeout_add (EGG_DESKTOP_FILE_SN_TIMEOUT_LENGTH,
+  g_timeout_add_seconds (EGG_DESKTOP_FILE_SN_TIMEOUT_LENGTH,
 		 startup_notification_timeout, sn_data);
 }
 #endif /* HAVE_GDK_X11_DISPLAY_BROADCAST_STARTUP_MESSAGE */

src/sugar/graphics/alert.py

@@ -376,7 +376,7 @@ class TimeoutAlert(Alert):
         canvas.show()                       
         self.add_button(gtk.RESPONSE_OK, _('Continue'), canvas)
 
-        gobject.timeout_add(1000, self.__timeout)
+        gobject.timeout_add_seconds(1, self.__timeout)
         
     def __timeout(self):
         self._timeout -= 1

src/sugar/gsm-client-xsmp.c

@@ -110,7 +110,7 @@ gsm_client_xsmp_new (IceConn ice_conn)
 				   client_iochannel_watch, xsmp);
   g_io_channel_unref (channel);
 
-  xsmp->protocol_timeout = g_timeout_add (5000, client_protocol_timeout, xsmp);
+  xsmp->protocol_timeout = g_timeout_add_seconds (5, client_protocol_timeout, xsmp);
 
   set_description (xsmp);
   g_debug ("New client '%s'", xsmp->description);

src/sugar/gsm-session.c

@@ -203,7 +203,7 @@ start_phase (GsmSession *session)
     {
       if (session->phase < GSM_SESSION_PHASE_APPLICATION)
 	{
-	  session->timeout = g_timeout_add (GSM_SESSION_PHASE_TIMEOUT * 1000,
+	  session->timeout = g_timeout_add_seconds (GSM_SESSION_PHASE_TIMEOUT,
 					    phase_timeout, session);
 	}
     }