From: mderezynski <mderezynski@users.sourceforge.net>
Date: Mon, 22 May 2006 08:38:28 +0000 (+0000)
Subject: * Revert toolbox
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=42d888483ee616971c600ffa54f51a0649b92ba6;p=inkscape.git

* Revert toolbox
---

diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 96e71fb34..80486120a 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -3254,22 +3254,11 @@ namespace {
                  GtkTreeIter       *iter,
                  gpointer           data)
     {
-#if 0
         char        *family,
                     *family_escaped,
                     *sample_escaped;
         const char  *sample; 
-#endif
 
-        char *family;
-        gtk_tree_model_get (tree_model, iter, 0, &family, -1); 
-        const char *sample = prefs_get_string_attribute ("tools.text", "font_sample"); 
-        char *escaped = g_markup_escape_text (sample, -1);       
-        g_object_set (G_OBJECT (cell), "text", escaped, "family", family, NULL);
-        free (escaped);
-        free (family);
-
-#if 0
         sample = prefs_get_string_attribute ("tools.text", "font_sample"); 
 
         family_escaped = g_markup_escape_text (family, -1);
@@ -3282,7 +3271,6 @@ namespace {
         free (family);
         free (family_escaped);
         free (sample_escaped);
-#endif
     }
 
     GtkWidget*
@@ -3320,14 +3308,6 @@ namespace {
         GtkTreeViewColumn   *column = gtk_tree_view_column_new ();
         gtk_tree_view_column_pack_start (column, cell, FALSE);
         gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-//      gtk_tree_view_column_set_cell_data_func (column, cell, GtkTreeCellDataFunc (cell_data_func), gpointer(0), NULL);
-        gtk_tree_view_column_set_attributes (column, cell, "text", 0, NULL);
-        gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column);
-
-        cell = gtk_cell_renderer_text_new ();
-        column = gtk_tree_view_column_new ();
-        gtk_tree_view_column_pack_start (column, cell, FALSE);
-        gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
         gtk_tree_view_column_set_cell_data_func (column, cell, GtkTreeCellDataFunc (cell_data_func), NULL, NULL);
         gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column);