Merged from HEAD:

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

	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).
This commit is contained in:
Michael Natterer
2005-11-04 12:25:17 +00:00
committed by Michael Natterer
parent a0dd1f6422
commit d4dd35cc91
3 changed files with 19 additions and 1 deletions

View File

@@ -1,3 +1,12 @@
2005-11-04 Michael Natterer <mitch@imendio.com>
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 <tml@novell.com>
* gdk/win32/gdkcolor-win32.c

View File

@@ -1,3 +1,12 @@
2005-11-04 Michael Natterer <mitch@imendio.com>
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 <tml@novell.com>
* gdk/win32/gdkcolor-win32.c

View File

@@ -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;