Fri Sep 20 16:56:54 2002 Owen Taylor <otaylor@redhat.com> ...

diff --git a/ChangeLog b/ChangeLog
index 93f35fbb7bdc2be812aa814fe921b05ebb961230..066702c31ca413317845247ff7ac3dcca35bf62a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Sep 20 16:56:54 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkrc.c (gtk_rc_reparse_all_for_settings):
+       Return TRUE if force_load was specified. (#93738,
+       Vitaly Tishkov.)
+
 2002-09-20  Tor Lillqvist  <tml@iki.fi>
 
        * gtk/gtkmain.c (gtk_get_default_language): On Win32, look

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 93f35fbb7bdc2be812aa814fe921b05ebb961230..066702c31ca413317845247ff7ac3dcca35bf62a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Fri Sep 20 16:56:54 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkrc.c (gtk_rc_reparse_all_for_settings):
+       Return TRUE if force_load was specified. (#93738,
+       Vitaly Tishkov.)
+
 2002-09-20  Tor Lillqvist  <tml@iki.fi>
 
        * gtk/gtkmain.c (gtk_get_default_language): On Win32, look

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 93f35fbb7bdc2be812aa814fe921b05ebb961230..066702c31ca413317845247ff7ac3dcca35bf62a 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Fri Sep 20 16:56:54 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkrc.c (gtk_rc_reparse_all_for_settings):
+       Return TRUE if force_load was specified. (#93738,
+       Vitaly Tishkov.)
+
 2002-09-20  Tor Lillqvist  <tml@iki.fi>
 
        * gtk/gtkmain.c (gtk_get_default_language): On Win32, look

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 93f35fbb7bdc2be812aa814fe921b05ebb961230..066702c31ca413317845247ff7ac3dcca35bf62a 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Fri Sep 20 16:56:54 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkrc.c (gtk_rc_reparse_all_for_settings):
+       Return TRUE if force_load was specified. (#93738,
+       Vitaly Tishkov.)
+
 2002-09-20  Tor Lillqvist  <tml@iki.fi>
 
        * gtk/gtkmain.c (gtk_get_default_language): On Win32, look

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 93f35fbb7bdc2be812aa814fe921b05ebb961230..066702c31ca413317845247ff7ac3dcca35bf62a 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Fri Sep 20 16:56:54 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkrc.c (gtk_rc_reparse_all_for_settings):
+       Return TRUE if force_load was specified. (#93738,
+       Vitaly Tishkov.)
+
 2002-09-20  Tor Lillqvist  <tml@iki.fi>
 
        * gtk/gtkmain.c (gtk_get_default_language): On Win32, look

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 93f35fbb7bdc2be812aa814fe921b05ebb961230..066702c31ca413317845247ff7ac3dcca35bf62a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Fri Sep 20 16:56:54 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkrc.c (gtk_rc_reparse_all_for_settings):
+       Return TRUE if force_load was specified. (#93738,
+       Vitaly Tishkov.)
+
 2002-09-20  Tor Lillqvist  <tml@iki.fi>
 
        * gtk/gtkmain.c (gtk_get_default_language): On Win32, look

diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c
index 4fb271694d800f1d14909c719baeec9c0ded9829..298bd83a0497e8b2d3ff517bd2c1eb2562962628 100644 (file)
--- a/gtk/gtkrc.c
+++ b/gtk/gtkrc.c
@@ -1457,7 +1457,7 @@ gtk_rc_reparse_all_for_settings (GtkSettings *settings,
       gtk_rc_reset_widgets (context);
     }
 
-  return mtime_modified;
+  return force_load || mtime_modified;
 }
 
 /**