← Back to team overview

elementaryart team mailing list archive

[Merge] lp:~tintou/granite/fix-1014022 into lp:granite

 

Corentin Noël has proposed merging lp:~tintou/granite/fix-1014022 into lp:granite.

Requested reviews:
  elementary Pantheon team (elementary-pantheon)

For more details, see:
https://code.launchpad.net/~tintou/granite/fix-1014022/+merge/110654

Correct bug 1014022 (and then apps can start faster...)
-- 
https://code.launchpad.net/~tintou/granite/fix-1014022/+merge/110654
Your team elementaryart (old) is subscribed to branch lp:granite.
=== 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:46:18 +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:46:18 +0000
@@ -895,7 +895,7 @@
         if (page < tabs.tabs.size && page >= 0)
             return tabs.tabs[page];
         else
-            return null;
+            return new Tab ("");;
     }
 }
 


Follow ups