Ok, committed msgloan's patch to convert gbooleans to bools thus completing

one major janitorial task we identified....

(bzr r1633)

12 files changed, 33 insertions, 33 deletions

diff --git a/src/dialogs/clonetiler.cpp b/src/dialogs/clonetiler.cpp
index 5f6c557f1..7cae37a93 100644
--- a/src/dialogs/clonetiler.cpp
+++ b/src/dialogs/clonetiler.cpp
@@ -109,7 +109,7 @@ clonetiler_dialog_destroy (GtkObject *object, gpointer data)
 
 }
 
-static gboolean
+static bool
 clonetiler_dialog_delete (GtkObject *object, GdkEvent * /*event*/, gpointer data)
 {
     gtk_window_get_position ((GtkWindow *) dlg, &x, &y);
diff --git a/src/dialogs/dialog-events.cpp b/src/dialogs/dialog-events.cpp
index deabcf383..983024d10 100644
--- a/src/dialogs/dialog-events.cpp
+++ b/src/dialogs/dialog-events.cpp
@@ -31,7 +31,7 @@
 * \brief  This function is called to zero the transientize semaphore by a
 *         timeout.
 */
-gboolean
+bool
 sp_allow_again (gpointer *wd)
 {
     ((win_data *) wd)->stop = 0;
@@ -81,7 +81,7 @@ sp_dialog_defocus_on_enter (GtkWidget *w)
 
 
 
-gboolean
+bool
 sp_dialog_event_handler (GtkWindow *win, GdkEvent *event, gpointer data)
 {
 
@@ -91,7 +91,7 @@ sp_dialog_event_handler (GtkWindow *win, GdkEvent *event, gpointer data)
         return FALSE;
     }
 
-    gboolean ret = FALSE;
+    bool ret = FALSE;
 
     switch (event->type) {
 
@@ -210,7 +210,7 @@ void on_dialog_unhide (GtkWidget *w)
         gtk_widget_show (w);
 }
 
-gboolean
+bool
 sp_dialog_hide (GtkObject *object, gpointer data)
 {
     GtkWidget *dlg = (GtkWidget *) data;
@@ -223,7 +223,7 @@ sp_dialog_hide (GtkObject *object, gpointer data)
 
 
 
-gboolean
+bool
 sp_dialog_unhide (GtkObject *object, gpointer data)
 {
     GtkWidget *dlg = (GtkWidget *) data;
diff --git a/src/dialogs/dialog-events.h b/src/dialogs/dialog-events.h
index 7cc64c6a2..a86ac0b9b 100644
--- a/src/dialogs/dialog-events.h
+++ b/src/dialogs/dialog-events.h
@@ -31,7 +31,7 @@ typedef struct {
 } win_data;
 
 
-gboolean sp_dialog_event_handler ( GtkWindow *win, 
+bool sp_dialog_event_handler ( GtkWindow *win, 
                                    GdkEvent *event, 
                                    gpointer data );
 
@@ -49,8 +49,8 @@ void sp_transientize_callback    ( Inkscape::Application *inkscape,
 
 void on_dialog_hide (GtkWidget *w);
 void on_dialog_unhide (GtkWidget *w);
-gboolean sp_dialog_hide (GtkObject *object, gpointer data);
-gboolean sp_dialog_unhide (GtkObject *object, gpointer data);
+bool sp_dialog_hide (GtkObject *object, gpointer data);
+bool sp_dialog_unhide (GtkObject *object, gpointer data);
 
 #endif
 
diff --git a/src/dialogs/filedialog-win32.cpp b/src/dialogs/filedialog-win32.cpp
index ca9ce5f6c..67e949d35 100644
--- a/src/dialogs/filedialog-win32.cpp
+++ b/src/dialogs/filedialog-win32.cpp
@@ -25,11 +25,11 @@ namespace Dialogs
 /*#################################
 # U T I L I T Y
 #################################*/
-static gboolean
+static bool
 win32_is_os_wide()
 {
-	static gboolean initialized = FALSE;
-	static gboolean is_wide = FALSE;
+	static bool initialized = FALSE;
+	static bool is_wide = FALSE;
 	static OSVERSIONINFOA osver;
 
 	if ( !initialized )
diff --git a/src/dialogs/find.cpp b/src/dialogs/find.cpp
index f3efeed81..c5d2e6eed 100644
--- a/src/dialogs/find.cpp
+++ b/src/dialogs/find.cpp
@@ -88,7 +88,7 @@ static void sp_find_dialog_destroy(GtkObject *object, gpointer)
 
 
 
-static gboolean sp_find_dialog_delete(GtkObject *, GdkEvent *, gpointer data)
+static bool sp_find_dialog_delete(GtkObject *, GdkEvent *, gpointer data)
 {
     gtk_window_get_position (GTK_WINDOW (dlg), &x, &y);
     gtk_window_get_size (GTK_WINDOW (dlg), &w, &h);
@@ -476,7 +476,7 @@ toggle_shapes (GtkToggleButton *tb, gpointer data)
 
 
 GtkWidget *
-sp_find_types_checkbox (GtkWidget *w, const gchar *data, gboolean active,
+sp_find_types_checkbox (GtkWidget *w, const gchar *data, bool active,
                         GtkTooltips *tt, const gchar *tip,
                         const gchar *label,
                         void (*toggled)(GtkToggleButton *, gpointer))
@@ -499,7 +499,7 @@ sp_find_types_checkbox (GtkWidget *w, const gchar *data, gboolean active,
 }
 
 GtkWidget *
-sp_find_types_checkbox_indented (GtkWidget *w, const gchar *data, gboolean active,
+sp_find_types_checkbox_indented (GtkWidget *w, const gchar *data, bool active,
                                  GtkTooltips *tt, const gchar *tip,
                                  const gchar *label,
                                  void (*toggled)(GtkToggleButton *, gpointer), guint indent)
diff --git a/src/dialogs/input.cpp b/src/dialogs/input.cpp
index eac3a0c5a..643a4a764 100644
--- a/src/dialogs/input.cpp
+++ b/src/dialogs/input.cpp
@@ -43,7 +43,7 @@ sp_input_dialog_destroy (GtkObject *object, gpointer data)
     wd.stop = 0;
 }
 
-static gboolean
+static bool
 sp_input_dialog_delete (GtkObject *object, GdkEvent *event, gpointer data)
 {
     gtk_window_get_position ((GtkWindow *) dlg, &x, &y);
diff --git a/src/dialogs/item-properties.cpp b/src/dialogs/item-properties.cpp
index 6f12a48f1..78482018b 100644
--- a/src/dialogs/item-properties.cpp
+++ b/src/dialogs/item-properties.cpp
@@ -64,7 +64,7 @@ sp_item_dialog_destroy (GtkObject *object, gpointer data)
     wd.stop = 0;
 }
 
-static gboolean
+static bool
 sp_item_dialog_delete (GtkObject *object, GdkEvent *event, gpointer data)
 {
     gtk_window_get_position ((GtkWindow *) dlg, &x, &y);
diff --git a/src/dialogs/object-properties.cpp b/src/dialogs/object-properties.cpp
index a4dd49aeb..7f326f476 100644
--- a/src/dialogs/object-properties.cpp
+++ b/src/dialogs/object-properties.cpp
@@ -66,7 +66,7 @@ sp_object_properties_dialog_destroy (GtkObject *object, gpointer data)
     wd.stop = 0;
 }
 
-static gboolean
+static bool
 sp_object_properties_dialog_delete ( GtkObject *object,
                                      GdkEvent *event,
                                      gpointer data )
diff --git a/src/dialogs/stroke-style.cpp b/src/dialogs/stroke-style.cpp
index 80099eb82..6dcb80499 100644
--- a/src/dialogs/stroke-style.cpp
+++ b/src/dialogs/stroke-style.cpp
@@ -889,7 +889,7 @@ sp_marker_select(GtkOptionMenu *mnu, GtkWidget *spw)
                      /* TODO: annotate */ "stroke-style.cpp:889");
 }
 
-static gboolean stroke_width_set_unit(SPUnitSelector *,
+static bool stroke_width_set_unit(SPUnitSelector *,
                                                  SPUnit const *old,
                                                  SPUnit const *new_units,
                                                  GObject *spw)
diff --git a/src/dialogs/swatches.cpp b/src/dialogs/swatches.cpp
index 1f5ae5c7c..10f30e64b 100644
--- a/src/dialogs/swatches.cpp
+++ b/src/dialogs/swatches.cpp
@@ -202,7 +202,7 @@ static void dragBegin( GtkWidget *widget, GdkDragContext* dc, gpointer data )
 }
 
 //"drag-drop"
-// gboolean dragDropColorData( GtkWidget *widget,
+// bool dragDropColorData( GtkWidget *widget,
 //                             GdkDragContext *drag_context,
 //                             gint x,
 //                             gint y,
diff --git a/src/dialogs/text-edit.cpp b/src/dialogs/text-edit.cpp
index 8ea0a7236..f37cc645f 100644
--- a/src/dialogs/text-edit.cpp
+++ b/src/dialogs/text-edit.cpp
@@ -61,7 +61,7 @@ static void sp_text_edit_dialog_set_default (GtkButton *button, GtkWidget *dlg);
 static void sp_text_edit_dialog_apply (GtkButton *button, GtkWidget *dlg);
 static void sp_text_edit_dialog_close (GtkButton *button, GtkWidget *dlg);
 
-static void sp_text_edit_dialog_read_selection (GtkWidget *dlg, gboolean style, gboolean content);
+static void sp_text_edit_dialog_read_selection (GtkWidget *dlg, bool style, bool content);
 
 static void sp_text_edit_dialog_text_changed (GtkTextBuffer *tb, GtkWidget *dlg);
 static void sp_text_edit_dialog_font_changed (SPFontSelector *fontsel, font_instance *font, GtkWidget *dlg);
@@ -93,7 +93,7 @@ sp_text_edit_dialog_destroy (GtkObject *object, gpointer data)
 
 
 
-static gboolean
+static bool
 sp_text_edit_dialog_delete (GtkObject *object, GdkEvent *event, gpointer data)
 {
     gtk_window_get_position ((GtkWindow *) dlg, &x, &y);
@@ -116,7 +116,7 @@ sp_text_edit_dialog_delete (GtkObject *object, GdkEvent *event, gpointer data)
     This flag is used to prevent passing keys from the dialog to canvas, so that the text editor
     can handle keys like Esc and Ctrl+Z itself.
  */
-gboolean
+bool
 text_view_focus_in (GtkWidget *w, GdkEventKey *event, gpointer data)
 {
     GObject *dlg = (GObject *) data;
@@ -124,7 +124,7 @@ text_view_focus_in (GtkWidget *w, GdkEventKey *event, gpointer data)
     return FALSE;
 }
 
-gboolean
+bool
 text_view_focus_out (GtkWidget *w, GdkEventKey *event, gpointer data)
 {
     GObject *dlg = (GObject *) data;
@@ -452,7 +452,7 @@ sp_text_edit_dialog_selection_modified ( Inkscape::Application *inkscape,
                                        guint flags, 
                                        GtkWidget *dlg )
 {
-    gboolean style, content;
+    bool style, content;
 
     style = 
         ((flags & ( SP_OBJECT_CHILD_MODIFIED_FLAG | 
@@ -645,8 +645,8 @@ sp_text_edit_dialog_close (GtkButton *button, GtkWidget *dlg)
 
 static void
 sp_text_edit_dialog_read_selection ( GtkWidget *dlg,
-                                     gboolean dostyle,
-                                     gboolean docontent )
+                                     bool dostyle,
+                                     bool docontent )
 {
     if (g_object_get_data (G_OBJECT (dlg), "blocked"))
         return;
diff --git a/src/dialogs/xml-tree.cpp b/src/dialogs/xml-tree.cpp
index e515a3f37..bcd3b31f7 100644
--- a/src/dialogs/xml-tree.cpp
+++ b/src/dialogs/xml-tree.cpp
@@ -110,7 +110,7 @@ static void on_tree_select_row(GtkCTree *tree, GtkCTreeNode *node, gint column,
 static void on_tree_unselect_row(GtkCTree *tree, GtkCTreeNode *node, gint column, gpointer data);
 static void after_tree_move(GtkCTree *tree, GtkCTreeNode *node, GtkCTreeNode *new_parent, GtkCTreeNode *new_sibling, gpointer data);
 static void on_destroy(GtkObject *object, gpointer data);
-static gboolean on_delete(GtkObject *object, GdkEvent *event, gpointer data);
+static bool on_delete(GtkObject *object, GdkEvent *event, gpointer data);
 
 static void on_tree_select_row_enable_if_element(GtkCTree *tree, GtkCTreeNode *node, gint column, gpointer data);
 static void on_tree_select_row_enable_if_mutable(GtkCTree *tree, GtkCTreeNode *node, gint column, gpointer data);
@@ -159,7 +159,7 @@ static void cmd_unindent_node(GtkObject *object, gpointer data);
 static void cmd_delete_attr(GtkObject *object, gpointer data);
 static void cmd_set_attr(GtkObject *object, gpointer data);
 
-static gboolean sp_xml_tree_key_press(GtkWidget *widget, GdkEventKey *event);
+static bool sp_xml_tree_key_press(GtkWidget *widget, GdkEventKey *event);
 
 
 /*
@@ -625,7 +625,7 @@ void sp_xml_tree_dialog()
 
 } // end of sp_xml_tree_dialog()
 
-static gboolean sp_xml_tree_key_press(GtkWidget *widget, GdkEventKey *event)
+static bool sp_xml_tree_key_press(GtkWidget *widget, GdkEventKey *event)
 {
 
     unsigned int shortcut = get_group0_keyval(event) |
@@ -913,7 +913,7 @@ static void on_destroy(GtkObject *object, gpointer data)
 
 
 
-static gboolean on_delete(GtkObject *object, GdkEvent *event, gpointer data)
+static bool on_delete(GtkObject *object, GdkEvent *event, gpointer data)
 {
     gtk_window_get_position((GtkWindow *) dlg, &x, &y);
     gtk_window_get_size((GtkWindow *) dlg, &w, &h);
@@ -991,7 +991,7 @@ void on_tree_select_row_show_if_text(GtkCTree *tree, GtkCTreeNode *node,
 }
 
 
-gboolean xml_tree_node_mutable(GtkCTreeNode *node)
+bool xml_tree_node_mutable(GtkCTreeNode *node)
 {
     // top-level is immutable, obviously
     if (!GTK_CTREE_ROW(node)->parent) {
@@ -1141,7 +1141,7 @@ void on_attr_select_row_set_value_content(GtkCList *list, gint row, gint column,
 void on_tree_select_row_enable_if_indentable(GtkCTree *tree, GtkCTreeNode *node,
                                              gint column, gpointer data)
 {
-    gboolean indentable = FALSE;
+    bool indentable = FALSE;
 
     if (xml_tree_node_mutable(node)) {
         Inkscape::XML::Node *repr, *prev;