Fix missing adjustments for new type of

Mon Nov 25 17:10:54 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtksettings.c (gtk_settings_set_property_value):
        Fix missing adjustments for new type of
        gtk_settings_set_property_value_internal(). (#99436,
        Iain Holmes.)

        * gtk/gtksettings.c (apply_queued_setting): Set the
        source _after_ we call g_object_set_property, or otherwise
        we get the APPLICATION source from our setter
        implemenatation.

diff --git a/ChangeLog b/ChangeLog
index 1043cc174c6660167dbe27c330174ed7c9a2db29..5c1c1fc112ec6bb71d391e3f8f7e0f4301b061f8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Mon Nov 25 17:10:54 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtksettings.c (gtk_settings_set_property_value): 
+       Fix missing adjustments for new type of
+       gtk_settings_set_property_value_internal(). (#99436,
+       Iain Holmes.)
+
+       * gtk/gtksettings.c (apply_queued_setting): Set the
+       source _after_ we call g_object_set_property, or otherwise
+       we get the APPLICATION source from our setter 
+       implemenatation.
+
 2002-11-25  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkevents-win32.c (print_event_state,

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1043cc174c6660167dbe27c330174ed7c9a2db29..5c1c1fc112ec6bb71d391e3f8f7e0f4301b061f8 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,15 @@
+Mon Nov 25 17:10:54 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtksettings.c (gtk_settings_set_property_value): 
+       Fix missing adjustments for new type of
+       gtk_settings_set_property_value_internal(). (#99436,
+       Iain Holmes.)
+
+       * gtk/gtksettings.c (apply_queued_setting): Set the
+       source _after_ we call g_object_set_property, or otherwise
+       we get the APPLICATION source from our setter 
+       implemenatation.
+
 2002-11-25  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkevents-win32.c (print_event_state,

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 1043cc174c6660167dbe27c330174ed7c9a2db29..5c1c1fc112ec6bb71d391e3f8f7e0f4301b061f8 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,15 @@
+Mon Nov 25 17:10:54 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtksettings.c (gtk_settings_set_property_value): 
+       Fix missing adjustments for new type of
+       gtk_settings_set_property_value_internal(). (#99436,
+       Iain Holmes.)
+
+       * gtk/gtksettings.c (apply_queued_setting): Set the
+       source _after_ we call g_object_set_property, or otherwise
+       we get the APPLICATION source from our setter 
+       implemenatation.
+
 2002-11-25  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkevents-win32.c (print_event_state,

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 1043cc174c6660167dbe27c330174ed7c9a2db29..5c1c1fc112ec6bb71d391e3f8f7e0f4301b061f8 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,15 @@
+Mon Nov 25 17:10:54 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtksettings.c (gtk_settings_set_property_value): 
+       Fix missing adjustments for new type of
+       gtk_settings_set_property_value_internal(). (#99436,
+       Iain Holmes.)
+
+       * gtk/gtksettings.c (apply_queued_setting): Set the
+       source _after_ we call g_object_set_property, or otherwise
+       we get the APPLICATION source from our setter 
+       implemenatation.
+
 2002-11-25  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkevents-win32.c (print_event_state,

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 1043cc174c6660167dbe27c330174ed7c9a2db29..5c1c1fc112ec6bb71d391e3f8f7e0f4301b061f8 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,15 @@
+Mon Nov 25 17:10:54 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtksettings.c (gtk_settings_set_property_value): 
+       Fix missing adjustments for new type of
+       gtk_settings_set_property_value_internal(). (#99436,
+       Iain Holmes.)
+
+       * gtk/gtksettings.c (apply_queued_setting): Set the
+       source _after_ we call g_object_set_property, or otherwise
+       we get the APPLICATION source from our setter 
+       implemenatation.
+
 2002-11-25  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkevents-win32.c (print_event_state,

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 1043cc174c6660167dbe27c330174ed7c9a2db29..5c1c1fc112ec6bb71d391e3f8f7e0f4301b061f8 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,15 @@
+Mon Nov 25 17:10:54 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtksettings.c (gtk_settings_set_property_value): 
+       Fix missing adjustments for new type of
+       gtk_settings_set_property_value_internal(). (#99436,
+       Iain Holmes.)
+
+       * gtk/gtksettings.c (apply_queued_setting): Set the
+       source _after_ we call g_object_set_property, or otherwise
+       we get the APPLICATION source from our setter 
+       implemenatation.
+
 2002-11-25  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkevents-win32.c (print_event_state,

diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index a9b7537e037ea4e99914c4c2c0620fc3207d10c8..ae5ed3cb728f0b9a7a1d7bd87d0cafdc94d918fd 100644 (file)
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -343,12 +343,11 @@ gtk_settings_get_property (GObject     *object,
       g_value_type_transformable (G_TYPE_STRING, G_VALUE_TYPE (value)) ||
       g_value_type_transformable (GDK_TYPE_COLOR, G_VALUE_TYPE (value)))
     {
-      if (settings->property_values[property_id - 1].source == GTK_SETTINGS_SOURCE_APPLICATION)
+      if (settings->property_values[property_id - 1].source == GTK_SETTINGS_SOURCE_APPLICATION ||
+         !gdk_screen_get_setting (settings->screen, pspec->name, value))
         g_value_copy (&settings->property_values[property_id - 1].value, value);
-      else if (gdk_screen_get_setting (settings->screen, pspec->name, value))
-        g_param_value_validate (pspec, value);
       else
-        g_value_copy (&settings->property_values[property_id - 1].value, value);
+        g_param_value_validate (pspec, value);
     }
   else
     {
@@ -500,8 +499,8 @@ apply_queued_setting (GtkSettings             *data,
   if (_gtk_settings_parse_convert (parser, &qvalue->public.value,
                                   pspec, &tmp_value))
     {
-      data->property_values[pspec->param_id - 1].source = qvalue->source;
       g_object_set_property (G_OBJECT (data), pspec->name, &tmp_value);
+      data->property_values[pspec->param_id - 1].source = qvalue->source;
     }
   else
     {
@@ -689,7 +688,8 @@ gtk_settings_set_property_value (GtkSettings            *settings,
   g_return_if_fail (new_value != NULL);
   g_return_if_fail (new_value->origin != NULL);
 
-  gtk_settings_set_property_value_internal (settings, prop_name, new_value, FALSE);
+  gtk_settings_set_property_value_internal (settings, prop_name, new_value,
+                                           GTK_SETTINGS_SOURCE_APPLICATION);
 }
 
 void
@@ -702,7 +702,8 @@ _gtk_settings_set_property_value_from_rc (GtkSettings            *settings,
   g_return_if_fail (new_value != NULL);
   g_return_if_fail (new_value->origin != NULL);
 
-  gtk_settings_set_property_value_internal (settings, prop_name, new_value, TRUE);
+  gtk_settings_set_property_value_internal (settings, prop_name, new_value,
+                                           GTK_SETTINGS_SOURCE_RC_FILE);
 }
 
 void