jana r739 - in trunk: . libjana-ecal

[rbradford svn gnome org]

Author: rbradford
Date: Wed Mar 11 21:14:18 2009
New Revision: 739
URL: http://svn.gnome.org/viewvc/jana?rev=739&view=rev

Log:
2009-03-11  Rob Bradford  <rob linux intel com>

	* libjana-ecal/jana-ecal-utils.c (jana_ecal_utils_guess_location):
	  Avoid unreffing the GRegex twice.

Modified:
   trunk/ChangeLog
   trunk/libjana-ecal/jana-ecal-utils.c

Modified: trunk/libjana-ecal/jana-ecal-utils.c
==============================================================================
--- trunk/libjana-ecal/jana-ecal-utils.c	(original)
+++ trunk/libjana-ecal/jana-ecal-utils.c	Wed Mar 11 21:14:18 2009
@@ -120,7 +120,8 @@
 	icalarray *builtin;
 	time_t now_t = time (NULL);
 	struct tm *now = localtime (&now_t);
-	
+
+#if 0
 	/* Check the Evolution timezone key first */
 	tzname = gconf_client_get_string (gconf_client_get_default (),
 		JANA_ECAL_LOCATION_KEY, NULL);
@@ -141,6 +142,7 @@
 		}
 		fclose (file);
 	}
+#endif        
 	
 #if GLIB_CHECK_VERSION(2,14,0)
 	/* OpenSuSE (and RH?) systems have /etc/sysconfig/clock */
@@ -163,6 +165,7 @@
 				
 				g_match_info_free (match_info);
 				g_regex_unref (regex);
+				regex = NULL;
 				
 				if (match[strlen (match) - 2] == '\n')
 					match[strlen (match)-2] = '\0';