I peeled back my changes because of some deep error.

(bzr r1636)

3 files changed, 9 insertions, 13 deletions

diff --git a/src/widgets/icon.cpp b/src/widgets/icon.cpp
index b170d69f8..0fadffdc8 100644
--- a/src/widgets/icon.cpp
+++ b/src/widgets/icon.cpp
@@ -35,8 +35,6 @@
 
 #include "icon.h"
 
-// JON: keeping legacy gboolean because of old code
-// TODO: replace gboolean with bool
 static gboolean icon_prerender_task(gpointer data);
 
 static void addPreRender( Inkscape::IconSize lsize, gchar const *name );
diff --git a/src/widgets/sp-xmlview-tree.cpp b/src/widgets/sp-xmlview-tree.cpp
index 578951456..d6fd92d78 100644
--- a/src/widgets/sp-xmlview-tree.cpp
+++ b/src/widgets/sp-xmlview-tree.cpp
@@ -41,8 +41,6 @@ static void comment_content_changed (Inkscape::XML::Node * repr, const gchar * o
 
 static void tree_move (GtkCTree * tree, GtkCTreeNode * node, GtkCTreeNode * new_parent, GtkCTreeNode * new_sibling);
 
-// JON: Must keep this as gboolean legacy
-// TODO: convert to use bool
 static gboolean check_drag (GtkCTree * tree, GtkCTreeNode * node, GtkCTreeNode * new_parent, GtkCTreeNode * new_sibling);
 
 static GtkCTreeNode * ref_to_sibling (GtkCTreeNode * parent, Inkscape::XML::Node * ref);
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index f474cd735..e42f58954 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -2941,8 +2941,8 @@ sp_text_toolbox_selection_changed (Inkscape::Selection *selection, GObject *tbl)
         {
             GtkToggleButton *button = GTK_TOGGLE_BUTTON (g_object_get_data (G_OBJECT (tbl), "style-bold"));
 
-            bool active = gtk_toggle_button_get_active (button);
-            bool check  = (query->font_weight.computed >= SP_CSS_FONT_WEIGHT_700); 
+            gboolean active = gtk_toggle_button_get_active (button);
+            gboolean check  = (query->font_weight.computed >= SP_CSS_FONT_WEIGHT_700); 
 
             if (active != check) 
             {
@@ -2955,8 +2955,8 @@ sp_text_toolbox_selection_changed (Inkscape::Selection *selection, GObject *tbl)
         {
             GtkToggleButton *button = GTK_TOGGLE_BUTTON (g_object_get_data (G_OBJECT (tbl), "style-italic"));
 
-            bool active = gtk_toggle_button_get_active (button);
-            bool check  = (query->font_style.computed != SP_CSS_FONT_STYLE_NORMAL); 
+            gboolean active = gtk_toggle_button_get_active (button);
+            gboolean check  = (query->font_style.computed != SP_CSS_FONT_STYLE_NORMAL); 
 
             if (active != check)
             {
@@ -3233,7 +3233,7 @@ sp_text_toolbox_orientation_toggled (GtkRadioButton  *button,
     gtk_widget_grab_focus (GTK_WIDGET(desktop->canvas));
 }
 
-bool
+gboolean
 sp_text_toolbox_size_keypress (GtkWidget *w, GdkEventKey *event, gpointer data)
 {
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
@@ -3253,7 +3253,7 @@ sp_text_toolbox_size_keypress (GtkWidget *w, GdkEventKey *event, gpointer data)
     return FALSE;
 }
 
-bool
+gboolean
 sp_text_toolbox_family_keypress (GtkWidget *w, GdkEventKey *event, GObject *tbl)
 {
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
@@ -3269,7 +3269,7 @@ sp_text_toolbox_family_keypress (GtkWidget *w, GdkEventKey *event, GObject *tbl)
     return FALSE;
 }
 
-bool
+gboolean
 sp_text_toolbox_family_list_keypress (GtkWidget *w, GdkEventKey *event, GObject *tbl)
 {
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
@@ -3364,7 +3364,7 @@ sp_text_toolbox_text_popdown_clicked    (GtkButton          *button,
     }
 }
 
-bool
+gboolean
 sp_text_toolbox_entry_focus_in  (GtkWidget        *entry,
                                  GdkEventFocus    *event,
                                  GObject          *tbl)
@@ -3373,7 +3373,7 @@ sp_text_toolbox_entry_focus_in  (GtkWidget        *entry,
     return FALSE;
 }
 
-bool
+gboolean
 sp_text_toolbox_popdown_focus_out (GtkWidget        *popdown,
                                    GdkEventFocus    *event,
                                    GObject          *tbl)