jana r738 - in trunk: . libjana-ecal

[rbradford svn gnome org]

Author: rbradford
Date: Wed Mar 11 12:51:10 2009
New Revision: 738
URL: http://svn.gnome.org/viewvc/jana?rev=738&view=rev

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

	* libjana-ecal/jana-ecal-utils.c (jana_ecal_utils_guess_location):
	  Remove another duplicate fclose (..) on an already closed fp.

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 12:51:10 2009
@@ -137,6 +137,7 @@
 			if (icaltimezone_get_builtin_timezone (string)) {
 				fclose (file);
 				return g_strdup (string);
+			}
 		}
 		fclose (file);
 	}
@@ -162,7 +163,6 @@
 				
 				g_match_info_free (match_info);
 				g_regex_unref (regex);
-				fclose (file);
 				
 				if (match[strlen (match) - 2] == '\n')
 					match[strlen (match)-2] = '\0';
@@ -172,6 +172,7 @@
 				g_free (match);
 				
 				if (icaltimezone_get_builtin_timezone (zone)) {
+					fclose (file);
 					return zone;
 				} else {
 					g_free (zone);