Merge from trunk

(bzr r10347.1.18)

5 files changed, 55 insertions, 50 deletions

diff --git a/src/dialogs/clonetiler.cpp b/src/dialogs/clonetiler.cpp
index 1738754b4..55b405523 100644
--- a/src/dialogs/clonetiler.cpp
+++ b/src/dialogs/clonetiler.cpp
@@ -856,7 +856,7 @@ static void clonetiler_trace_setup(SPDocument *doc, gdouble zoom, SPItem *origin
     /* Create ArenaItem and set transform */
     trace_visionkey = SPItem::display_key_new(1);
     trace_doc = doc;
-    trace_root = SP_ITEM(trace_doc->getRoot())->invoke_show((NRArena *) trace_arena, trace_visionkey, SP_ITEM_SHOW_DISPLAY);
+    trace_root = trace_doc->getRoot()->invoke_show((NRArena *) trace_arena, trace_visionkey, SP_ITEM_SHOW_DISPLAY);
 
     // hide the (current) original and any tiled clones, we only want to pick the background
     original->invoke_hide(trace_visionkey);
@@ -901,7 +901,7 @@ static guint32 clonetiler_trace_pick(Geom::Rect box)
 static void clonetiler_trace_finish()
 {
     if (trace_doc) {
-        SP_ITEM(trace_doc->getRoot())->invoke_hide(trace_visionkey);
+        trace_doc->getRoot()->invoke_hide(trace_visionkey);
     }
     if (trace_arena) {
         ((NRObject *) trace_arena)->unreference();
@@ -1061,6 +1061,7 @@ static void clonetiler_apply(GtkWidget */*widget*/, void *)
     gdk_window_process_all_updates();
 
     SPObject *obj = selection->singleItem();
+    SPItem *item = SP_IS_ITEM(obj) ? SP_ITEM(obj) : 0;
     Inkscape::XML::Node *obj_repr = obj->getRepr();
     const char *id_href = g_strdup_printf("#%s", obj_repr->attribute("id"));
     SPObject *parent = obj->parent;
@@ -1150,7 +1151,7 @@ static void clonetiler_apply(GtkWidget */*widget*/, void *)
     double gamma_picked = prefs->getDoubleLimited(prefs_path + "gamma_picked", 0, -10, 10);
 
     if (dotrace) {
-        clonetiler_trace_setup (sp_desktop_document(desktop), 1.0, SP_ITEM (obj));
+        clonetiler_trace_setup (sp_desktop_document(desktop), 1.0, item);
     }
 
     Geom::Point center;
@@ -1177,16 +1178,16 @@ static void clonetiler_apply(GtkWidget */*widget*/, void *)
         y0 = sp_repr_get_double_attribute (obj_repr, "inkscape:tile-y0", 0);
     } else {
         bool prefs_bbox = prefs->getBool("/tools/bounding_box", false);
-        SPItem::BBoxType bbox_type = ( prefs_bbox ? 
+        SPItem::BBoxType bbox_type = ( prefs_bbox ?
             SPItem::APPROXIMATE_BBOX : SPItem::GEOMETRIC_BBOX );
-        Geom::OptRect r = SP_ITEM(obj)->getBounds(SP_ITEM(obj)->i2doc_affine(),
+        Geom::OptRect r = item->getBounds(item->i2doc_affine(),
                                                         bbox_type);
         if (r) {
             w = r->dimensions()[Geom::X];
             h = r->dimensions()[Geom::Y];
             x0 = r->min()[Geom::X];
             y0 = r->min()[Geom::Y];
-            center = desktop->dt2doc(SP_ITEM(obj)->getCenter());
+            center = desktop->dt2doc(item->getCenter());
 
             sp_repr_set_svg_double(obj_repr, "inkscape:tile-cx", center[Geom::X]);
             sp_repr_set_svg_double(obj_repr, "inkscape:tile-cy", center[Geom::Y]);
@@ -1402,7 +1403,7 @@ static void clonetiler_apply(GtkWidget */*widget*/, void *)
             Geom::Point new_center;
             bool center_set = false;
             if (obj_repr->attribute("inkscape:transform-center-x") || obj_repr->attribute("inkscape:transform-center-y")) {
-                new_center = desktop->dt2doc(SP_ITEM(obj)->getCenter()) * t;
+                new_center = desktop->dt2doc(item->getCenter()) * t;
                 center_set = true;
             }
 
@@ -1635,7 +1636,7 @@ static GtkWidget * clonetiler_table_x_y_rand(int values)
     {
         GtkWidget *hb = gtk_hbox_new (FALSE, 0);
 
-        GtkWidget *i = sp_icon_new (Inkscape::ICON_SIZE_DECORATION, INKSCAPE_ICON_OBJECT_ROWS);
+        GtkWidget *i = sp_icon_new (Inkscape::ICON_SIZE_DECORATION, INKSCAPE_ICON("object-rows"));
         gtk_box_pack_start (GTK_BOX (hb), i, FALSE, FALSE, 2);
 
         GtkWidget *l = gtk_label_new ("");
@@ -1648,7 +1649,7 @@ static GtkWidget * clonetiler_table_x_y_rand(int values)
     {
         GtkWidget *hb = gtk_hbox_new (FALSE, 0);
 
-        GtkWidget *i = sp_icon_new (Inkscape::ICON_SIZE_DECORATION, INKSCAPE_ICON_OBJECT_COLUMNS);
+        GtkWidget *i = sp_icon_new (Inkscape::ICON_SIZE_DECORATION, INKSCAPE_ICON("object-columns"));
         gtk_box_pack_start (GTK_BOX (hb), i, FALSE, FALSE, 2);
 
         GtkWidget *l = gtk_label_new ("");
@@ -1806,7 +1807,7 @@ void clonetiler_dialog(void)
 // Symmetry
         {
             GtkWidget *vb = clonetiler_new_tab (nb, _("_Symmetry"));
-            
+
 	    /* TRANSLATORS: For the following 17 symmetry groups, see
              * http://www.bib.ulb.ac.be/coursmath/doc/17.htm (visual examples);
              * http://www.clarku.edu/~djoyce/wallpaper/seventeen.html (English vocabulary); or
@@ -1844,14 +1845,14 @@ void clonetiler_dialog(void)
 	    // the symmetry group combo box.
 	    GtkListStore *store = gtk_list_store_new (1, G_TYPE_STRING);
 	    GtkTreeIter iter;
-            
+
 	    for (unsigned j = 0; j < G_N_ELEMENTS(sym_groups); ++j) {
                 SymGroups const &sg = sym_groups[j];
 
 		// Add the description of the symgroup to a new row
 		gtk_list_store_append (store, &iter);
-		gtk_list_store_set (store, &iter, 
-				    0, sg.label, 
+		gtk_list_store_set (store, &iter,
+				    0, sg.label,
 				    -1);
             }
 
diff --git a/src/dialogs/export.cpp b/src/dialogs/export.cpp
index 77447b658..0c2bc5adc 100644
--- a/src/dialogs/export.cpp
+++ b/src/dialogs/export.cpp
@@ -358,18 +358,18 @@ gchar* create_filepath_from_id (const gchar *id, const gchar *file_entry_text) {
     if (id == NULL) /* This should never happen */
         id = "bitmap";
 
-    gchar * directory = NULL;
+    gchar *directory = NULL;
 
     if (directory == NULL && file_entry_text != NULL && file_entry_text[0] != '\0') {
         // std::cout << "Directory from dialog" << std::endl;
-        directory = g_dirname(file_entry_text);
+        directory = g_path_get_dirname(file_entry_text);
     }
 
     if (directory == NULL) {
         /* Grab document directory */
         if ( SP_ACTIVE_DOCUMENT->getURI() ) {
             // std::cout << "Directory from document" << std::endl;
-            directory = g_dirname( SP_ACTIVE_DOCUMENT->getURI() );
+            directory = g_path_get_dirname( SP_ACTIVE_DOCUMENT->getURI() );
         }
     }
 
@@ -1053,7 +1053,7 @@ filename_add_extension (const gchar *filename, const gchar *extension)
       return g_strconcat (filename, extension, NULL);
     else
     {
-      if (g_strcasecmp (dot + 1, extension) == 0)
+      if (g_ascii_strcasecmp (dot + 1, extension) == 0)
         return g_strdup (filename);
       else
       {
@@ -1130,7 +1130,7 @@ sp_export_export_clicked (GtkButton */*button*/, GtkObject *base)
             }
 
             Geom::OptRect area;
-            item->invoke_bbox( area, item->i2d_affine(), TRUE );
+            item->invoke_bbox( area, item->i2dt_affine(), TRUE );
             if (area) {
                 gint width = (gint) (area->width() * dpi / PX_PER_IN + 0.5);
                 gint height = (gint) (area->height() * dpi / PX_PER_IN + 0.5);
@@ -1282,11 +1282,13 @@ sp_export_export_clicked (GtkButton */*button*/, GtkObject *base)
             for(; reprlst != NULL; reprlst = reprlst->next) {
                 Inkscape::XML::Node * repr = (Inkscape::XML::Node *)reprlst->data;
                 const gchar * temp_string;
+                gchar *dir = g_path_get_dirname(filename);
+                gchar *docdir = g_path_get_dirname(SP_ACTIVE_DOCUMENT->getURI());
 
                 if (repr->attribute("id") == NULL ||
                         !(g_strrstr(filename_ext, repr->attribute("id")) != NULL &&
                           ( !SP_ACTIVE_DOCUMENT->getURI() ||
-                            strcmp(g_dirname(filename), g_dirname(SP_ACTIVE_DOCUMENT->getURI())) == 0))) {
+                            strcmp(dir, docdir) == 0))) {
                     temp_string = repr->attribute("inkscape:export-filename");
                     if (temp_string == NULL || strcmp(temp_string, filename_ext)) {
                         repr->setAttribute("inkscape:export-filename", filename_ext);
@@ -1303,6 +1305,8 @@ sp_export_export_clicked (GtkButton */*button*/, GtkObject *base)
                     sp_repr_set_svg_double(repr, "inkscape:export-ydpi", ydpi);
                     modified = true;
                 }
+                g_free(dir);
+                g_free(docdir);
             }
             DocumentUndo::setUndoSensitive(doc, saved);
 
diff --git a/src/dialogs/spellcheck.cpp b/src/dialogs/spellcheck.cpp
index 5de0bc6fe..d0de6ad20 100644
--- a/src/dialogs/spellcheck.cpp
+++ b/src/dialogs/spellcheck.cpp
@@ -243,8 +243,8 @@ gint compare_text_bboxes (gconstpointer a, gconstpointer b)
     SPItem *i1 = SP_ITEM(a);
     SPItem *i2 = SP_ITEM(b);
 
-    Geom::OptRect bbox1 = i1->getBounds(i1->i2d_affine());
-    Geom::OptRect bbox2 = i2->getBounds(i2->i2d_affine());
+    Geom::OptRect bbox1 = i1->getBounds(i1->i2dt_affine());
+    Geom::OptRect bbox2 = i2->getBounds(i2->i2dt_affine());
     if (!bbox1 || !bbox2) {
         return 0;
     }
@@ -577,7 +577,7 @@ spellcheck_next_word()
 
         // draw rect
         std::vector<Geom::Point> points =
-            _layout->createSelectionShape(_begin_w, _end_w, _text->i2d_affine());
+            _layout->createSelectionShape(_begin_w, _end_w, _text->i2dt_affine());
         Geom::Point tl, br;
         tl = br = points.front();
         for (unsigned i = 0 ; i < points.size() ; i ++) {
diff --git a/src/dialogs/text-edit.cpp b/src/dialogs/text-edit.cpp
index 16166d97e..ce3165632 100644
--- a/src/dialogs/text-edit.cpp
+++ b/src/dialogs/text-edit.cpp
@@ -299,7 +299,7 @@ sp_text_edit_dialog (void)
                     // horizontal
                     {
                         GtkWidget *px = sp_icon_new( Inkscape::ICON_SIZE_LARGE_TOOLBAR,
-                                                      INKSCAPE_ICON_FORMAT_TEXT_DIRECTION_HORIZONTAL );
+                                                      INKSCAPE_ICON("format-text-direction-horizontal") );
                         GtkWidget *b = group = gtk_radio_button_new (NULL);
                         gtk_widget_set_tooltip_text (b, _("Horizontal text"));
                         gtk_button_set_relief (GTK_BUTTON (b), GTK_RELIEF_NONE);
@@ -307,13 +307,13 @@ sp_text_edit_dialog (void)
                         gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (b), FALSE);
                         gtk_container_add (GTK_CONTAINER (b), px);
                         gtk_box_pack_start (GTK_BOX (row), b, FALSE, FALSE, 0);
-                        g_object_set_data (G_OBJECT (dlg), INKSCAPE_ICON_FORMAT_TEXT_DIRECTION_HORIZONTAL, b);
+                        g_object_set_data (G_OBJECT (dlg), INKSCAPE_ICON("format-text-direction-horizontal"), b);
                     }
 
                     // vertical
                     {
                         GtkWidget *px = sp_icon_new( Inkscape::ICON_SIZE_LARGE_TOOLBAR,
-                                                      INKSCAPE_ICON_FORMAT_TEXT_DIRECTION_VERTICAL );
+                                                      INKSCAPE_ICON("format-text-direction-vertical") );
                         GtkWidget *b = gtk_radio_button_new (gtk_radio_button_get_group (GTK_RADIO_BUTTON (group)));
                         gtk_widget_set_tooltip_text (b, _("Vertical text"));
                         gtk_button_set_relief (GTK_BUTTON (b), GTK_RELIEF_NONE);
@@ -321,12 +321,12 @@ sp_text_edit_dialog (void)
                         gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (b), FALSE);
                         gtk_container_add (GTK_CONTAINER (b), px);
                         gtk_box_pack_start (GTK_BOX (row), b, FALSE, FALSE, 0);
-                        g_object_set_data (G_OBJECT (dlg), INKSCAPE_ICON_FORMAT_TEXT_DIRECTION_VERTICAL, b);
+                        g_object_set_data (G_OBJECT (dlg), INKSCAPE_ICON("format-text-direction-vertical"), b);
                     }
 
                     gtk_box_pack_start (GTK_BOX (l_vb), row, FALSE, FALSE, 0);
                 }
-				
+
                 {
                     GtkWidget *row = gtk_hbox_new (FALSE, VB_MARGIN);
 
@@ -604,7 +604,7 @@ sp_get_text_dialog_style ()
             }
         }
 
-        b = (GtkWidget*)g_object_get_data (G_OBJECT (dlg), INKSCAPE_ICON_FORMAT_TEXT_DIRECTION_HORIZONTAL );
+        b = (GtkWidget*)g_object_get_data (G_OBJECT (dlg), INKSCAPE_ICON("format-text-direction-horizontal") );
 
         if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (b))) {
             sp_repr_css_set_property (css, "writing-mode", "lr");
@@ -818,9 +818,9 @@ sp_text_edit_dialog_read_selection ( GtkWidget *dlg,
         gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (b), TRUE);
 
         if (query->writing_mode.computed == SP_CSS_WRITING_MODE_LR_TB) {
-            b = (GtkWidget*)g_object_get_data ( G_OBJECT (dlg), INKSCAPE_ICON_FORMAT_TEXT_DIRECTION_HORIZONTAL );
+            b = (GtkWidget*)g_object_get_data ( G_OBJECT (dlg), INKSCAPE_ICON("format-text-direction-horizontal") );
         } else {
-            b = (GtkWidget*)g_object_get_data ( G_OBJECT (dlg), INKSCAPE_ICON_FORMAT_TEXT_DIRECTION_VERTICAL );
+            b = (GtkWidget*)g_object_get_data ( G_OBJECT (dlg), INKSCAPE_ICON("format-text-direction-vertical") );
         }
         gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (b), TRUE);
 
diff --git a/src/dialogs/xml-tree.cpp b/src/dialogs/xml-tree.cpp
index 1a003c9c7..2f489c4b5 100644
--- a/src/dialogs/xml-tree.cpp
+++ b/src/dialogs/xml-tree.cpp
@@ -284,7 +284,7 @@ void sp_xml_tree_dialog()
                 _("New element node"),
                 NULL,
                 sp_icon_new( Inkscape::ICON_SIZE_LARGE_TOOLBAR,
-                                    INKSCAPE_ICON_XML_ELEMENT_NEW ),
+                                    INKSCAPE_ICON("xml-element-new") ),
                 G_CALLBACK(cmd_new_element_node),
                 NULL);
 
@@ -305,7 +305,7 @@ void sp_xml_tree_dialog()
         button = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
                 NULL, _("New text node"), NULL,
                 sp_icon_new( Inkscape::ICON_SIZE_LARGE_TOOLBAR,
-                             INKSCAPE_ICON_XML_TEXT_NEW ),
+                             INKSCAPE_ICON("xml-text-new") ),
                 G_CALLBACK(cmd_new_text_node),
                 NULL);
 
