Merge lp:~tintou/granite/fix-1014022 into lp:~elementary-pantheon/granite/granite

[Corentin Noël]

Correct bug 1014022 (and then apps can start faster...)

[Sergey "Shnatsel" Davidoff (shnatsel)]

I though agent00tai did some work on refactoring Granite.Settings with similar tweaks to fix bug 969077. He also did some fixes to the entire thing AFAIR. I wonder what happened to that work...

[Fabian Thoma (fabianthoma)]

No shnatsel I fixed the whole thing with string arrays not working and
another one where Apps would crash, but I didn't look into this one ;)

[Victor Martinez (victored)]

The overhead generated by these checks is negligible compared to the performance benefits.

The change in DynamicNotebook.vala probably deserves its own revision, since it implies a behavioral API change.

review: Approve

=== modified file 'lib/Services/Settings.vala'
--- lib/Services/Settings.vala	2012-04-01 21:10:09 +0000
+++ lib/Services/Settings.vala	2012-06-16 10:48:20 +0000
@@ -269,17 +269,22 @@
             
             if(val.type() == prop.value_type) {
                 if(type == typeof (int))
-                    success = schema.set_int (key, val.get_int ());
+                    if (val.get_int () != schema.get_int (key))
+                        success = schema.set_int (key, val.get_int ());
                 else if(type == typeof (double))
-                    success = schema.set_double (key, val.get_double ());
+                    if (val.get_double () != schema.get_double (key))
+                        success = schema.set_double (key, val.get_double ());
                 else if(type == typeof (string))
-                    success = schema.set_string (key, val.get_string ());
+                    if (val.get_string () != schema.get_string (key))
+                        success = schema.set_string (key, val.get_string ());
                 else if(type == typeof (string[])) {
                     string[] strings = null;
                     this.get(key, &strings);
-                    success = schema.set_strv (key, strings);
+                    if (strings != schema.get_strv (key))
+                        success = schema.set_strv (key, strings);
                 } else if(type == typeof (bool))
-                    success = schema.set_boolean (key, val.get_boolean ());
+                    if (val.get_boolean () != schema.get_boolean (key))
+                        success = schema.set_boolean (key, val.get_boolean ());
             }
             else if (type.is_a (typeof (SettingsSerializable)))
                 success = schema.set_string (key, (val.get_object () as SettingsSerializable).settings_serialize ());

=== modified file 'lib/Widgets/DynamicNotebook.vala'
--- lib/Widgets/DynamicNotebook.vala	2012-04-06 09:49:00 +0000
+++ lib/Widgets/DynamicNotebook.vala	2012-06-16 10:48:20 +0000
@@ -895,7 +895,7 @@
         if (page < tabs.tabs.size && page >= 0)
             return tabs.tabs[page];
         else
-            return null;
+            return new Tab ("");;
     }
 }