gedit r6668 - in trunk: . gedit

[pborelli svn gnome org]

Author: pborelli
Date: Sat Dec 20 14:21:50 2008
New Revision: 6668
URL: http://svn.gnome.org/viewvc/gedit?rev=6668&view=rev

Log:
2008-12-20  Paolo Borelli  <pborelli katamail com>

	* gedit/gedit-metadata-manager.c:
	* gedit/gedit-tab.c:
	Use g_timeout_add_seconds. Bug #565127, patch by
	mail paul kishimoto name 



Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/gedit/gedit-metadata-manager.c
   trunk/gedit/gedit-tab.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sat Dec 20 14:21:50 2008
@@ -347,7 +347,7 @@
 GNOME_COMPILE_WARNINGS(yes)
 
 AC_ARG_ENABLE(deprecations,
-              [AC_HELP_STRING([--enable-deprecations],
+              [AS_HELP_STRING([--enable-deprecations],
                               [warn about deprecated usages [default=no]])],,
               [enable_deprecations=no])
 

Modified: trunk/gedit/gedit-metadata-manager.c
==============================================================================
--- trunk/gedit/gedit-metadata-manager.c	(original)
+++ trunk/gedit/gedit-metadata-manager.c	Sat Dec 20 14:21:50 2008
@@ -93,15 +93,15 @@
 static void
 gedit_metadata_manager_arm_timeout (void)
 {
-	if (gedit_metadata_manager->timeout_id)
-		return;
-		
-	gedit_metadata_manager->timeout_id = 
-		g_timeout_add_full (G_PRIORITY_DEFAULT_IDLE,
-				    2000, /* 2 sec */
-				    (GSourceFunc)gedit_metadata_manager_save,
-				    NULL,
-				    NULL);
+	if (gedit_metadata_manager->timeout_id == 0)
+	{
+		gedit_metadata_manager->timeout_id = 
+			g_timeout_add_seconds_full (G_PRIORITY_DEFAULT_IDLE,
+						    2,
+						    (GSourceFunc)gedit_metadata_manager_save,
+						    NULL,
+						    NULL);
+	}
 }
 
 static gboolean

Modified: trunk/gedit/gedit-tab.c
==============================================================================
--- trunk/gedit/gedit-tab.c	(original)
+++ trunk/gedit/gedit-tab.c	Sat Dec 20 14:21:50 2008
@@ -115,11 +115,11 @@
 	g_return_if_fail (tab->priv->state != GEDIT_TAB_STATE_SAVING_ERROR);
 	g_return_if_fail (tab->priv->state != GEDIT_TAB_STATE_SAVING_ERROR);
 	g_return_if_fail (tab->priv->state != GEDIT_TAB_STATE_REVERTING_ERROR);
-	
+
 	/* Add a new timeout */
-	timeout = g_timeout_add (tab->priv->auto_save_interval * 1000 * 60,
-				 (GSourceFunc) gedit_tab_auto_save,
-				 tab);
+	timeout = g_timeout_add_seconds (tab->priv->auto_save_interval * 60,
+					 (GSourceFunc) gedit_tab_auto_save,
+					 tab);
 
 	tab->priv->auto_save_timeout = timeout;
 }
@@ -128,7 +128,7 @@
 install_auto_save_timeout_if_needed (GeditTab *tab)
 {
 	GeditDocument *doc;
-	
+
 	gedit_debug (DEBUG_TAB);
 	
 	g_return_val_if_fail (tab->priv->auto_save_timeout <= 0, FALSE);
@@ -2120,18 +2120,18 @@
 	if ((tab->priv->state != GEDIT_TAB_STATE_NORMAL) &&
 	    (tab->priv->state != GEDIT_TAB_STATE_SHOWING_PRINT_PREVIEW))
 	{
-		/* Retry after 15 seconds */
+		/* Retry after 30 seconds */
 		guint timeout;
-		
-		gedit_debug_message (DEBUG_TAB, "Retry after 15 seconds");
-	
+
+		gedit_debug_message (DEBUG_TAB, "Retry after 30 seconds");
+
 		/* Add a new timeout */
-		timeout = g_timeout_add (30 * 1000,
-					(GSourceFunc) gedit_tab_auto_save,
-					tab);
+		timeout = g_timeout_add_seconds (30,
+						 (GSourceFunc) gedit_tab_auto_save,
+						 tab);
 
 		tab->priv->auto_save_timeout = timeout;
-	    
+
 	    	/* Returns FALSE so the old timeout is "destroyed" */
 		return FALSE;
 	}