@@ -326,7 +326,7 @@ void sp_xml_tree_dialog()
         button = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
                 NULL, _("Duplicate node"), NULL,
                 sp_icon_new( Inkscape::ICON_SIZE_LARGE_TOOLBAR,
-                             INKSCAPE_ICON_XML_NODE_DUPLICATE ),
+                             INKSCAPE_ICON("xml-node-duplicate") ),
                 G_CALLBACK(cmd_duplicate_node),
                 NULL);
 
@@ -338,7 +338,7 @@ void sp_xml_tree_dialog()
 
         g_signal_connect_object(G_OBJECT(tree), "tree_unselect_row",
                         G_CALLBACK(on_tree_unselect_row_disable),
-                        button, 
+                        button,
 			(GConnectFlags)0);
 
         gtk_widget_set_sensitive(GTK_WIDGET(button), FALSE);
@@ -348,16 +348,16 @@ void sp_xml_tree_dialog()
         button = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
                 NULL, Q_("nodeAsInXMLdialogTooltip|Delete node"), NULL,
                 sp_icon_new( Inkscape::ICON_SIZE_LARGE_TOOLBAR,
-                             INKSCAPE_ICON_XML_NODE_DELETE ),
+                             INKSCAPE_ICON("xml-node-delete") ),
                                            G_CALLBACK(cmd_delete_node), NULL );
 
         g_signal_connect_object(G_OBJECT(tree), "tree_select_row",
                         G_CALLBACK(on_tree_select_row_enable_if_mutable),
-                        button, 
+                        button,
 			(GConnectFlags)0);
         g_signal_connect_object(G_OBJECT(tree), "tree_unselect_row",
                         G_CALLBACK(on_tree_unselect_row_disable),
-                        button, 
+                        button,
 			(GConnectFlags)0);
         gtk_widget_set_sensitive(GTK_WIDGET(button), FALSE);
 
