applied patch from maemo-gtk that changes the mtime check for rc files

2005-11-04  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkrc.c (gtk_rc_reparse_all_for_settings): applied patch
	from maemo-gtk that changes the mtime check for rc files from
	'>' to '!=', otherwise theme changes go unnoticed when turning
	back the clock (Tommi Komulainen).

diff --git a/ChangeLog b/ChangeLog
index ecad919859058fc4cd2355c486ed6ae899cc4c62..057b0417f8cd94c93146664d341785c30a351f7c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-11-04  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtkrc.c (gtk_rc_reparse_all_for_settings): applied patch
+       from maemo-gtk that changes the mtime check for rc files from
+       '>' to '!=', otherwise theme changes go unnoticed when turning
+       back the clock (Tommi Komulainen).
+
 2005-11-04  Tor Lillqvist  <tml@novell.com>
 
        * gtk/gtkstatusicon.c (gtk_status_icon_set_tooltip): Plug memory

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ecad919859058fc4cd2355c486ed6ae899cc4c62..057b0417f8cd94c93146664d341785c30a351f7c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2005-11-04  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtkrc.c (gtk_rc_reparse_all_for_settings): applied patch
+       from maemo-gtk that changes the mtime check for rc files from
+       '>' to '!=', otherwise theme changes go unnoticed when turning
+       back the clock (Tommi Komulainen).
+
 2005-11-04  Tor Lillqvist  <tml@novell.com>
 
        * gtk/gtkstatusicon.c (gtk_status_icon_set_tooltip): Plug memory

diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
index f13886395e3b775a0b9f63d682e2829e9ac62343..8fbb01a1620dc7bced82795e7ec86c2c11952df9 100644 (file)
--- a/gtk/gtkrc.c
+++ b/gtk/gtkrc.c
@@ -1467,7 +1467,7 @@ gtk_rc_reparse_all_for_settings (GtkSettings *settings,
          if (!rc_file->is_string)
            {
              if (!g_lstat (rc_file->name, &statbuf) && 
-                 (statbuf.st_mtime > rc_file->mtime))
+                 (statbuf.st_mtime != rc_file->mtime))
                {
                  mtime_modified = TRUE;
                  break;