updated to latest trunk

(bzr r14876.2.4)

1 files changed, 2 insertions, 25 deletions

diff --git a/src/ui/dialog/xml-tree.cpp b/src/ui/dialog/xml-tree.cpp
index 99a4acc69..fa35b092a 100644
--- a/src/ui/dialog/xml-tree.cpp
+++ b/src/ui/dialog/xml-tree.cpp
@@ -18,9 +18,7 @@
 
 #include "xml-tree.h"
 #include "widgets/icon.h"
-#include <gdk/gdkkeysyms.h>
 #include <glibmm/i18n.h>
-#include <gtkmm/stock.h>
 
 #include "desktop.h"
 
@@ -31,18 +29,14 @@
 #include "helper/window.h"
 #include "inkscape.h"
 #include "ui/interface.h"
-#include "macros.h"
 #include "message-context.h"
 #include "message-stack.h"
-#include "preferences.h"
-#include "selection.h"
 #include "shortcuts.h"
 #include "sp-root.h"
 #include "sp-string.h"
 #include "sp-tspan.h"
 #include "ui/icon-names.h"
 #include "verbs.h"
-#include "widgets/icon.h"
 
 #include "widgets/sp-xmlview-attr-list.h"
 #include "widgets/sp-xmlview-content.h"
@@ -79,11 +73,7 @@ XmlTree::XmlTree (void) :
     xml_attribute_delete_button (_("Delete attribute")),
     text_container (),
     attr_container (),
-#if WITH_GTKMM_3_0
     attr_subpaned_container(Gtk::ORIENTATION_VERTICAL),
-#else
-    attr_subpaned_container(),
-#endif
     set_attr (_("Set")),
     new_window(NULL)
 {
@@ -100,9 +90,7 @@ XmlTree::XmlTree (void) :
     status.set_alignment( 0.0, 0.5);
     status.set_size_request(1, -1);
     status.set_markup("");
-#if WITH_GTKMM_3_0
     status.set_line_wrap(true);
-#endif
     status_box.pack_start( status, TRUE, TRUE, 0);
     contents->pack_end(status_box, false, false, 2);
 
@@ -801,7 +789,8 @@ void XmlTree::on_attr_row_changed(SPXMLViewAttrList *attributes, const gchar * n
 void XmlTree::on_attr_unselect_row_clear_text()
 {
     attr_name.set_text("");
-    attr_value.get_buffer()->set_text("", 0);
+    // Set text with empty Glib::ustring
+    attr_value.get_buffer()->set_text( Glib::ustring() );
 }
 
 void XmlTree::onNameChanged()
@@ -881,31 +870,19 @@ void XmlTree::cmd_new_element_node()
     g_signal_connect(G_OBJECT(new_window), "destroy", gtk_main_quit, NULL);
     g_signal_connect(G_OBJECT(new_window), "key-press-event", G_CALLBACK(quit_on_esc), new_window);
 
-#if GTK_CHECK_VERSION(3,0,0)
     vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 4);
     gtk_box_set_homogeneous(GTK_BOX(vbox), FALSE);
-#else
-    vbox = gtk_vbox_new(FALSE, 4);
-#endif
 
     gtk_container_add(GTK_CONTAINER(new_window), vbox);
 
     name_entry = new Gtk::Entry();
     gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(name_entry->gobj()), FALSE, TRUE, 0);
 
-#if GTK_CHECK_VERSION(3,0,0)
     sep = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL);
-#else
-    sep = gtk_hseparator_new();
-#endif
 
     gtk_box_pack_start(GTK_BOX(vbox), sep, FALSE, TRUE, 0);
 
-#if GTK_CHECK_VERSION(3,0,0)
     bbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
-#else
-    bbox = gtk_hbutton_box_new();
-#endif
 
     gtk_container_set_border_width(GTK_CONTAINER(bbox), 4);
     gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);