@@ -370,12 +370,12 @@ void sp_xml_tree_dialog()
 
         g_signal_connect_object(G_OBJECT(tree), "tree_select_row",
                     G_CALLBACK(on_tree_select_row_enable_if_has_grandparent),
-                    button, 
+                    button,
 		    (GConnectFlags)0);
 
         g_signal_connect_object(G_OBJECT(tree), "tree_unselect_row",
                         G_CALLBACK(on_tree_unselect_row_disable),
-                        button, 
+                        button,
 			(GConnectFlags)0);
 
         gtk_widget_set_sensitive(GTK_WIDGET(button), FALSE);
@@ -386,11 +386,11 @@ void sp_xml_tree_dialog()
                         G_CALLBACK(cmd_indent_node), NULL);
         g_signal_connect_object(G_OBJECT(tree), "tree_select_row",
                         G_CALLBACK(on_tree_select_row_enable_if_indentable),
-                        button, 
+                        button,
 			(GConnectFlags)0);
         g_signal_connect_object(G_OBJECT(tree), "tree_unselect_row",
                        (GCallback) on_tree_unselect_row_disable,
-                        button, 
+                        button,
 			(GConnectFlags)0);
         gtk_widget_set_sensitive(GTK_WIDGET(button), FALSE);
 
@@ -400,11 +400,11 @@ void sp_xml_tree_dialog()
                         G_CALLBACK(cmd_raise_node), NULL);
         g_signal_connect_object(G_OBJECT(tree), "tree_select_row",
                     G_CALLBACK(on_tree_select_row_enable_if_not_first_child),
-                    button, 
+                    button,
 		    (GConnectFlags)0);
         g_signal_connect_object(G_OBJECT(tree), "tree_unselect_row",
                         G_CALLBACK(on_tree_unselect_row_disable),
-                        button, 
+                        button,
 			(GConnectFlags)0);
         gtk_widget_set_sensitive(GTK_WIDGET(button), FALSE);
 
