Update to experimental r13598

(bzr r13341.5.17)

7 files changed, 14 insertions, 7 deletions

diff --git a/src/ui/widget/highlight-picker.cpp b/src/ui/widget/highlight-picker.cpp
index 2afdc02a6..bc6bdcf22 100644
--- a/src/ui/widget/highlight-picker.cpp
+++ b/src/ui/widget/highlight-picker.cpp
@@ -11,14 +11,14 @@
 # include "config.h"
 #endif
 
+#include <gtkmm/icontheme.h>
+ 
 #if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
 #include <glibmm/threads.h>
 #endif
 
 #include "display/cairo-utils.h"
 
-#include <gtkmm/icontheme.h>
-
 #include "highlight-picker.h"
 #include "widgets/icon.h"
 #include "widgets/toolbox.h"
diff --git a/src/ui/widget/insertordericon.cpp b/src/ui/widget/insertordericon.cpp
index 2f06225bc..97aa30aa6 100644
--- a/src/ui/widget/insertordericon.cpp
+++ b/src/ui/widget/insertordericon.cpp
@@ -7,6 +7,8 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include "ui/widget/insertordericon.h"
+ 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
@@ -15,8 +17,6 @@
 #include <glibmm/threads.h>
 #endif
 
-#include "ui/widget/insertordericon.h"
-
 #include <gtkmm/icontheme.h>
 
 #include "widgets/icon.h"
diff --git a/src/ui/widget/insertordericon.h b/src/ui/widget/insertordericon.h
index 4b4b51de2..e6c2e1c5b 100644
--- a/src/ui/widget/insertordericon.h
+++ b/src/ui/widget/insertordericon.h
@@ -13,9 +13,9 @@
 #include "config.h"
 #endif
 
-#include <glibmm/property.h>
 #include <gtkmm/cellrendererpixbuf.h>
 #include <gtkmm/widget.h>
+#include <glibmm/property.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/ui/widget/object-composite-settings.h b/src/ui/widget/object-composite-settings.h
index 26d83fdc3..5a723a2fd 100644
--- a/src/ui/widget/object-composite-settings.h
+++ b/src/ui/widget/object-composite-settings.h
@@ -30,6 +30,7 @@
 #include "ui/widget/spinbutton.h"
 
 class SPDesktop;
+struct InkscapeApplication;
 
 namespace Inkscape {
 
diff --git a/src/ui/widget/panel.h b/src/ui/widget/panel.h
index b9466e07a..5680cac30 100644
--- a/src/ui/widget/panel.h
+++ b/src/ui/widget/panel.h
@@ -45,6 +45,8 @@ namespace Gtk {
 	class MenuItem;
 }
 
+struct InkscapeApplication;
+
 namespace Inkscape {
 
 class Selection;
diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp
index a0a163286..d3adb6307 100644
--- a/src/ui/widget/selected-style.cpp
+++ b/src/ui/widget/selected-style.cpp
@@ -180,7 +180,11 @@ SelectedStyle::SelectedStyle(bool /*layout*/)
         _na[i].show_all();
         __na[i] = (_("Nothing selected"));
 
-        _none[i].set_markup (C_("Fill and stroke", "<i>None</i>"));
+        if (i == SS_FILL) {
+            _none[i].set_markup (C_("Fill", "<i>None</i>"));
+        } else {
+            _none[i].set_markup (C_("Stroke", "<i>None</i>"));
+        }
         sp_set_font_size_smaller (GTK_WIDGET(_none[i].gobj()));
         _none[i].show_all();
         __none[i] = (i == SS_FILL)? (C_("Fill and stroke", "No fill")) : (C_("Fill and stroke", "No stroke"));
diff --git a/src/ui/widget/unit-tracker.cpp b/src/ui/widget/unit-tracker.cpp
index 67eb1f48d..c6318db25 100644
--- a/src/ui/widget/unit-tracker.cpp
+++ b/src/ui/widget/unit-tracker.cpp
@@ -13,7 +13,7 @@
  */
 
 #include "unit-tracker.h"
-#include "ege-select-one-action.h"
+#include "widgets/ege-select-one-action.h"
 
 #define COLUMN_STRING 0