merged from trunk

(bzr r11608.1.58)

18 files changed, 33 insertions, 65 deletions

diff --git a/src/ege-color-prof-tracker.h b/src/ege-color-prof-tracker.h
index 09aeae970..19423c19f 100644
--- a/src/ege-color-prof-tracker.h
+++ b/src/ege-color-prof-tracker.h
@@ -45,16 +45,12 @@
 
 /* Note: this file should be kept compilable as both .cpp and .c */
 
-#include <glib.h>
 #include <glib-object.h>
 
+typedef struct _GtkWidget GtkWidget;
 
 G_BEGIN_DECLS
 
-#ifdef __cplusplus
-typedef struct _GtkWidget      GtkWidget;
-#endif /* __cplusplus */
-
 #define EGE_COLOR_PROF_TRACKER_TYPE                ( ege_color_prof_tracker_get_type() )
 #define EGE_COLOR_PROF_TRACKER( obj )              ( G_TYPE_CHECK_INSTANCE_CAST( (obj), EGE_COLOR_PROF_TRACKER_TYPE, EgeColorProfTracker) )
 #define EGE_COLOR_PROF_TRACKER_CLASS( klass )      ( G_TYPE_CHECK_CLASS_CAST( (klass), EGE_COLOR_PROF_TRACKER_TYPE, EgeColorProfTrackerClass) )
diff --git a/src/registrytool.cpp b/src/registrytool.cpp
index 72b53821e..01a83a7e0 100644
--- a/src/registrytool.cpp
+++ b/src/registrytool.cpp
@@ -21,12 +21,13 @@
  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include "registrytool.h"
+
 #include <windows.h>
 #include <string>
 #include <cstdio>
 