@@ -414,11 +414,11 @@ void sp_xml_tree_dialog()
                         G_CALLBACK(cmd_lower_node), NULL);
         g_signal_connect_object(G_OBJECT(tree), "tree_select_row",
                         G_CALLBACK(on_tree_select_row_enable_if_not_last_child),
-                        button, 
+                        button,
 			(GConnectFlags)0);
         g_signal_connect_object(G_OBJECT(tree), "tree_unselect_row",
                         G_CALLBACK(on_tree_unselect_row_disable),
-                        button, 
+                        button,
 			(GConnectFlags)0);
         gtk_widget_set_sensitive(GTK_WIDGET(button), FALSE);
 
@@ -458,7 +458,7 @@ void sp_xml_tree_dialog()
         button = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
                 NULL, _("Delete attribute"), NULL,
                 sp_icon_new( Inkscape::ICON_SIZE_LARGE_TOOLBAR,
-                             INKSCAPE_ICON_XML_ATTRIBUTE_DELETE ),
+                             INKSCAPE_ICON("xml-attribute-delete") ),
                (GCallback) cmd_delete_attr, NULL);
 
         g_signal_connect_object(G_OBJECT(attributes), "select_row",
@@ -583,24 +583,24 @@ void sp_xml_tree_dialog()
 
         g_signal_connect_object(G_OBJECT(tree), "tree_select_row",
                        (GCallback) on_tree_select_row_show_if_element,
-                        attr_container, 
+                        attr_container,
 			(GConnectFlags)0);
 
         g_signal_connect_object(G_OBJECT(tree), "tree_unselect_row",
                        (GCallback) on_tree_unselect_row_hide,
-                        attr_container, 
+                        attr_container,
 			(GConnectFlags)0);
 
         gtk_widget_hide(attr_container);
 
         g_signal_connect_object(G_OBJECT(tree), "tree_select_row",
                        (GCallback) on_tree_select_row_show_if_text,
-                        text_container, 
+                        text_container,
 			(GConnectFlags)0);
 
         g_signal_connect_object(G_OBJECT(tree), "tree_unselect_row",
                        (GCallback) on_tree_unselect_row_hide,
-                        text_container, 
+                        text_container,
 			(GConnectFlags)0);
 
         gtk_widget_hide(text_container);