Ignore log files that don't have a good filename. Fixes bug #462046

2007-09-21  Xavier Claessens  <xclaesse@gmail.com>

	* libempathy/empathy-log-manager.c: Ignore log files that don't have a
	good filename. Fixes bug #462046 (Michael Scherer).
	* configure.ac: Bump GLIB version to 2.14.0.

svn path=/trunk/; revision=309

diff --git a/ChangeLog b/ChangeLog
index c395899feea04c48531c8b71074e0f09ff7327a9..4717a3b738d132d45851763959c7489df6414375 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-21  Xavier Claessens  <xclaesse@gmail.com>
+
+       * libempathy/empathy-log-manager.c: Ignore log files that don't have a
+       good filename. Fixes bug #462046 (Michael Scherer).
+       * configure.ac: Bump GLIB version to 2.14.0.
+
 2007-09-21  Xavier Claessens  <xclaesse@gmail.com>
 
        * doc/libempathy-gtk/Makefile.am: Explicitely use libempathy from

diff --git a/configure.ac b/configure.ac
index bade8bb304ca82ecda0af43e16bcdc9525a6ba1a..92f5def93fa61de27ead010a9b2a58980cc3ce5b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -45,7 +45,7 @@ IT_PROG_INTLTOOL([0.35.0])
 
 GTK_DOC_CHECK([1.3])
 
-GLIB_REQUIRED=2.12.0
+GLIB_REQUIRED=2.14.0
 GTK_REQUIRED=2.12.0
 GCONF_REQUIRED=1.2.0
 LIBGLADE_REQUIRED=2.0.0

diff --git a/libempathy/empathy-log-manager.c b/libempathy/empathy-log-manager.c
index e47f50fb83ac6c6345781a5257b00cc6940aa9ad..efdbae86b18fbd7b8bdfc9f04d6eb59800dc680b 100644 (file)
--- a/libempathy/empathy-log-manager.c
+++ b/libempathy/empathy-log-manager.c
@@ -263,6 +263,10 @@ empathy_log_manager_get_dates (EmpathyLogManager *manager,
                        continue;
                }
 
+               if (!g_regex_match_simple ("\\d{8}", date, 0, 0)) {
+                       continue;
+               }
+
                dates = g_list_insert_sorted (dates, date, (GCompareFunc) strcmp);
        }