-#include "registrytool.h"
-
+#include <glibmm/ustring.h>
 
 typedef struct
 {
diff --git a/src/sp-rect.cpp b/src/sp-rect.cpp
index c0da69613..813a29367 100644
--- a/src/sp-rect.cpp
+++ b/src/sp-rect.cpp
@@ -106,13 +106,13 @@ void CRect::set(unsigned key, gchar const *value) {
             object->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
             break;
         case SP_ATTR_RX:
-            if (!rect->rx.read(value) || rect->rx.value < 0.0) {
+            if (!rect->rx.read(value) || rect->rx.value <= 0.0) {
                 rect->rx.unset();
             }
             object->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
             break;
         case SP_ATTR_RY:
-            if (!rect->ry.read(value) || rect->ry.value < 0.0) {
+            if (!rect->ry.read(value) || rect->ry.value <= 0.0) {
                 rect->ry.unset();
             }
             object->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
diff --git a/src/sp-stop.h b/src/sp-stop.h
index e3b5e3163..55786bfd7 100644
--- a/src/sp-stop.h
+++ b/src/sp-stop.h
@@ -8,15 +8,13 @@
  * Authors?
  */
 
-#include <glib.h>
-#include <glibmm/ustring.h>
 #include "sp-object.h"
 #include "color.h"
+#include <glib.h>
 
-class SPObjectClass;
-
-struct SPStop;
-struct SPStopClass;
+namespace Glib {
+class ustring;
+}
 
 #define SP_TYPE_STOP (sp_stop_get_type())
 #define SP_STOP(o) (G_TYPE_CHECK_INSTANCE_CAST((o), SP_TYPE_STOP, SPStop))
diff --git a/src/ui/cache/svg_preview_cache.cpp b/src/ui/cache/svg_preview_cache.cpp
index 7842bd5b3..74e94b827 100644
--- a/src/ui/cache/svg_preview_cache.cpp
+++ b/src/ui/cache/svg_preview_cache.cpp
@@ -19,7 +19,6 @@
 # include "config.h"
 #endif
 
-#include <glib.h>
 #include <gtk/gtk.h>
 #include <2geom/transforms.h>
 #include "sp-namedview.h"
diff --git a/src/ui/control-manager.cpp b/src/ui/control-manager.cpp
index 62e6ce3a3..5a3c5a496 100644
--- a/src/ui/control-manager.cpp
+++ b/src/ui/control-manager.cpp
@@ -14,7 +14,6 @@
 #include <algorithm>
 #include <set>
 
-#include <glib.h>
 #include <glib-object.h>
 
 #include "display/sodipodi-ctrl.h" // for SP_TYPE_CTRL
diff --git a/src/ui/dialog/clonetiler.cpp b/src/ui/dialog/clonetiler.cpp
index e971cfb09..753320ab9 100644
--- a/src/ui/dialog/clonetiler.cpp
+++ b/src/ui/dialog/clonetiler.cpp
@@ -21,7 +21,6 @@
 
 #include <climits>
 
-#include <glib.h>
 #include <glibmm/i18n.h>
 #include <2geom/transforms.h>
 #include <gtkmm/adjustment.h>
diff --git a/src/ui/dialog/clonetiler.h b/src/ui/dialog/clonetiler.h
index 2cad30e9e..7ec30cfaa 100644
--- a/src/ui/dialog/clonetiler.h
+++ b/src/ui/dialog/clonetiler.h
@@ -11,7 +11,6 @@
 #define __SP_CLONE_TILER_H__
 
 #include "ui/widget/panel.h"
-#include <glib.h>
 #include <gtk/gtk.h>
 
 #include "ui/dialog/desktop-tracker.h"
diff --git a/src/ui/dialog/desktop-tracker.h b/src/ui/dialog/desktop-tracker.h
index c219e8d98..7da55cf2f 100644
--- a/src/ui/dialog/desktop-tracker.h
+++ b/src/ui/dialog/desktop-tracker.h
@@ -7,9 +7,8 @@
 #ifndef SEEN_DIALOG_DESKTOP_TRACKER
 #define SEEN_DIALOG_DESKTOP_TRACKER
 
-#include <stddef.h>
+#include <cstddef>
 #include <sigc++/connection.h>
-#include <glib.h>
 
 typedef struct _GtkWidget GtkWidget;
 class SPDesktop;
diff --git a/src/ui/dialog/find.h b/src/ui/dialog/find.h
index 14d54b8d4..c0c635f94 100644
--- a/src/ui/dialog/find.h
+++ b/src/ui/dialog/find.h
@@ -20,14 +20,12 @@
 #include "ui/widget/button.h"
 #include "ui/widget/entry.h" 
 #include "ui/widget/frame.h"
-#include <glib.h>
 
 #include <gtkmm/box.h>
 #include <gtkmm/buttonbox.h>
 #include <gtkmm/expander.h>
 #include <gtkmm/label.h>
 
-#include "desktop.h"
 #include "ui/dialog/desktop-tracker.h"
 
 class SPItem;
diff --git a/src/ui/dialog/font-substitution.cpp b/src/ui/dialog/font-substitution.cpp
index f0112f1d8..8df3ee5c8 100644
--- a/src/ui/dialog/font-substitution.cpp
+++ b/src/ui/dialog/font-substitution.cpp
@@ -10,6 +10,10 @@
 # include <config.h>
 #endif
 
+#include <gtkmm/messagedialog.h>
+#include <gtkmm/scrolledwindow.h>
+#include <gtkmm/textview.h>
+
 #include <set>
 #include "font-substitution.h"
 
@@ -24,7 +28,9 @@
 #include "preferences.h"
 
 #include "xml/repr.h"
+
 #include "sp-defs.h"
+#include "sp-root.h"
 #include "sp-text.h"
 #include "sp-textpath.h"
 #include "sp-flowtext.h"
@@ -37,6 +43,7 @@
 #include "libnrtype/FontFactory.h"
 #include "libnrtype/font-instance.h"
 
+#include <glibmm/i18n.h>
 #include <glibmm/regex.h>
 
 namespace Inkscape {
@@ -228,7 +235,11 @@ GSList * FontSubstitution::getFontReplacedItems(SPDocument* doc, Glib::ustring *
             std::set<Glib::ustring>::const_iterator iter = setFontSpans.find(font);
             if (iter != setFontSpans.end() ||
                     font == Glib::ustring("sans-serif") ||
-                    font == Glib::ustring("Sans")) {
+                    font == Glib::ustring("Sans") ||
+                    font == Glib::ustring("serif") ||
+                    font == Glib::ustring("Serif") ||
+                    font == Glib::ustring("monospace") ||
+                    font == Glib::ustring("Monospace")) {
                 fontFound = true;
                 break;
             }
@@ -236,7 +247,7 @@ GSList * FontSubstitution::getFontReplacedItems(SPDocument* doc, Glib::ustring *
         if (fontFound == false) {
             Glib::ustring subName = getSubstituteFontName(fonts);
             Glib::ustring err = Glib::ustring::compose(
-                    "Font '%1' substituted with '%2'", fonts.c_str(), subName.c_str());
+                    _("Font '%1' substituted with '%2'"), fonts.c_str(), subName.c_str());
             setErrors.insert(err);
             outList = g_slist_prepend (outList, item);
         }
diff --git a/src/ui/dialog/font-substitution.h b/src/ui/dialog/font-substitution.h
index 6fa5aee91..1c445081b 100644
--- a/src/ui/dialog/font-substitution.h
+++ b/src/ui/dialog/font-substitution.h
@@ -12,19 +12,9 @@
 #ifndef INKSCAPE_UI_FONT_SUBSTITUTION_H
 #define INKSCAPE_UI_FONT_SUBSTITUTION_H
 
-#include <gtkmm/box.h>
-#include <gtkmm/widget.h>
-#include <gtkmm/messagedialog.h>
-#include <gtkmm/textview.h>
-#include <gtkmm/scrolledwindow.h>
-#if WITH_GTKMM_3_0
-#include <gtkmm/checkbutton.h>
-#endif
-#include <glibmm/i18n.h>
-#include <glib.h>
-#include <gtk/gtk.h>
-#include "sp-root.h"
+#include <glibmm/ustring.h>
 
+class SPDocument;
 
 namespace Inkscape {
 namespace UI {
@@ -46,7 +36,6 @@ protected:
 private:
     FontSubstitution(FontSubstitution const &d);
     FontSubstitution& operator=(FontSubstitution const &d);
-
 };
 
 } // namespace Dialog
diff --git a/src/ui/dialog/icon-preview.cpp b/src/ui/dialog/icon-preview.cpp
index 801ab2922..1a52410b8 100644
--- a/src/ui/dialog/icon-preview.cpp
+++ b/src/ui/dialog/icon-preview.cpp
@@ -19,7 +19,6 @@
 
 #include <gtkmm/buttonbox.h>
 #include <boost/scoped_ptr.hpp>
-#include <glib.h>
 
 #include <glibmm/i18n.h>
 #include <glibmm/main.h>
diff --git a/src/ui/dialog/object-attributes.cpp b/src/ui/dialog/object-attributes.cpp
index f5addc401..027c9ae56 100644
--- a/src/ui/dialog/object-attributes.cpp
+++ b/src/ui/dialog/object-attributes.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "ui/dialog/dialog-manager.h"
+#include "desktop.h"
 #include "desktop-handles.h"
 #include "macros.h"
 #include "sp-anchor.h"
diff --git a/src/ui/dialog/object-attributes.h b/src/ui/dialog/object-attributes.h
index b0d02a0af..956091989 100644
--- a/src/ui/dialog/object-attributes.h
+++ b/src/ui/dialog/object-attributes.h
@@ -23,9 +23,6 @@
 #ifndef SEEN_DIALOGS_OBJECT_ATTRIBUTES_H
 #define SEEN_DIALOGS_OBJECT_ATTRIBUTES_H
 
-#include <glib.h>
-
-#include "desktop.h"
 #include "ui/dialog/desktop-tracker.h"
 #include "ui/widget/panel.h"
 
diff --git a/src/ui/dialog/symbols.h b/src/ui/dialog/symbols.h
index 5486ff546..08221bf22 100644
--- a/src/ui/dialog/symbols.h
+++ b/src/ui/dialog/symbols.h
@@ -12,15 +12,11 @@
 #ifndef INKSCAPE_UI_DIALOG_SYMBOLS_H
 #define INKSCAPE_UI_DIALOG_SYMBOLS_H
 
-#include "ui/widget/panel.h"
-#include "ui/widget/button.h"
+#include "display/drawing.h"
 
 #include "ui/dialog/desktop-tracker.h"
 
-#include "display/drawing.h"
-
-#include <glib.h>
-#include <gtkmm/treemodel.h>
+#include "ui/widget/panel.h"
 
 #include <vector>
 
@@ -43,9 +39,6 @@ public:
 
     static SymbolsDialog& getInstance();
 
-protected:
-
-
 private:
     SymbolsDialog(SymbolsDialog const &); // no copy
     SymbolsDialog &operator=(SymbolsDialog const &); // no assign
diff --git a/src/ui/tool/node-tool.h b/src/ui/tool/node-tool.h
index bc5267bb2..341faf329 100644
--- a/src/ui/tool/node-tool.h
+++ b/src/ui/tool/node-tool.h
@@ -14,12 +14,9 @@
 #include <memory>
 #include <boost/ptr_container/ptr_map.hpp>
 #include <glib.h>
-#include <stddef.h>
-#include <sigc++/sigc++.h>
 #include "event-context.h"
-#include "ui/tool/node-types.h"
 
-#define INK_TYPE_NODE_TOOL               (ink_node_tool_get_type ())
+#define INK_TYPE_NODE_TOOL            (ink_node_tool_get_type ())
 #define INK_NODE_TOOL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), INK_TYPE_NODE_TOOL, InkNodeTool))
 #define INK_NODE_TOOL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), INK_TYPE_NODE_TOOL, InkNodeToolClass))
 #define INK_IS_NODE_TOOL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), INK_TYPE_NODE_TOOL))
@@ -74,7 +71,7 @@ struct InkNodeTool : public SPEventContext
 };
 
 struct InkNodeToolClass {
-	SPEventContextClass parent_class;
+    SPEventContextClass parent_class;
 };
 
 GType ink_node_tool_get_type (void);
diff --git a/src/ui/uxmanager.h b/src/ui/uxmanager.h
index 5fef08f11..711703192 100644
--- a/src/ui/uxmanager.h
+++ b/src/ui/uxmanager.h
@@ -11,20 +11,13 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib.h>
 #include <vector>
+#include <glib.h>
 
-extern "C"
-{
-    typedef struct _GObject GObject;
-    typedef struct _GtkWidget GtkWidget;
-}
-
+extern "C" typedef struct _GtkWidget GtkWidget;
 class SPDesktop;
-
 struct SPDesktopWidget;
 
-
 namespace Inkscape {
 namespace UI {