Cleanups before merge

(bzr r12379.2.21)

4 files changed, 6 insertions, 8 deletions

diff --git a/src/ui/dialog/template-load-tab.cpp b/src/ui/dialog/template-load-tab.cpp
index b37b68ae3..4fee4c5e7 100644
--- a/src/ui/dialog/template-load-tab.cpp
+++ b/src/ui/dialog/template-load-tab.cpp
@@ -14,7 +14,6 @@
 #include <gtkmm/messagedialog.h>
 #include <gtkmm/scrolledwindow.h>
 #include <glibmm/i18n.h>
-#include <iostream>
 
 #include "interface.h"
 #include "file.h"
@@ -207,7 +206,7 @@ TemplateLoadTab::TemplateData TemplateLoadTab::_processTemplateFile(const Glib::
     rdoc = sp_repr_read_file(path.data(), SP_SVG_NS_URI);
     Inkscape::XML::Node *myRoot;
     Inkscape::XML::Node *dataNode;
-    std::cerr << path.c_str();
+
     if (rdoc){
         myRoot = rdoc->root();
         if (strcmp(myRoot->name(), "svg:svg") != 0){     // Wrong file format
diff --git a/src/ui/dialog/template-load-tab.h b/src/ui/dialog/template-load-tab.h
index c3c512374..50f3e0be2 100644
--- a/src/ui/dialog/template-load-tab.h
+++ b/src/ui/dialog/template-load-tab.h
@@ -71,7 +71,6 @@ protected:
     void _loadTemplates();
     void _initLists();
     
-   // Gtk::HBox _main_box;
     Gtk::VBox _tlist_box;
     Gtk::HBox _search_box;
     TemplateWidget *_info_widget;
diff --git a/src/ui/dialog/template-widget.cpp b/src/ui/dialog/template-widget.cpp
index 7e0599049..0e05f292c 100644
--- a/src/ui/dialog/template-widget.cpp
+++ b/src/ui/dialog/template-widget.cpp
@@ -30,7 +30,7 @@ TemplateWidget::TemplateWidget()
     , _short_description_label(_(" "))
     , _template_author_label(_(" "))
     , _template_name_label(_("no template selected"))
-    , _preview_image(" ")
+    , _preview_image()
     , _preview_render()
 {
     pack_start(_template_name_label, Gtk::PACK_SHRINK, 10);
@@ -41,7 +41,7 @@ TemplateWidget::TemplateWidget()
     _preview_box.pack_start(_preview_render, Gtk::PACK_EXPAND_PADDING, 10);
     
     _short_description_label.set_line_wrap(true);
-    _short_description_label.set_size_request(200);
+    //_short_description_label.set_size_request(200);
 
     Gtk::Alignment *align;
     align = manage(new Gtk::Alignment(Gtk::ALIGN_END, Gtk::ALIGN_CENTER, 0.0, 0.0));
diff --git a/src/ui/dialog/template-widget.h b/src/ui/dialog/template-widget.h
index 3c95208de..c7847460f 100644
--- a/src/ui/dialog/template-widget.h
+++ b/src/ui/dialog/template-widget.h
@@ -31,12 +31,12 @@ private:
     TemplateLoadTab::TemplateData _current_template;
     
     Gtk::Button _more_info_button;
-    Gtk::Label _short_description_label;
-    Gtk::Label _template_author_label;
-    Gtk::Label _template_name_label;
     Gtk::HBox _preview_box;
     Gtk::Image _preview_image;
     Dialog::SVGPreview _preview_render;
+    Gtk::Label _short_description_label;
+    Gtk::Label _template_author_label;
+    Gtk::Label _template_name_label;
     
     void _displayTemplateDetails();
 };