Warning cleanup

(bzr r4133)

6 files changed, 164 insertions, 158 deletions

diff --git a/src/dialogs/debugdialog.cpp b/src/dialogs/debugdialog.cpp
index e90f0a419..42bf96050 100644
--- a/src/dialogs/debugdialog.cpp
+++ b/src/dialogs/debugdialog.cpp
@@ -245,8 +245,8 @@ void DebugDialog::showInstance()
 
 
 /*##### THIS IS THE IMPORTANT PART ##### */
-void dialogLoggingFunction(const gchar *log_domain,
-                           GLogLevelFlags log_level,
+void dialogLoggingFunction(const gchar */*log_domain*/,
+                           GLogLevelFlags /*log_level*/,
                            const gchar *messageText,
                            gpointer user_data)
 {
diff --git a/src/dialogs/eek-color-def.cpp b/src/dialogs/eek-color-def.cpp
index bb7b69a8a..9a079b68f 100644
--- a/src/dialogs/eek-color-def.cpp
+++ b/src/dialogs/eek-color-def.cpp
@@ -129,7 +129,8 @@ void ColorDef::addCallback( ColorCallback cb, void* data )
 
 void ColorDef::removeCallback( ColorCallback cb, void* data )
 {
-
+    (void)cb;
+    (void)data;
 }
 
 
diff --git a/src/dialogs/eek-preview.cpp b/src/dialogs/eek-preview.cpp
index 0108d4777..411491777 100644
--- a/src/dialogs/eek-preview.cpp
+++ b/src/dialogs/eek-preview.cpp
@@ -128,6 +128,7 @@ gboolean eek_preview_expose_event( GtkWidget* widget, GdkEventExpose* event )
     gint insetX = 0;
     gint insetY = 0;
 
+    (void)event;
 /*
     gint lower = widget->allocation.width;
     lower = (widget->allocation.height < lower) ? widget->allocation.height : lower;
@@ -345,12 +346,16 @@ static gboolean eek_preview_button_release_cb( GtkWidget* widget, GdkEventButton
 
 gboolean eek_preview_key_press_event( GtkWidget* widget, GdkEventKey* event)
 {
+    (void)widget;
+    (void)event;
     g_message("TICK");
     return FALSE;
 }
 
 gboolean eek_preview_key_release_event( GtkWidget* widget, GdkEventKey* event)
 {
+    (void)widget;
+    (void)event;
     g_message("tock");
     return FALSE;
 }
diff --git a/src/dialogs/input.cpp b/src/dialogs/input.cpp
index 21a6ea4a7..4cad0b64c 100644
--- a/src/dialogs/input.cpp
+++ b/src/dialogs/input.cpp
@@ -38,7 +38,7 @@ static gint x = -1000, y = -1000, w = 0, h = 0;
 static gchar *prefs_path = "dialogs.input";
 
 static void
-sp_input_dialog_destroy (GtkObject *object, gpointer data)
+sp_input_dialog_destroy (GtkObject */*object*/, gpointer /*data*/)
 {
     sp_signal_disconnect_by_data (INKSCAPE, dlg);
     wd.win = dlg = NULL;
@@ -46,7 +46,7 @@ sp_input_dialog_destroy (GtkObject *object, gpointer data)
 }
 
 static gboolean
-sp_input_dialog_delete (GtkObject *object, GdkEvent *event, gpointer data)
+sp_input_dialog_delete (GtkObject */*object*/, GdkEvent */*event*/, gpointer /*data*/)
 {
     gtk_window_get_position ((GtkWindow *) dlg, &x, &y);
     gtk_window_get_size ((GtkWindow *) dlg, &w, &h);
@@ -203,7 +203,7 @@ sp_input_save_to_preferences (void)
 }
 
 static void
-sp_input_save_button (GtkObject *object, gpointer data)
+sp_input_save_button (GtkObject */*object*/, gpointer /*data*/)
 {
     sp_input_save_to_preferences();
 }
diff --git a/src/dialogs/sp-attribute-widget.cpp b/src/dialogs/sp-attribute-widget.cpp
index 1c450cff5..92da747a4 100644
--- a/src/dialogs/sp-attribute-widget.cpp
+++ b/src/dialogs/sp-attribute-widget.cpp
@@ -35,10 +35,10 @@ static void sp_attribute_widget_destroy (GtkObject *object);
 
 static void sp_attribute_widget_changed (GtkEditable *editable);
 
-static void sp_attribute_widget_object_modified ( SPObject *object, 
-                                                  guint flags, 
+static void sp_attribute_widget_object_modified ( SPObject *object,
+                                                  guint flags,
                                                   SPAttributeWidget *spaw );
-static void sp_attribute_widget_object_release ( SPObject *object, 
+static void sp_attribute_widget_object_release ( SPObject *object,
                                                  SPAttributeWidget *spaw );
 
 static GtkEntryClass *parent_class;
@@ -62,7 +62,7 @@ sp_attribute_widget_get_type (void)
         type = gtk_type_unique (GTK_TYPE_ENTRY, &info);
     }
     return type;
-    
+
 } // end of sp_attribute_widget_get_type()
 
 
@@ -107,7 +107,7 @@ sp_attribute_widget_init (SPAttributeWidget *spaw)
 static void
 sp_attribute_widget_destroy (GtkObject *object)
 {
-    
+
     SPAttributeWidget *spaw;
 
     spaw = SP_ATTRIBUTE_WIDGET (object);
@@ -117,16 +117,16 @@ sp_attribute_widget_destroy (GtkObject *object)
         spaw->attribute = NULL;
     }
 
-    
+
     if (spaw->hasobj) {
-        
+
         if (spaw->src.object) {
             spaw->modified_connection.disconnect();
             spaw->release_connection.disconnect();
             spaw->src.object = NULL;
         }
     } else {
-    
+
         if (spaw->src.repr) {
             spaw->src.repr = Inkscape::GC::release(spaw->src.repr);
         }
@@ -134,7 +134,7 @@ sp_attribute_widget_destroy (GtkObject *object)
 
     spaw->modified_connection.~connection();
     spaw->release_connection.~connection();
-    
+
     ((GtkObjectClass *) parent_class)->destroy (object);
 
 }
@@ -150,27 +150,27 @@ sp_attribute_widget_changed (GtkEditable *editable)
     spaw = SP_ATTRIBUTE_WIDGET (editable);
 
     if (!spaw->blocked) {
-    
+
         const gchar *text;
         spaw->blocked = TRUE;
         text = gtk_entry_get_text (GTK_ENTRY (spaw));
-        if (!*text) 
+        if (!*text)
             text = NULL;
-        
+
         if (spaw->hasobj && spaw->src.object) {
-            
-            if (!sp_repr_set_attr ( SP_OBJECT_REPR (spaw->src.object), 
+
+            if (!sp_repr_set_attr ( SP_OBJECT_REPR (spaw->src.object),
                                     spaw->attribute, text) )
             {
                 /* Cannot set attribute */
                 text = SP_OBJECT_REPR (spaw->src.object)->attribute(spaw->attribute);
                 gtk_entry_set_text (GTK_ENTRY (spaw), text ? text : "");
             }
-            sp_document_done (SP_OBJECT_DOCUMENT (spaw->src.object), SP_VERB_NONE, 
+            sp_document_done (SP_OBJECT_DOCUMENT (spaw->src.object), SP_VERB_NONE,
                               _("Set attribute"));
-            
+
         } else if (spaw->src.repr) {
-        
+
             if (!sp_repr_set_attr (spaw->src.repr, spaw->attribute, text))
             {
                 /* Cannot set attribute */
@@ -181,7 +181,7 @@ sp_attribute_widget_changed (GtkEditable *editable)
         }
         spaw->blocked = FALSE;
     }
-    
+
 } // end of sp_attribute_widget_changed()
 
 
@@ -199,7 +199,7 @@ sp_attribute_widget_new ( SPObject *object, const gchar *attribute )
     sp_attribute_widget_set_object (spaw, object, attribute);
 
     return GTK_WIDGET (spaw);
-    
+
 } // end of sp_attribute_widget_new()
 
 
@@ -219,8 +219,8 @@ sp_attribute_widget_new_repr ( Inkscape::XML::Node *repr, const gchar *attribute
 
 
 void
-sp_attribute_widget_set_object ( SPAttributeWidget *spaw, 
-                                 SPObject *object, 
+sp_attribute_widget_set_object ( SPAttributeWidget *spaw,
+                                 SPObject *object,
                                  const gchar *attribute )
 {
 
@@ -236,14 +236,14 @@ sp_attribute_widget_set_object ( SPAttributeWidget *spaw,
     }
 
     if (spaw->hasobj) {
-    
+
         if (spaw->src.object) {
             spaw->modified_connection.disconnect();
             spaw->release_connection.disconnect();
             spaw->src.object = NULL;
         }
     } else {
-        
+
         if (spaw->src.repr) {
             spaw->src.repr = Inkscape::GC::release(spaw->src.repr);
         }
@@ -274,8 +274,8 @@ sp_attribute_widget_set_object ( SPAttributeWidget *spaw,
 
 
 void
-sp_attribute_widget_set_repr ( SPAttributeWidget *spaw, 
-                               Inkscape::XML::Node *repr, 
+sp_attribute_widget_set_repr ( SPAttributeWidget *spaw,
+                               Inkscape::XML::Node *repr,
                                const gchar *attribute )
 {
 
@@ -289,14 +289,14 @@ sp_attribute_widget_set_repr ( SPAttributeWidget *spaw,
     }
 
     if (spaw->hasobj) {
-    
+
         if (spaw->src.object) {
             spaw->modified_connection.disconnect();
             spaw->release_connection.disconnect();
             spaw->src.object = NULL;
         }
     } else {
-        
+
         if (spaw->src.repr) {
             spaw->src.repr = Inkscape::GC::release(spaw->src.repr);
         }
@@ -323,29 +323,29 @@ sp_attribute_widget_set_repr ( SPAttributeWidget *spaw,
 
 
 static void
-sp_attribute_widget_object_modified ( SPObject *object, 
-                                      guint flags, 
+sp_attribute_widget_object_modified ( SPObject */*object*/,
+                                      guint flags,
                                       SPAttributeWidget *spaw )
 {
 
     if (flags && SP_OBJECT_MODIFIED_FLAG) {
-        
+
         const gchar *val, *text;
         val = SP_OBJECT_REPR (spaw->src.object)->attribute(spaw->attribute);
         text = gtk_entry_get_text (GTK_ENTRY (spaw));
-        
+
         if (val || text) {
-            
+
             if (!val || !text || strcmp (val, text)) {
                 /* We are different */
                 spaw->blocked = TRUE;
-                gtk_entry_set_text ( GTK_ENTRY (spaw), 
+                gtk_entry_set_text ( GTK_ENTRY (spaw),
                                      val ? val : (const gchar *) "");
                 spaw->blocked = FALSE;
             } // end of if()
-        
+
         } // end of if()
-        
+
     } //end of if()
 
 } // end of sp_attribute_widget_object_modified()
@@ -353,7 +353,7 @@ sp_attribute_widget_object_modified ( SPObject *object,
 
 
 static void
-sp_attribute_widget_object_release ( SPObject *object, 
+sp_attribute_widget_object_release ( SPObject */*object*/,
                                      SPAttributeWidget *spaw )
 {
     sp_attribute_widget_set_object (spaw, NULL, NULL);
@@ -446,7 +446,7 @@ sp_attribute_table_destroy ( GtkObject *object )
     }
 
     if (spat->hasobj) {
-        
+
         if (spat->src.object) {
             spat->modified_connection.disconnect();
             spat->release_connection.disconnect();
@@ -460,7 +460,7 @@ sp_attribute_table_destroy ( GtkObject *object )
 
     spat->modified_connection.~connection();
     spat->release_connection.~connection();
-    
+
     if (spat->entries) {
         g_free (spat->entries);
         spat->entries = NULL;
@@ -471,14 +471,14 @@ sp_attribute_table_destroy ( GtkObject *object )
     if (((GtkObjectClass *) table_parent_class)->destroy) {
         (* ((GtkObjectClass *) table_parent_class)->destroy) (object);
     }
-        
+
 } // end of sp_attribute_table_destroy()
 
 
 GtkWidget *
-sp_attribute_table_new ( SPObject *object, 
-                         gint num_attr, 
-                         const gchar **labels, 
+sp_attribute_table_new ( SPObject *object,
+                         gint num_attr,
+                         const gchar **labels,
                          const gchar **attributes )
 {
     SPAttributeTable *spat;
@@ -498,9 +498,9 @@ sp_attribute_table_new ( SPObject *object,
 
 
 GtkWidget *
-sp_attribute_table_new_repr ( Inkscape::XML::Node *repr, 
-                              gint num_attr, 
-                              const gchar **labels, 
+sp_attribute_table_new_repr ( Inkscape::XML::Node *repr,
+                              gint num_attr,
+                              const gchar **labels,
                               const gchar **attributes )
 {
     SPAttributeTable *spat;
@@ -521,10 +521,10 @@ sp_attribute_table_new_repr ( Inkscape::XML::Node *repr,
 #define YPAD 0
 
 void
-sp_attribute_table_set_object ( SPAttributeTable *spat, 
-                                SPObject *object, 
-                                gint num_attr, 
-                                const gchar **labels, 
+sp_attribute_table_set_object ( SPAttributeTable *spat,
+                                SPObject *object,
+                                gint num_attr,
+                                const gchar **labels,
                                 const gchar **attributes )
 {
 
@@ -594,21 +594,21 @@ sp_attribute_table_set_object ( SPAttributeTable *spat,
             w = gtk_label_new (_(labels[i]));
             gtk_widget_show (w);
             gtk_misc_set_alignment (GTK_MISC (w), 1.0, 0.5);
-            gtk_table_attach ( GTK_TABLE (spat->table), w, 0, 1, i, i + 1, 
-                               GTK_FILL, 
-                               (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), 
+            gtk_table_attach ( GTK_TABLE (spat->table), w, 0, 1, i, i + 1,
+                               GTK_FILL,
+                               (GtkAttachOptions)(GTK_EXPAND | GTK_FILL),
                                XPAD, YPAD );
             w = gtk_entry_new ();
             gtk_widget_show (w);
             val = SP_OBJECT_REPR (object)->attribute(attributes[i]);
             gtk_entry_set_text (GTK_ENTRY (w), val ? val : (const gchar *) "");
-            gtk_table_attach ( GTK_TABLE (spat->table), w, 1, 2, i, i + 1, 
-                               (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), 
-                               (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), 
+            gtk_table_attach ( GTK_TABLE (spat->table), w, 1, 2, i, i + 1,
+                               (GtkAttachOptions)(GTK_EXPAND | GTK_FILL),
+                               (GtkAttachOptions)(GTK_EXPAND | GTK_FILL),
                                XPAD, YPAD );
             spat->entries[i] = w;
-            g_signal_connect ( G_OBJECT (w), "changed", 
-                               G_CALLBACK (sp_attribute_table_entry_changed), 
+            g_signal_connect ( G_OBJECT (w), "changed",
+                               G_CALLBACK (sp_attribute_table_entry_changed),
                                spat );
         }
         /* Show table */
@@ -617,7 +617,7 @@ sp_attribute_table_set_object ( SPAttributeTable *spat,
         spat->blocked = FALSE;
     }
 
-    gtk_widget_set_sensitive ( GTK_WIDGET (spat), 
+    gtk_widget_set_sensitive ( GTK_WIDGET (spat),
                                (spat->src.object != NULL) );
 
 } // end of sp_attribute_table_set_object()
@@ -625,10 +625,10 @@ sp_attribute_table_set_object ( SPAttributeTable *spat,
 
 
 void
-sp_attribute_table_set_repr ( SPAttributeTable *spat, 
-                              Inkscape::XML::Node *repr, 
-                              gint num_attr, 
-                              const gchar **labels, 
+sp_attribute_table_set_repr ( SPAttributeTable *spat,
+                              Inkscape::XML::Node *repr,
+                              gint num_attr,
+                              const gchar **labels,
                               const gchar **attributes )
 {
     g_return_if_fail (spat != NULL);
@@ -682,7 +682,7 @@ sp_attribute_table_set_repr ( SPAttributeTable *spat,
         /* Arrays */
         spat->attributes = g_new0 (gchar *, num_attr);
         spat->entries = g_new0 (GtkWidget *, num_attr);
-        
+
         /* Fill rows */
         for (i = 0; i < num_attr; i++) {
             GtkWidget *w;
@@ -692,21 +692,21 @@ sp_attribute_table_set_repr ( SPAttributeTable *spat,
             w = gtk_label_new (labels[i]);
             gtk_widget_show (w);
             gtk_misc_set_alignment (GTK_MISC (w), 1.0, 0.5);
-            gtk_table_attach ( GTK_TABLE (spat->table), w, 0, 1, i, i + 1, 
-                               GTK_FILL, 
-                               (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), 
+            gtk_table_attach ( GTK_TABLE (spat->table), w, 0, 1, i, i + 1,
+                               GTK_FILL,
+                               (GtkAttachOptions)(GTK_EXPAND | GTK_FILL),
                                XPAD, YPAD );
             w = gtk_entry_new ();
             gtk_widget_show (w);
             val = repr->attribute(attributes[i]);
             gtk_entry_set_text (GTK_ENTRY (w), val ? val : (const gchar *) "");
-            gtk_table_attach ( GTK_TABLE (spat->table), w, 1, 2, i, i + 1, 
-                               (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), 
-                               (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), 
+            gtk_table_attach ( GTK_TABLE (spat->table), w, 1, 2, i, i + 1,
+                               (GtkAttachOptions)(GTK_EXPAND | GTK_FILL),
+                               (GtkAttachOptions)(GTK_EXPAND | GTK_FILL),
                                XPAD, YPAD );
             spat->entries[i] = w;
-            g_signal_connect ( G_OBJECT (w), "changed", 
-                               G_CALLBACK (sp_attribute_table_entry_changed), 
+            g_signal_connect ( G_OBJECT (w), "changed",
+                               G_CALLBACK (sp_attribute_table_entry_changed),
                                spat );
         }
         /* Show table */
@@ -722,8 +722,8 @@ sp_attribute_table_set_repr ( SPAttributeTable *spat,
 
 
 static void
-sp_attribute_table_object_modified ( SPObject *object, 
-                                     guint flags, 
+sp_attribute_table_object_modified ( SPObject */*object*/,
+                                     guint flags,
                                      SPAttributeTable *spat )
 {
     if (flags && SP_OBJECT_MODIFIED_FLAG)
@@ -737,20 +737,20 @@ sp_attribute_table_object_modified ( SPObject *object,
                 if (!val || !text || strcmp (val, text)) {
                     /* We are different */
                     spat->blocked = TRUE;
-                    gtk_entry_set_text ( GTK_ENTRY (spat->entries[i]), 
+                    gtk_entry_set_text ( GTK_ENTRY (spat->entries[i]),
                                          val ? val : (const gchar *) "");
                     spat->blocked = FALSE;
                 }
             }
         }
     } // end of if()
-    
+
 } // end of sp_attribute_table_object_modified()
 
 
 
 static void
-sp_attribute_table_object_release (SPObject *object, SPAttributeTable *spat)
+sp_attribute_table_object_release (SPObject */*object*/, SPAttributeTable *spat)
 {
     sp_attribute_table_set_object (spat, NULL, 0, NULL, NULL);
 }
@@ -758,42 +758,42 @@ sp_attribute_table_object_release (SPObject *object, SPAttributeTable *spat)
 
 
 static void
-sp_attribute_table_entry_changed ( GtkEditable *editable, 
+sp_attribute_table_entry_changed ( GtkEditable *editable,
                                    SPAttributeTable *spat )
 {
     if (!spat->blocked)
     {
         gint i;
         for (i = 0; i < spat->num_attr; i++) {
-        
+
             if (GTK_WIDGET (editable) == spat->entries[i]) {
                 const gchar *text;
                 spat->blocked = TRUE;
                 text = gtk_entry_get_text (GTK_ENTRY (spat->entries[i]));
-                
-                if (!*text) 
+
+                if (!*text)
                     text = NULL;
-                
+
                 if (spat->hasobj && spat->src.object) {
-                    if (!sp_repr_set_attr ( SP_OBJECT_REPR (spat->src.object), 
+                    if (!sp_repr_set_attr ( SP_OBJECT_REPR (spat->src.object),
                                             spat->attributes[i], text))
                     {
                         /* Cannot set attribute */
                         text = SP_OBJECT_REPR (spat->src.object)->attribute(spat->attributes[i]);
-                        gtk_entry_set_text ( GTK_ENTRY (spat->entries[i]), 
+                        gtk_entry_set_text ( GTK_ENTRY (spat->entries[i]),
                                              text ? text : (const gchar *) "");
                     }
-                    sp_document_done (SP_OBJECT_DOCUMENT (spat->src.object), SP_VERB_NONE, 
+                    sp_document_done (SP_OBJECT_DOCUMENT (spat->src.object), SP_VERB_NONE,
                                       _("Set attribute"));
-                    
+
                 } else if (spat->src.repr) {
-                    
-                    if (!sp_repr_set_attr (spat->src.repr, 
-                                           spat->attributes[i], text)) 
+
+                    if (!sp_repr_set_attr (spat->src.repr,
+                                           spat->attributes[i], text))
                     {
                         /* Cannot set attribute */
                         text = spat->src.repr->attribute(spat->attributes[i]);
-                        gtk_entry_set_text ( GTK_ENTRY (spat->entries[i]), 
+                        gtk_entry_set_text ( GTK_ENTRY (spat->entries[i]),
                                              text ? text : (const gchar *) "" );
                     }
                     /* TODO: Warning! Undo will not be flushed in given case */
diff --git a/src/dialogs/xml-tree.cpp b/src/dialogs/xml-tree.cpp
index dd5371460..6da0096e2 100644
--- a/src/dialogs/xml-tree.cpp
+++ b/src/dialogs/xml-tree.cpp
@@ -220,7 +220,7 @@ void sp_xml_tree_dialog()
             w = prefs_get_int_attribute(prefs_path, "w", 0);
             h = prefs_get_int_attribute(prefs_path, "h", 0);
         }
-        
+
 //        if (x<0) x=0;
 //        if (y<0) y=0;
 
@@ -628,7 +628,7 @@ void sp_xml_tree_dialog()
 
 } // end of sp_xml_tree_dialog()
 
-static gboolean sp_xml_tree_key_press(GtkWidget *widget, GdkEventKey *event)
+static gboolean sp_xml_tree_key_press(GtkWidget */*widget*/, GdkEventKey *event)
 {
 
     unsigned int shortcut = get_group0_keyval(event) |
@@ -649,9 +649,9 @@ static gboolean sp_xml_tree_key_press(GtkWidget *widget, GdkEventKey *event)
 }
 
 
-static void sp_xmltree_desktop_change(Inkscape::Application *inkscape,
+static void sp_xmltree_desktop_change(Inkscape::Application */*inkscape*/,
                                       SPDesktop *desktop,
-                                      GtkWidget *dialog )
+                                      GtkWidget */*dialog*/ )
 {
     if (!desktop) {
         return;
@@ -828,8 +828,8 @@ void set_dt_select(Inkscape::XML::Node *repr)
 
 void on_tree_select_row(GtkCTree *tree,
                         GtkCTreeNode *node,
-                        gint column,
-                        gpointer data)
+                        gint /*column*/,
+                        gpointer /*data*/)
 {
     if (blocked) {
         return;
@@ -858,8 +858,8 @@ void on_tree_select_row(GtkCTree *tree,
 
 void on_tree_unselect_row(GtkCTree *tree,
                           GtkCTreeNode *node,
-                          gint column,
-                          gpointer data)
+                          gint /*column*/,
+                          gpointer /*data*/)
 {
     if (blocked) {
         return;
@@ -878,11 +878,11 @@ void on_tree_unselect_row(GtkCTree *tree,
 
 
 
-void after_tree_move(GtkCTree *tree,
+void after_tree_move(GtkCTree */*tree*/,
                      GtkCTreeNode *node,
                      GtkCTreeNode *new_parent,
                      GtkCTreeNode *new_sibling,
-                     gpointer data)
+                     gpointer /*data*/)
 {
     if (GTK_CTREE_ROW(node)->parent  == new_parent &&
         GTK_CTREE_ROW(node)->sibling == new_sibling)
@@ -895,7 +895,7 @@ void after_tree_move(GtkCTree *tree,
 }
 
 
-static void on_destroy(GtkObject *object, gpointer data)
+static void on_destroy(GtkObject */*object*/, gpointer /*data*/)
 {
     set_tree_desktop(NULL);
     gtk_object_destroy(GTK_OBJECT(tooltips));
@@ -916,7 +916,7 @@ static void on_destroy(GtkObject *object, gpointer data)
 
 
 
-static gboolean on_delete(GtkObject *object, GdkEvent *event, gpointer data)
+static gboolean on_delete(GtkObject */*object*/, GdkEvent */*event*/, gpointer /*data*/)
 {
     gtk_window_get_position((GtkWindow *) dlg, &x, &y);
     gtk_window_get_size((GtkWindow *) dlg, &w, &h);
@@ -933,7 +933,7 @@ static gboolean on_delete(GtkObject *object, GdkEvent *event, gpointer data)
 }
 
 
-static void _set_status_message(Inkscape::MessageType type, const gchar *message, GtkWidget *dialog)
+static void _set_status_message(Inkscape::MessageType /*type*/, const gchar *message, GtkWidget */*dialog*/)
 {
     if (status) {
         gtk_label_set_markup(GTK_LABEL(status), message ? message : "");
@@ -941,9 +941,9 @@ static void _set_status_message(Inkscape::MessageType type, const gchar *message
 }
 
 
-void on_tree_select_row_enable(GtkCTree *tree,
-                               GtkCTreeNode *node,
-                               gint column,
+void on_tree_select_row_enable(GtkCTree */*tree*/,
+                               GtkCTreeNode */*node*/,
+                               gint /*column*/,
                                gpointer data)
 {
     gtk_widget_set_sensitive(GTK_WIDGET(data), TRUE);
@@ -953,7 +953,7 @@ void on_tree_select_row_enable(GtkCTree *tree,
 
 void on_tree_select_row_enable_if_element(GtkCTree *tree,
                                           GtkCTreeNode *node,
-                                          gint column,
+                                          gint /*column*/,
                                           gpointer data )
 {
     Inkscape::XML::Node *repr = sp_xmlview_tree_node_get_repr(SP_XMLVIEW_TREE(tree), node);
@@ -968,7 +968,7 @@ void on_tree_select_row_enable_if_element(GtkCTree *tree,
 
 
 void on_tree_select_row_show_if_element(GtkCTree *tree, GtkCTreeNode *node,
-                                        gint column, gpointer data)
+                                        gint /*column*/, gpointer data)
 {
     Inkscape::XML::Node *repr = sp_xmlview_tree_node_get_repr(SP_XMLVIEW_TREE(tree), node);
 
@@ -982,7 +982,7 @@ void on_tree_select_row_show_if_element(GtkCTree *tree, GtkCTreeNode *node,
 
 
 void on_tree_select_row_show_if_text(GtkCTree *tree, GtkCTreeNode *node,
-                                     gint column, gpointer data)
+                                     gint /*column*/, gpointer data)
 {
     Inkscape::XML::Node *repr = sp_xmlview_tree_node_get_repr(SP_XMLVIEW_TREE(tree), node);
 
@@ -1021,32 +1021,32 @@ gboolean xml_tree_node_mutable(GtkCTreeNode *node)
 }
 
 
-void on_tree_select_row_enable_if_mutable(GtkCTree *tree, GtkCTreeNode *node,
-                                          gint column, gpointer data)
+void on_tree_select_row_enable_if_mutable(GtkCTree */*tree*/, GtkCTreeNode *node,
+                                          gint /*column*/, gpointer data)
 {
     gtk_widget_set_sensitive(GTK_WIDGET(data), xml_tree_node_mutable(node));
 }
 
 
 
-void on_tree_unselect_row_disable(GtkCTree *tree, GtkCTreeNode *node,
-                                  gint column, gpointer data)
+void on_tree_unselect_row_disable(GtkCTree */*tree*/, GtkCTreeNode */*node*/,
+                                  gint /*column*/, gpointer data)
 {
     gtk_widget_set_sensitive(GTK_WIDGET(data), FALSE);
 }
 
 
 
-void on_tree_unselect_row_hide(GtkCTree *tree, GtkCTreeNode *node,
-                               gint column, gpointer data)
+void on_tree_unselect_row_hide(GtkCTree */*tree*/, GtkCTreeNode */*node*/,
+                               gint /*column*/, gpointer data)
 {
     gtk_widget_hide(GTK_WIDGET(data));
 }
 
 
 
-void on_tree_unselect_row_clear_text(GtkCTree *tree, GtkCTreeNode *node,
-                                     gint column, gpointer data)
+void on_tree_unselect_row_clear_text(GtkCTree */*tree*/, GtkCTreeNode */*node*/,
+                                     gint /*column*/, gpointer data)
 {
     if (GTK_IS_EDITABLE(data)) {
         gtk_editable_delete_text(GTK_EDITABLE(data), 0, -1);
@@ -1058,8 +1058,8 @@ void on_tree_unselect_row_clear_text(GtkCTree *tree, GtkCTreeNode *node,
 }
 
 
-void on_attr_select_row(GtkCList *list, gint row, gint column,
-                        GdkEventButton *event, gpointer data)
+void on_attr_select_row(GtkCList *list, gint row, gint /*column*/,
+                        GdkEventButton */*event*/, gpointer /*data*/)
 {
     selected_attr = sp_xmlview_attr_list_get_row_key(list, row);
     gtk_window_set_focus(GTK_WINDOW(dlg), GTK_WIDGET(attr_value));
@@ -1068,15 +1068,15 @@ void on_attr_select_row(GtkCList *list, gint row, gint column,
 }
 
 
-void on_attr_unselect_row(GtkCList *list, gint row, gint column,
-                          GdkEventButton *event, gpointer data)
+void on_attr_unselect_row(GtkCList */*list*/, gint /*row*/, gint /*column*/,
+                          GdkEventButton */*event*/, gpointer /*data*/)
 {
     selected_attr = 0;
     attr_reset_context(selected_attr);
 }
 
 
-void on_attr_row_changed(GtkCList *list, gint row, gpointer data)
+void on_attr_row_changed(GtkCList *list, gint row, gpointer /*data*/)
 {
     gint attr = sp_xmlview_attr_list_get_row_key(list, row);
 
@@ -1115,7 +1115,7 @@ void on_attr_row_changed(GtkCList *list, gint row, gpointer data)
 
 
 void on_attr_select_row_set_name_content(GtkCList *list, gint row,
-                                         gint column, GdkEventButton *event,
+                                         gint /*column*/, GdkEventButton */*event*/,
                                          gpointer data)
 {
     GtkEditable *editable = GTK_EDITABLE(data);
@@ -1127,8 +1127,8 @@ void on_attr_select_row_set_name_content(GtkCList *list, gint row,
 
 
 
-void on_attr_select_row_set_value_content(GtkCList *list, gint row, gint column,
-                                          GdkEventButton *event,
+void on_attr_select_row_set_value_content(GtkCList *list, gint row, gint /*column*/,
+                                          GdkEventButton */*event*/,
                                           gpointer data)
 {
     GtkTextBuffer *tb = gtk_text_view_get_buffer(GTK_TEXT_VIEW(data));
@@ -1142,7 +1142,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)
+                                             gint /*column*/, gpointer data)
 {
     gboolean indentable = FALSE;
 
@@ -1172,7 +1172,7 @@ void on_tree_select_row_enable_if_indentable(GtkCTree *tree, GtkCTreeNode *node,
 
 void on_tree_select_row_enable_if_not_first_child(GtkCTree *tree,
                                                   GtkCTreeNode *node,
-                                                  gint column,
+                                                  gint /*column*/,
                                                   gpointer data)
 {
     Inkscape::XML::Node *repr = sp_xmlview_tree_node_get_repr(SP_XMLVIEW_TREE(tree), node);
@@ -1189,7 +1189,7 @@ void on_tree_select_row_enable_if_not_first_child(GtkCTree *tree,
 
 void on_tree_select_row_enable_if_not_last_child(GtkCTree *tree,
                                                  GtkCTreeNode *node,
-                                                 gint column, gpointer data)
+                                                 gint /*column*/, gpointer data)
 {
     Inkscape::XML::Node *repr = sp_xmlview_tree_node_get_repr(SP_XMLVIEW_TREE(tree), node);
 
@@ -1203,9 +1203,9 @@ void on_tree_select_row_enable_if_not_last_child(GtkCTree *tree,
 
 
 
-void on_tree_select_row_enable_if_has_grandparent(GtkCTree *tree,
+void on_tree_select_row_enable_if_has_grandparent(GtkCTree */*tree*/,
                                                   GtkCTreeNode *node,
-                                                  gint column, gpointer data)
+                                                  gint /*column*/, gpointer data)
 {
     GtkCTreeNode *parent = GTK_CTREE_ROW(node)->parent;
 
@@ -1223,24 +1223,24 @@ void on_tree_select_row_enable_if_has_grandparent(GtkCTree *tree,
 
 
 
-void on_attr_select_row_enable(GtkCList *list, gint row, gint column,
-                               GdkEventButton *event, gpointer data)
+void on_attr_select_row_enable(GtkCList */*list*/, gint /*row*/, gint /*column*/,
+                               GdkEventButton */*event*/, gpointer data)
 {
     gtk_widget_set_sensitive(GTK_WIDGET(data), TRUE);
 }
 
 
 
-void on_attr_unselect_row_disable(GtkCList *list, gint row, gint column,
-                                  GdkEventButton *event, gpointer data)
+void on_attr_unselect_row_disable(GtkCList */*list*/, gint /*row*/, gint /*column*/,
+                                  GdkEventButton */*event*/, gpointer data)
 {
     gtk_widget_set_sensitive(GTK_WIDGET(data), FALSE);
 }
 
 
 
-void on_attr_unselect_row_clear_text(GtkCList *list, gint row, gint column,
-                                     GdkEventButton *event, gpointer data)
+void on_attr_unselect_row_clear_text(GtkCList */*list*/, gint /*row*/, gint /*column*/,
+                                     GdkEventButton */*event*/, gpointer data)
 {
     if (GTK_IS_EDITABLE(data)) {
         gtk_editable_delete_text(GTK_EDITABLE(data), 0, -1);
@@ -1270,7 +1270,7 @@ void on_editable_changed_enable_if_valid_xml_name(GtkEditable *editable,
 
 
 
-void on_desktop_selection_changed(Inkscape::Selection *selection)
+void on_desktop_selection_changed(Inkscape::Selection */*selection*/)
 {
     if (!blocked++) {
         set_tree_select(get_dt_select());
@@ -1287,7 +1287,7 @@ static void on_document_replaced(SPDesktop *dt, SPDocument *doc)
     set_tree_document(doc);
 }
 
-void on_document_uri_set(gchar const *uri, SPDocument *document)
+void on_document_uri_set(gchar const */*uri*/, SPDocument *document)
 {
     gchar title[500];
     sp_ui_dialog_title_string(Inkscape::Verb::get(SP_VERB_DIALOG_XML_EDITOR), title);
@@ -1298,7 +1298,7 @@ void on_document_uri_set(gchar const *uri, SPDocument *document)
 
 
 
-void on_clicked_get_editable_text(GtkWidget *widget, gpointer data)
+void on_clicked_get_editable_text(GtkWidget */*widget*/, gpointer data)
 {
     EditableDest *dest = (EditableDest *) data;
     dest->text = gtk_editable_get_chars(dest->editable, 0, -1);
@@ -1306,7 +1306,7 @@ void on_clicked_get_editable_text(GtkWidget *widget, gpointer data)
 
 
 
-void cmd_new_element_node(GtkObject *object, gpointer data)
+void cmd_new_element_node(GtkObject */*object*/, gpointer /*data*/)
 {
     EditableDest name;
     GtkWidget *window, *create, *cancel, *vbox, *entry, *bbox, *sep;
@@ -1384,7 +1384,7 @@ void cmd_new_element_node(GtkObject *object, gpointer data)
 
 
 
-void cmd_new_text_node(GtkObject *object, gpointer data)
+void cmd_new_text_node(GtkObject */*object*/, gpointer /*data*/)
 {
     g_assert(selected_repr != NULL);
 
@@ -1402,7 +1402,7 @@ void cmd_new_text_node(GtkObject *object, gpointer data)
 
 }
 
-void cmd_duplicate_node(GtkObject *object, gpointer data)
+void cmd_duplicate_node(GtkObject */*object*/, gpointer /*data*/)
 {
     g_assert(selected_repr != NULL);
 
@@ -1422,7 +1422,7 @@ void cmd_duplicate_node(GtkObject *object, gpointer data)
 
 
 
-void cmd_delete_node(GtkObject *object, gpointer data)
+void cmd_delete_node(GtkObject */*object*/, gpointer /*data*/)
 {
     g_assert(selected_repr != NULL);
     sp_repr_unparent(selected_repr);
@@ -1433,7 +1433,7 @@ void cmd_delete_node(GtkObject *object, gpointer data)
 
 
 
-void cmd_delete_attr(GtkObject *object, gpointer data)
+void cmd_delete_attr(GtkObject */*object*/, gpointer /*data*/)
 {
     g_assert(selected_repr != NULL);
     g_assert(selected_attr != 0);
@@ -1445,13 +1445,13 @@ void cmd_delete_attr(GtkObject *object, gpointer data)
         updated->updateRepr();
     }
 
-    sp_document_done(current_document, SP_VERB_DIALOG_XML_EDITOR, 
+    sp_document_done(current_document, SP_VERB_DIALOG_XML_EDITOR,
                      _("Delete attribute"));
 }
 
 
 
-void cmd_set_attr(GtkObject *object, gpointer data)
+void cmd_set_attr(GtkObject */*object*/, gpointer /*data*/)
 {
     g_assert(selected_repr != NULL);
 
@@ -1491,7 +1491,7 @@ void cmd_set_attr(GtkObject *object, gpointer data)
 
 
 
-void cmd_raise_node(GtkObject *object, gpointer data)
+void cmd_raise_node(GtkObject */*object*/, gpointer /*data*/)
 {
     g_assert(selected_repr != NULL);
 
@@ -1508,7 +1508,7 @@ void cmd_raise_node(GtkObject *object, gpointer data)
 
     parent->changeOrder(selected_repr, ref);
 
-    sp_document_done(current_document, SP_VERB_DIALOG_XML_EDITOR, 
+    sp_document_done(current_document, SP_VERB_DIALOG_XML_EDITOR,
                      _("Raise node"));
 
     set_tree_select(selected_repr);
@@ -1517,7 +1517,7 @@ void cmd_raise_node(GtkObject *object, gpointer data)
 
 
 
-void cmd_lower_node(GtkObject *object, gpointer data)
+void cmd_lower_node(GtkObject */*object*/, gpointer /*data*/)
 {
     g_assert(selected_repr != NULL);
     g_return_if_fail(selected_repr->next() != NULL);
@@ -1532,7 +1532,7 @@ void cmd_lower_node(GtkObject *object, gpointer data)
     set_dt_select(selected_repr);
 }
 
-void cmd_indent_node(GtkObject *object, gpointer data)
+void cmd_indent_node(GtkObject */*object*/, gpointer /*data*/)
 {
     Inkscape::XML::Node *repr = selected_repr;
     g_assert(repr != NULL);
@@ -1555,7 +1555,7 @@ void cmd_indent_node(GtkObject *object, gpointer data)
     parent->removeChild(repr);
     prev->addChild(repr, ref);
 
-    sp_document_done(current_document, SP_VERB_DIALOG_XML_EDITOR, 
+    sp_document_done(current_document, SP_VERB_DIALOG_XML_EDITOR,
                      _("Indent node"));
     set_tree_select(repr);
     set_dt_select(repr);
@@ -1564,7 +1564,7 @@ void cmd_indent_node(GtkObject *object, gpointer data)
 
 
 
-void cmd_unindent_node(GtkObject *object, gpointer data)
+void cmd_unindent_node(GtkObject */*object*/, gpointer /*data*/)
 {
     Inkscape::XML::Node *repr = selected_repr;
     g_assert(repr != NULL);
@@ -1576,7 +1576,7 @@ void cmd_unindent_node(GtkObject *object, gpointer data)
     parent->removeChild(repr);
     grandparent->addChild(repr, parent);
 
-    sp_document_done(current_document, SP_VERB_DIALOG_XML_EDITOR, 
+    sp_document_done(current_document, SP_VERB_DIALOG_XML_EDITOR,
                      _("Unindent node"));
     set_tree_select(repr);
     set_dt_select(repr);