[gnome-settings-daemon] xsettings: pass name into set function separately



commit d53eeb804e9a8135462f6c91e2918473a4b8f1d0
Author: Ryan Lortie <desrt desrt ca>
Date:   Wed Mar 7 23:57:15 2012 -0500

    xsettings: pass name into set function separately

 plugins/xsettings/xsettings-manager.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/plugins/xsettings/xsettings-manager.c b/plugins/xsettings/xsettings-manager.c
index e216335..1b871d5 100644
--- a/plugins/xsettings/xsettings-manager.c
+++ b/plugins/xsettings/xsettings-manager.c
@@ -202,15 +202,16 @@ xsettings_manager_delete_setting (XSettingsManager *manager,
 
 static void
 xsettings_manager_set_setting (XSettingsManager *manager,
+                               const gchar      *name,
                                XSettingsSetting *value)
 {
   XSettingsSetting *setting;
 
-  setting = g_hash_table_lookup (manager->settings, value->name);
+  setting = g_hash_table_lookup (manager->settings, name);
 
   if (setting == NULL)
     {
-      setting = xsettings_setting_new (value->name);
+      setting = xsettings_setting_new (name);
       setting->last_change_serial = manager->serial;
       g_hash_table_insert (manager->settings, setting->name, setting);
     }
@@ -233,7 +234,7 @@ xsettings_manager_set_int (XSettingsManager *manager,
   setting.type = XSETTINGS_TYPE_INT;
   setting.data.v_int = value;
 
-  xsettings_manager_set_setting (manager, &setting);
+  xsettings_manager_set_setting (manager, name, &setting);
 }
 
 void
@@ -247,7 +248,7 @@ xsettings_manager_set_string (XSettingsManager *manager,
   setting.type = XSETTINGS_TYPE_STRING;
   setting.data.v_string = (char *)value;
 
-  xsettings_manager_set_setting (manager, &setting);
+  xsettings_manager_set_setting (manager, name, &setting);
 }
 
 void
@@ -261,7 +262,7 @@ xsettings_manager_set_color (XSettingsManager *manager,
   setting.type = XSETTINGS_TYPE_COLOR;
   setting.data.v_color = *value;
 
-  xsettings_manager_set_setting (manager, &setting);
+  xsettings_manager_set_setting (manager, name, &setting);
 }
 
 static void



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]