From d4dd35cc91be0f3210bba789544836095b69bde8 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Fri, 4 Nov 2005 12:25:17 +0000 Subject: [PATCH] Merged from HEAD: 2005-11-04 Michael Natterer Merged from HEAD: * 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). --- ChangeLog | 9 +++++++++ ChangeLog.pre-2-10 | 9 +++++++++ gtk/gtkrc.c | 2 +- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d64fe3fab1..c3f45ab1ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2005-11-04 Michael Natterer + + Merged from HEAD: + + * 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-02 Tor Lillqvist * gdk/win32/gdkcolor-win32.c diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index d64fe3fab1..c3f45ab1ff 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +2005-11-04 Michael Natterer + + Merged from HEAD: + + * 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-02 Tor Lillqvist * gdk/win32/gdkcolor-win32.c diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c index 52725d1adb..d1343c0eec 100644 --- a/gtk/gtkrc.c +++ b/gtk/gtkrc.c @@ -1464,7 +1464,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;