From 2ca0f70c0eb69bae5b498d568c9edde85784aead Mon Sep 17 00:00:00 2001
From: Yuri Chornoivan <yurchor@ukr.net>
Date: Sat, 26 Dec 2015 20:37:12 +0100
Subject: minor typos (mail to inkscape-translator)

(bzr r14541)
---
 src/extension/param/string.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/extension/param')

diff --git a/src/extension/param/string.cpp b/src/extension/param/string.cpp
index 4e525ff73..1d9205502 100644
--- a/src/extension/param/string.cpp
+++ b/src/extension/param/string.cpp
@@ -132,7 +132,7 @@ public:
         if (_pref->get(NULL, NULL) != NULL) {
             this->set_text(Glib::ustring(_pref->get(NULL, NULL)));
         }
-        this->set_max_length(_pref->getMaxLength()); //Set the max lenght - default zero means no maximum
+        this->set_max_length(_pref->getMaxLength()); //Set the max length - default zero means no maximum
         this->signal_changed().connect(sigc::mem_fun(this, &ParamStringEntry::changed_text));
     };
     void changed_text (void);
-- 
cgit v1.2.3


From 21713dba2790f08a8c8a14131e73ab0332819488 Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Sun, 27 Dec 2015 10:28:29 +0000
Subject: Fix more GThreads issues

(bzr r14546)
---
 src/extension/param/parameter.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/extension/param')

diff --git a/src/extension/param/parameter.cpp b/src/extension/param/parameter.cpp
index 8c99ee55d..10029893f 100644
--- a/src/extension/param/parameter.cpp
+++ b/src/extension/param/parameter.cpp
@@ -15,22 +15,19 @@
 # include "config.h"
 #endif
 
-#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
-#include <glibmm/threads.h>
-#endif
-
 #ifdef linux  // does the dollar sign need escaping when passed as string parameter?
 # define ESCAPE_DOLLAR_COMMANDLINE
 #endif
 
 #include <cstring>
+
+#include "ui/widget/color-notebook.h"
 #include <xml/node.h>
 
 #include <extension/extension.h>
 #include "document-private.h"
 #include "sp-object.h"
 #include <color.h>
-#include "ui/widget/color-notebook.h"
 
 #include "parameter.h"
 #include "bool.h"
-- 
cgit v1.2.3