From 35830f456cadaecf8b8e3944e3031a1a93f6cb41 Mon Sep 17 00:00:00 2001
From: Adrian Boguszewski <adrbogus1@student.pg.gda.pl>
Date: Wed, 3 Aug 2016 15:29:38 +0200
Subject: Removed unused includes, decreased compilation time. Once again

(bzr r15034)
---
 src/preferences.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/preferences.cpp')

diff --git a/src/preferences.cpp b/src/preferences.cpp
index e5a5fe7f0..988604a14 100644
--- a/src/preferences.cpp
+++ b/src/preferences.cpp
@@ -15,7 +15,6 @@
 #include <glibmm/fileutils.h>
 #include <glibmm/convert.h>
 #include <glibmm/i18n.h>
-#include <glib.h>
 #include <glib/gstdio.h>
 #include <gtk/gtk.h>
 #include "preferences.h"
-- 
cgit v1.2.3


From 3e00389a40816c12b9b35e3061a752295387aad9 Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Tue, 20 Sep 2016 13:19:44 +0200
Subject: Remove properties with default values from 'style' entries in users
 preferences.xml file. This prevents 'style' entries from becoming full of
 unnecessary properties.

(bzr r15123)
---
 src/preferences.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/preferences.cpp')

diff --git a/src/preferences.cpp b/src/preferences.cpp
index 988604a14..4d522a1d8 100644
--- a/src/preferences.cpp
+++ b/src/preferences.cpp
@@ -24,6 +24,7 @@
 #include "xml/node-iterators.h"
 #include "xml/attribute-record.h"
 #include "util/units.h"
+#include "attribute-rel-util.h"
 
 #define PREFERENCES_FILE_NAME "preferences.xml"
 
@@ -495,6 +496,7 @@ void Preferences::mergeStyle(Glib::ustring const &pref_path, SPCSSAttr *style)
 {
     SPCSSAttr *current = getStyle(pref_path);
     sp_repr_css_merge(current, style);
+    sp_attribute_purge_default_style(current, SP_ATTR_CLEAN_DEFAULT_REMOVE);
     Glib::ustring css_str;
     sp_repr_css_write_string(current, css_str);
     _setRawValue(pref_path, css_str);
-- 
cgit v1.2.3