bulk whitespace removal patch #1198588 by gigaclon

(bzr r134)

7 files changed, 287 insertions, 287 deletions

diff --git a/src/dialogs/clonetiler.cpp b/src/dialogs/clonetiler.cpp
index 72cae3c47..084186bf6 100644
--- a/src/dialogs/clonetiler.cpp
+++ b/src/dialogs/clonetiler.cpp
@@ -58,7 +58,7 @@ static GtkWidget *dlg = NULL;
 static win_data wd;
 
 // impossible original values to make sure they are read from prefs
-static gint x = -1000, y = -1000, w = 0, h = 0; 
+static gint x = -1000, y = -1000, w = 0, h = 0;
 static gchar *prefs_path = "dialogs.clonetiler";
 
 #define SB_MARGIN 1
@@ -103,7 +103,7 @@ clonetiler_dialog_destroy (GtkObject *object, gpointer data)
     
     wd.win = dlg = NULL;
     wd.stop = 0;
-    
+
 }
 
 static gboolean
@@ -219,11 +219,11 @@ clonetiler_get_transform (
     double w, double h,
 
     // values from the dialog:
-    double d_x_per_x, double d_y_per_x, double d_x_per_y, double d_y_per_y, 
+    double d_x_per_x, double d_y_per_x, double d_x_per_y, double d_y_per_y,
     int alternate_x, int alternate_y, double rand_x, double rand_y,
-    double d_per_x_exp, double d_per_y_exp, 
+    double d_per_x_exp, double d_per_y_exp,
     double d_rot_per_x, double d_rot_per_y, int alternate_rotx, int alternate_roty, double rand_rot,
-    double d_scalex_per_x, double d_scaley_per_x, double d_scalex_per_y, double d_scaley_per_y, 
+    double d_scalex_per_x, double d_scaley_per_x, double d_scalex_per_y, double d_scaley_per_y,
     int alternate_scalex, int alternate_scaley, double rand_scalex, double rand_scaley
     )
 {
@@ -494,11 +494,11 @@ clonetiler_get_transform (
         }
         NR::Matrix ori (NR::translate (width * (2*(x/3) + y%2) + dx,  (height/2) * y + dy));
         if (x % 3 == 0) {
-            return d_s_r * ori; 
+            return d_s_r * ori;
         } else if (x % 3 == 1) {
-            return d_s_r * rotate_m120_c * dia1 * ori; 
+            return d_s_r * rotate_m120_c * dia1 * ori;
         } else if (x % 3 == 2) {
-            return d_s_r * rotate_120_c * dia2 * ori; 
+            return d_s_r * rotate_120_c * dia2 * ori;
         }
     }
     break;
@@ -676,14 +676,14 @@ clonetiler_get_transform (
     }
     break;
 
-    default: 
+    default:
         break;
     }
 
     return NR::identity();
 }
 
-static bool 
+static bool
 clonetiler_is_a_clone_of (SPObject *tile, SPObject *obj)
 {
     char *id_href = NULL;
@@ -693,11 +693,11 @@ clonetiler_is_a_clone_of (SPObject *tile, SPObject *obj)
         id_href = g_strdup_printf("#%s", obj_repr->attribute("id"));
     }
 
-    if (SP_IS_USE(tile) && 
+    if (SP_IS_USE(tile) &&
         SP_OBJECT_REPR(tile)->attribute("xlink:href") &&
-        (!id_href || !strcmp(id_href, SP_OBJECT_REPR(tile)->attribute("xlink:href"))) && 
+        (!id_href || !strcmp(id_href, SP_OBJECT_REPR(tile)->attribute("xlink:href"))) &&
         SP_OBJECT_REPR(tile)->attribute("inkscape:tiled-clone-of") &&
-        (!id_href || !strcmp(id_href, SP_OBJECT_REPR(tile)->attribute("inkscape:tiled-clone-of")))) 
+        (!id_href || !strcmp(id_href, SP_OBJECT_REPR(tile)->attribute("inkscape:tiled-clone-of"))))
     {
         if (id_href)
             g_free (id_href);
@@ -1046,7 +1046,7 @@ clonetiler_apply (GtkWidget *widget, void *)
     double w;
     double h;
 
-    if (keepbbox && 
+    if (keepbbox &&
         obj_repr->attribute("inkscape:tile-w") &&
         obj_repr->attribute("inkscape:tile-h") &&
         obj_repr->attribute("inkscape:tile-cx") &&
@@ -1074,14 +1074,14 @@ clonetiler_apply (GtkWidget *widget, void *)
     NR::Point cur = NR::Point (0, 0);
     NR::Rect bbox_original = NR::Rect (NR::Point (c[NR::X] - w/2, c[NR::Y] - h/2), NR::Point (c[NR::X] + w/2, c[NR::Y] + h/2));
 
-    for (int x = 0; 
-         fillrect? 
+    for (int x = 0;
+         fillrect?
              (fabs(cur[NR::X]) < fillwidth && x < 200) // prevent "freezing" with too large fillrect, arbitrarily limit rows
-             : (x < xmax); 
+             : (x < xmax);
          x ++) {
-        for (int y = 0; 
+        for (int y = 0;
              fillrect?
-                 (fabs(cur[NR::Y]) < fillheight && y < 200) // prevent "freezing" with too large fillrect, arbitrarily limit cols 
+                 (fabs(cur[NR::Y]) < fillheight && y < 200) // prevent "freezing" with too large fillrect, arbitrarily limit cols
                  : (y < ymax);
              y ++) {
 
@@ -1090,9 +1090,9 @@ clonetiler_apply (GtkWidget *widget, void *)
             // Get transform from symmetry, shift, scale, rotation
             NR::Matrix t = clonetiler_get_transform (type, x, y, c[NR::X], c[NR::Y], w, h,
                                                      d_x_per_x, d_y_per_x, d_x_per_y, d_y_per_y, alternate_x, alternate_y, rand_x, rand_y,
-                                                     d_per_x_exp, d_per_y_exp, 
+                                                     d_per_x_exp, d_per_y_exp,
                                                      d_rot_per_x, d_rot_per_y, alternate_rotx, alternate_roty, rand_rot,
-                                                     d_scalex_per_x, d_scaley_per_x, d_scalex_per_y, d_scaley_per_y, 
+                                                     d_scalex_per_x, d_scaley_per_x, d_scalex_per_y, d_scaley_per_y,
                                                      alternate_scalex, alternate_scaley, rand_scalex, rand_scaley);
 
             cur = c * t - c;
@@ -1124,7 +1124,7 @@ clonetiler_apply (GtkWidget *widget, void *)
                 float rgb[3];
                 sp_color_hsl_to_rgb_floatv (rgb, hsl[0], hsl[1], hsl[2]);
                 sp_svg_write_color(color_string, 32, SP_RGBA32_F_COMPOSE(rgb[0], rgb[1], rgb[2], 1.0));
-            } 
+            }
 
             // Opacity tab
             double opacity = 1.0;
@@ -1187,7 +1187,7 @@ clonetiler_apply (GtkWidget *widget, void *)
                     double power;
                     if (gamma_picked < 0)
                         power = 1/(1 + fabs(gamma_picked));
-                    else 
+                    else
                         power = 1 + gamma_picked;
 
                     val = pow (val, power);
@@ -1208,7 +1208,7 @@ clonetiler_apply (GtkWidget *widget, void *)
                 g = CLAMP (g, 0, 1);
                 b = CLAMP (b, 0, 1);
 
-                // recompose tweaked color 
+                // recompose tweaked color
                 rgba = SP_RGBA32_F_COMPOSE(r, g, b, a);
 
                 if (pick_to_presence) {
@@ -1298,12 +1298,12 @@ clonetiler_checkbox (GtkTooltips *tt, const char *tip, const char *attr)
 
     GtkWidget *b = gtk_check_button_new ();
     gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), b, tip, NULL);
- 
+
     int value = prefs_get_int_attribute (prefs_path, attr, 0);
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(b), value);
 
     gtk_box_pack_end (GTK_BOX (hb), b, FALSE, TRUE, 0);
-    gtk_signal_connect ( GTK_OBJECT (b), "clicked", 
+    gtk_signal_connect ( GTK_OBJECT (b), "clicked",
                          GTK_SIGNAL_FUNC (clonetiler_checkbox_toggled), (gpointer) attr);
 
     g_object_set_data (G_OBJECT(b), "uncheckable", GINT_TO_POINTER(TRUE));
@@ -1328,13 +1328,13 @@ clonetiler_spinbox (GtkTooltips *tt, const char *tip, const char *attr, double l
         GtkObject *a;
         if (exponent)
             a = gtk_adjustment_new(1.0, lower, upper, 0.01, 0.05, 0.1);
-        else 
+        else
             a = gtk_adjustment_new(0.0, lower, upper, 0.1, 0.5, 2);
 
         GtkWidget *sb;
         if (exponent)
             sb = gtk_spin_button_new (GTK_ADJUSTMENT (a), 0.01, 2);
-        else 
+        else
             sb = gtk_spin_button_new (GTK_ADJUSTMENT (a), 0.1, 1);
 
         gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), sb, tip, NULL);
@@ -1348,7 +1348,7 @@ clonetiler_spinbox (GtkTooltips *tt, const char *tip, const char *attr, double l
 
         if (exponent)
             g_object_set_data (G_OBJECT(sb), "oneable", GINT_TO_POINTER(TRUE));
-        else 
+        else
             g_object_set_data (G_OBJECT(sb), "zeroable", GINT_TO_POINTER(TRUE));
     }
 
@@ -1367,7 +1367,7 @@ clonetiler_symgroup_changed (GtkMenuItem *item, gpointer data)
 {
     gint group_new = GPOINTER_TO_INT (data);
     prefs_set_int_attribute ( prefs_path, "symmetrygroup", group_new );
-} 
+}
 
 static void
 clonetiler_xy_changed (GtkAdjustment *adj, gpointer data)
@@ -1415,7 +1415,7 @@ clonetiler_reset_recursive (GtkWidget *w)
             }
         }
     }
-	
+
     if (GTK_IS_CONTAINER(w)) {
         GList *ch = gtk_container_get_children (GTK_CONTAINER(w));
         for (GList *i = ch; i != NULL; i = i->next) {
@@ -1619,7 +1619,7 @@ clonetiler_dialog (void)
         GtkWidget *mainbox = gtk_vbox_new(FALSE, 4);
         gtk_container_set_border_width (GTK_CONTAINER (mainbox), 6);
         gtk_container_add (GTK_CONTAINER (dlg), mainbox);
-                            
+
         GtkWidget *nb = gtk_notebook_new ();
         gtk_box_pack_start (GTK_BOX (mainbox), nb, FALSE, FALSE, 0);
 
@@ -1676,7 +1676,7 @@ clonetiler_dialog (void)
                 GtkWidget *item = gtk_menu_item_new ();
                 gtk_container_add (GTK_CONTAINER (item), l);
 
-                gtk_signal_connect ( GTK_OBJECT (item), "activate", 
+                gtk_signal_connect ( GTK_OBJECT (item), "activate",
                                      GTK_SIGNAL_FUNC (clonetiler_symgroup_changed),
                                      GINT_TO_POINTER (sg.group) );
 
@@ -1707,7 +1707,7 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt, 
+                GtkWidget *l = clonetiler_spinbox (tt,
                     // xgettext:no-c-format
                                                    _("Horizontal shift per row (in % of tile width)"), "d_x_per_y",
                                                    -100, 1000, "%");
@@ -1715,7 +1715,7 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt, 
+                GtkWidget *l = clonetiler_spinbox (tt,
                     // xgettext:no-c-format
                                                    _("Horizontal shift per column (in % of tile width)"), "d_x_per_x",
                                                    -100, 1000, "%");
@@ -1723,7 +1723,7 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt, 
+                GtkWidget *l = clonetiler_spinbox (tt,
                                                    _("Randomize the horizontal shift by this percentage"), "rand_x",
                                                    0, 1000, "%");
                 clonetiler_table_attach (table, l, 0, 2, 4);
@@ -1740,7 +1740,7 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt, 
+                GtkWidget *l = clonetiler_spinbox (tt,
                     // xgettext:no-c-format
                                                    _("Vertical shift per row (in % of tile height)"), "d_y_per_y",
                                                    -100, 1000, "%");
@@ -1748,7 +1748,7 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt, 
+                GtkWidget *l = clonetiler_spinbox (tt,
                     // xgettext:no-c-format
                                                    _("Vertical shift per column (in % of tile height)"), "d_y_per_x",
                                                    -100, 1000, "%");
@@ -1756,7 +1756,7 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt, 
+                GtkWidget *l = clonetiler_spinbox (tt,
                                                    _("Randomize the vertical shift by this percentage"), "rand_y",
                                                    0, 1000, "%");
                 clonetiler_table_attach (table, l, 0, 3, 4);
@@ -1771,14 +1771,14 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt, 
+                GtkWidget *l = clonetiler_spinbox (tt,
                                                    _("Whether rows are spaced evenly (1), converge (<1) or diverge (>1)"), "d_per_y_exp",
                                                    0, 10, "", true);
                 clonetiler_table_attach (table, l, 0, 4, 2);
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt, 
+                GtkWidget *l = clonetiler_spinbox (tt,
                                                    _("Whether columns are spaced evenly (1), converge (<1) or diverge (>1)"), "d_per_x_exp",
                                                    0, 10, "", true);
                 clonetiler_table_attach (table, l, 0, 4, 3);
@@ -1821,7 +1821,7 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt, 
+                GtkWidget *l = clonetiler_spinbox (tt,
                     // xgettext:no-c-format
                                                    _("Horizontal scale per row (in % of tile width)"), "d_scalex_per_y",
                                                    -100, 1000, "%");
@@ -1829,7 +1829,7 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt, 
+                GtkWidget *l = clonetiler_spinbox (tt,
                     // xgettext:no-c-format
                                                    _("Horizontal scale per column (in % of tile width)"), "d_scalex_per_x",
                                                    -100, 1000, "%");
@@ -1837,7 +1837,7 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt, 
+                GtkWidget *l = clonetiler_spinbox (tt,
                                                    _("Randomize the horizontal scale by this percentage"), "rand_scalex",
                                                    0, 1000, "%");
                 clonetiler_table_attach (table, l, 0, 2, 4);
@@ -1852,7 +1852,7 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt, 
+                GtkWidget *l = clonetiler_spinbox (tt,
                     // xgettext:no-c-format
                                                    _("Vertical scale per row (in % of tile height)"), "d_scaley_per_y",
                                                    -100, 1000, "%");
@@ -1860,7 +1860,7 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt, 
+                GtkWidget *l = clonetiler_spinbox (tt,
                     // xgettext:no-c-format
                                                    _("Vertical scale per column (in % of tile height)"), "d_scaley_per_x",
                                                    -100, 1000, "%");
@@ -1868,7 +1868,7 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt, 
+                GtkWidget *l = clonetiler_spinbox (tt,
                                                    _("Randomize the vertical scale by this percentage"), "rand_scaley",
                                                    0, 1000, "%");
                 clonetiler_table_attach (table, l, 0, 3, 4);
@@ -1911,7 +1911,7 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt, 
+                GtkWidget *l = clonetiler_spinbox (tt,
                     // xgettext:no-c-format
                                                    _("Rotate tiles by this angle for each row"), "d_rot_per_y",
                                                    -180, 180, "&#176;");
@@ -1919,7 +1919,7 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt, 
+                GtkWidget *l = clonetiler_spinbox (tt,
                     // xgettext:no-c-format
                                                    _("Rotate tiles by this angle for each column"), "d_rot_per_x",
                                                    -180, 180, "&#176;");
@@ -1927,7 +1927,7 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt, 
+                GtkWidget *l = clonetiler_spinbox (tt,
                                                    _("Randomize the rotation angle by this percentage"), "rand_rot",
                                                    0, 100, "%");
                 clonetiler_table_attach (table, l, 0, 2, 4);
@@ -1969,21 +1969,21 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt, 
+                GtkWidget *l = clonetiler_spinbox (tt,
                                                    _("Decrease tile opacity by this percentage for each row"), "d_opacity_per_y",
                                                    0, 100, "%");
                 clonetiler_table_attach (table, l, 0, 2, 2);
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt, 
+                GtkWidget *l = clonetiler_spinbox (tt,
                                                    _("Decrease tile opacity by this percentage for each column"), "d_opacity_per_x",
                                                    0, 100, "%");
                 clonetiler_table_attach (table, l, 0, 2, 3);
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt, 
+                GtkWidget *l = clonetiler_spinbox (tt,
                                                    _("Randomize the tile opacity by this percentage"), "rand_opacity",
                                                    0, 100, "%");
                 clonetiler_table_attach (table, l, 0, 2, 4);
@@ -2041,21 +2041,21 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt, 
+                GtkWidget *l = clonetiler_spinbox (tt,
                                                    _("Change the tile hue by this percentage for each row"), "d_hue_per_y",
                                                    -100, 100, "%");
                 clonetiler_table_attach (table, l, 0, 2, 2);
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt, 
+                GtkWidget *l = clonetiler_spinbox (tt,
                                                    _("Change the tile hue by this percentage for each column"), "d_hue_per_x",
                                                    -100, 100, "%");
                 clonetiler_table_attach (table, l, 0, 2, 3);
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt, 
+                GtkWidget *l = clonetiler_spinbox (tt,
                                                    _("Randomize the tile hue by this percentage"), "rand_hue",
                                                    0, 100, "%");
                 clonetiler_table_attach (table, l, 0, 2, 4);
@@ -2071,21 +2071,21 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt, 
+                GtkWidget *l = clonetiler_spinbox (tt,
                                                    _("Change the color saturation by this percentage for each row"), "d_saturation_per_y",
                                                    -100, 100, "%");
                 clonetiler_table_attach (table, l, 0, 3, 2);
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt, 
+                GtkWidget *l = clonetiler_spinbox (tt,
                                                    _("Change the color saturation by this percentage for each column"), "d_saturation_per_x",
                                                    -100, 100, "%");
                 clonetiler_table_attach (table, l, 0, 3, 3);
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt, 
+                GtkWidget *l = clonetiler_spinbox (tt,
                                                    _("Randomize the color saturation by this percentage"), "rand_saturation",
                                                    0, 100, "%");
                 clonetiler_table_attach (table, l, 0, 3, 4);
@@ -2100,21 +2100,21 @@ clonetiler_dialog (void)
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt, 
+                GtkWidget *l = clonetiler_spinbox (tt,
                                                    _("Change the color lightness by this percentage for each row"), "d_lightness_per_y",
                                                    -100, 100, "%");
                 clonetiler_table_attach (table, l, 0, 4, 2);
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt, 
+                GtkWidget *l = clonetiler_spinbox (tt,
                                                    _("Change the color lightness by this percentage for each column"), "d_lightness_per_x",
                                                    -100, 100, "%");
                 clonetiler_table_attach (table, l, 0, 4, 3);
             }
 
             {
-                GtkWidget *l = clonetiler_spinbox (tt, 
+                GtkWidget *l = clonetiler_spinbox (tt,
                                                    _("Randomize the color lightness by this percentage"), "rand_lightness",
                                                    0, 100, "%");
                 clonetiler_table_attach (table, l, 0, 4, 4);
@@ -2145,7 +2145,7 @@ clonetiler_dialog (void)
             GtkWidget *vb = clonetiler_new_tab (nb, _("_Trace"));
 
 
-        { 
+        {
             GtkWidget *hb = gtk_hbox_new(FALSE, VB_MARGIN);
             gtk_box_pack_start (GTK_BOX (vb), hb, FALSE, FALSE, 0);
 
@@ -2181,7 +2181,7 @@ clonetiler_dialog (void)
                     radio = gtk_radio_button_new_with_label (NULL, _("Color"));
                     gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), radio, _("Pick the visible color and opacity"), NULL);
                     clonetiler_table_attach (table, radio, 0.0, 1, 1);
-                    gtk_signal_connect (GTK_OBJECT (radio), "toggled", 
+                    gtk_signal_connect (GTK_OBJECT (radio), "toggled",
                                         GTK_SIGNAL_FUNC (clonetiler_pick_switched), GINT_TO_POINTER(PICK_COLOR));
                     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), prefs_get_int_attribute(prefs_path, "pick", 0) == PICK_COLOR);
                 }
@@ -2189,7 +2189,7 @@ clonetiler_dialog (void)
                     radio = gtk_radio_button_new_with_label (gtk_radio_button_group (GTK_RADIO_BUTTON (radio)), _("Opacity"));
                     gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), radio, _("Pick the total accumulated opacity"), NULL);
                     clonetiler_table_attach (table, radio, 0.0, 2, 1);
-                    gtk_signal_connect (GTK_OBJECT (radio), "toggled", 
+                    gtk_signal_connect (GTK_OBJECT (radio), "toggled",
                                         GTK_SIGNAL_FUNC (clonetiler_pick_switched), GINT_TO_POINTER(PICK_OPACITY));
                     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), prefs_get_int_attribute(prefs_path, "pick", 0) == PICK_OPACITY);
                 }
@@ -2197,7 +2197,7 @@ clonetiler_dialog (void)
                     radio = gtk_radio_button_new_with_label (gtk_radio_button_group (GTK_RADIO_BUTTON (radio)), _("R"));
                     gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), radio, _("Pick the Red component of the color"), NULL);
                     clonetiler_table_attach (table, radio, 0.0, 1, 2);
-                    gtk_signal_connect (GTK_OBJECT (radio), "toggled", 
+                    gtk_signal_connect (GTK_OBJECT (radio), "toggled",
                                         GTK_SIGNAL_FUNC (clonetiler_pick_switched), GINT_TO_POINTER(PICK_R));
                     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), prefs_get_int_attribute(prefs_path, "pick", 0) == PICK_R);
                 }
@@ -2205,7 +2205,7 @@ clonetiler_dialog (void)
                     radio = gtk_radio_button_new_with_label (gtk_radio_button_group (GTK_RADIO_BUTTON (radio)), _("G"));
                     gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), radio, _("Pick the Green component of the color"), NULL);
                     clonetiler_table_attach (table, radio, 0.0, 2, 2);
-                    gtk_signal_connect (GTK_OBJECT (radio), "toggled", 
+                    gtk_signal_connect (GTK_OBJECT (radio), "toggled",
                                         GTK_SIGNAL_FUNC (clonetiler_pick_switched), GINT_TO_POINTER(PICK_G));
                     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), prefs_get_int_attribute(prefs_path, "pick", 0) == PICK_G);
                 }
@@ -2213,7 +2213,7 @@ clonetiler_dialog (void)
                     radio = gtk_radio_button_new_with_label (gtk_radio_button_group (GTK_RADIO_BUTTON (radio)), _("B"));
                     gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), radio, _("Pick the Blue component of the color"), NULL);
                     clonetiler_table_attach (table, radio, 0.0, 3, 2);
-                    gtk_signal_connect (GTK_OBJECT (radio), "toggled", 
+                    gtk_signal_connect (GTK_OBJECT (radio), "toggled",
                                         GTK_SIGNAL_FUNC (clonetiler_pick_switched), GINT_TO_POINTER(PICK_B));
                     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), prefs_get_int_attribute(prefs_path, "pick", 0) == PICK_B);
                 }
@@ -2223,7 +2223,7 @@ clonetiler_dialog (void)
                     radio = gtk_radio_button_new_with_label (gtk_radio_button_group (GTK_RADIO_BUTTON (radio)), Q_("clonetiler|H"));
                     gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), radio, _("Pick the hue of the color"), NULL);
                     clonetiler_table_attach (table, radio, 0.0, 1, 3);
-                    gtk_signal_connect (GTK_OBJECT (radio), "toggled", 
+                    gtk_signal_connect (GTK_OBJECT (radio), "toggled",
                                         GTK_SIGNAL_FUNC (clonetiler_pick_switched), GINT_TO_POINTER(PICK_H));
                     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), prefs_get_int_attribute(prefs_path, "pick", 0) == PICK_H);
                 }
@@ -2233,7 +2233,7 @@ clonetiler_dialog (void)
                     radio = gtk_radio_button_new_with_label (gtk_radio_button_group (GTK_RADIO_BUTTON (radio)), Q_("clonetiler|S"));
                     gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), radio, _("Pick the saturation of the color"), NULL);
                     clonetiler_table_attach (table, radio, 0.0, 2, 3);
-                    gtk_signal_connect (GTK_OBJECT (radio), "toggled", 
+                    gtk_signal_connect (GTK_OBJECT (radio), "toggled",
                                         GTK_SIGNAL_FUNC (clonetiler_pick_switched), GINT_TO_POINTER(PICK_S));
                     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), prefs_get_int_attribute(prefs_path, "pick", 0) == PICK_S);
                 }
@@ -2243,7 +2243,7 @@ clonetiler_dialog (void)
                     radio = gtk_radio_button_new_with_label (gtk_radio_button_group (GTK_RADIO_BUTTON (radio)), Q_("clonetiler|L"));
                     gtk_tooltips_set_tip (GTK_TOOLTIPS (tt), radio, _("Pick the lightness of the color"), NULL);
                     clonetiler_table_attach (table, radio, 0.0, 3, 3);
-                    gtk_signal_connect (GTK_OBJECT (radio), "toggled", 
+                    gtk_signal_connect (GTK_OBJECT (radio), "toggled",
                                         GTK_SIGNAL_FUNC (clonetiler_pick_switched), GINT_TO_POINTER(PICK_L));
                     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio), prefs_get_int_attribute(prefs_path, "pick", 0) == PICK_L);
                 }
@@ -2265,7 +2265,7 @@ clonetiler_dialog (void)
                     clonetiler_table_attach (table, l, 1.0, 1, 1);
                 }
                 {
-                    GtkWidget *l = clonetiler_spinbox (tt, 
+                    GtkWidget *l = clonetiler_spinbox (tt,
                                                        _("Shift the mid-range of the picked value upwards (>0) or downwards (<0)"), "gamma_picked",
                                                        -10, 10, "");
                     clonetiler_table_attach (table, l, 0.0, 1, 2);
@@ -2277,7 +2277,7 @@ clonetiler_dialog (void)
                     clonetiler_table_attach (table, l, 1.0, 1, 3);
                 }
                 {
-                    GtkWidget *l = clonetiler_spinbox (tt, 
+                    GtkWidget *l = clonetiler_spinbox (tt,
                                                        _("Randomize the picked value by this percentage"), "rand_picked",
                                                        0, 100, "%");
                     clonetiler_table_attach (table, l, 0.0, 1, 4);
@@ -2429,7 +2429,7 @@ clonetiler_dialog (void)
                 }
 
                 {
-                    // Height spinbutton 
+                    // Height spinbutton
                     GtkObject *a = gtk_adjustment_new (0.0, -SP_DESKTOP_SCROLL_LIMIT, SP_DESKTOP_SCROLL_LIMIT, 1.0, 10.0, 10.0);
                     sp_unit_selector_add_adjustment (SP_UNIT_SELECTOR (u), GTK_ADJUSTMENT (a));
 
@@ -2452,7 +2452,7 @@ clonetiler_dialog (void)
 
             }
 
-            // Switch 
+            // Switch
             GtkWidget* radio;
             {
                 radio = gtk_radio_button_new_with_label (NULL, _("Rows, columns: "));
@@ -2478,7 +2478,7 @@ clonetiler_dialog (void)
 
 
 // Use saved pos
-        { 
+        {
             GtkWidget *hb = gtk_hbox_new(FALSE, VB_MARGIN);
             gtk_box_pack_start (GTK_BOX (mainbox), hb, FALSE, FALSE, 0);
 
@@ -2561,7 +2561,7 @@ clonetiler_dialog (void)
         gtk_widget_show_all (mainbox);
 
     } // end of if (!dlg)
-    
+
     gtk_window_present ((GtkWindow *) dlg);
 }
 
diff --git a/src/dialogs/dialog-events.cpp b/src/dialogs/dialog-events.cpp
index 4e6a93729..deabcf383 100644
--- a/src/dialogs/dialog-events.cpp
+++ b/src/dialogs/dialog-events.cpp
@@ -28,11 +28,11 @@
 
 
 /**
-* \brief  This function is called to zero the transientize semaphore by a 
+* \brief  This function is called to zero the transientize semaphore by a
 *         timeout.
 */
-gboolean 
-sp_allow_again (gpointer *wd) 
+gboolean
+sp_allow_again (gpointer *wd)
 {
     ((win_data *) wd)->stop = 0;
     return FALSE; // so that it is only called once
@@ -51,7 +51,7 @@ sp_dialog_defocus (GtkWindow *win)
     //find out the document window we're transient for
     w = gtk_window_get_transient_for ((GtkWindow *) win);
     //switch to it
-    
+
     if (w) {
         gtk_window_present (w);
     }
@@ -66,7 +66,7 @@ sp_dialog_defocus (GtkWindow *win)
 void
 sp_dialog_defocus_callback (GtkWindow *win, gpointer data)
 {
-    sp_dialog_defocus ((GtkWindow *) 
+    sp_dialog_defocus ((GtkWindow *)
         gtk_widget_get_toplevel ((GtkWidget *) data));
 }
 
@@ -75,7 +75,7 @@ sp_dialog_defocus_callback (GtkWindow *win, gpointer data)
 void
 sp_dialog_defocus_on_enter (GtkWidget *w)
 {
-    g_signal_connect ( G_OBJECT (w), "activate", 
+    g_signal_connect ( G_OBJECT (w), "activate",
                        G_CALLBACK (sp_dialog_defocus_callback), w );
 }
 
@@ -91,26 +91,26 @@ sp_dialog_event_handler (GtkWindow *win, GdkEvent *event, gpointer data)
         return FALSE;
     }
 
-    gboolean ret = FALSE; 
+    gboolean ret = FALSE;
 
     switch (event->type) {
-    
+
         case GDK_KEY_PRESS:
-        
+
             switch (get_group0_keyval (&event->key)) {
-                case GDK_Escape: 
+                case GDK_Escape:
                     sp_dialog_defocus (win);
-                    ret = TRUE; 
+                    ret = TRUE;
                     break;
                 case GDK_F4:
                 case GDK_w:
                 case GDK_W:
                     // close dialog
                     if (MOD__CTRL_ONLY) {
-                    
-                        /* this code sends a delete_event to the dialog, 
-                         * instead of just destroying it, so that the 
-                         * dialog can do some housekeeping, such as remember 
+
+                        /* this code sends a delete_event to the dialog,
+                         * instead of just destroying it, so that the
+                         * dialog can do some housekeeping, such as remember
                          * its position.
                          */
                         GdkEventAny event;
@@ -122,7 +122,7 @@ sp_dialog_event_handler (GtkWindow *win, GdkEvent *event, gpointer data)
                         gtk_main_do_event ((GdkEvent*)&event);
                         g_object_unref (G_OBJECT (event.window));
 
-                        ret = TRUE; 
+                        ret = TRUE;
                     }
                     break;
                 default: // pass keypress to the canvas
@@ -131,15 +131,15 @@ sp_dialog_event_handler (GtkWindow *win, GdkEvent *event, gpointer data)
     default:
         ;
     }
-    
-    return ret; 
-    
+
+    return ret;
+
 }
 
 
 
 /**
- * \brief  Make the argument dialog transient to the currently active document 
+ * \brief  Make the argument dialog transient to the currently active document
            window.
  */
 void
@@ -214,10 +214,10 @@ gboolean
 sp_dialog_hide (GtkObject *object, gpointer data)
 {
     GtkWidget *dlg = (GtkWidget *) data;
-    
+
     if (dlg)
         gtk_widget_hide (dlg);
-    
+
     return TRUE;
 }
 
@@ -230,7 +230,7 @@ sp_dialog_unhide (GtkObject *object, gpointer data)
 
     if (dlg)
         gtk_widget_show (dlg);
-    
+
     return TRUE;
 }
 
diff --git a/src/dialogs/export.cpp b/src/dialogs/export.cpp
index 9f758bf9e..42a084dde 100644
--- a/src/dialogs/export.cpp
+++ b/src/dialogs/export.cpp
@@ -174,12 +174,12 @@ sp_export_dialog_delete ( GtkObject *object, GdkEvent *event, gpointer data )
     \param  sensitive  Whether the spin button is sensitive or not
     \param  cb   Callback for when this spin button is changed (optional)
     \param  dlg  Export dialog the spin button is being placed in
- 
+
 */
 static void
-sp_export_spinbutton_new ( gchar *key, float val, float min, float max, 
+sp_export_spinbutton_new ( gchar *key, float val, float min, float max,
                            float step, float page, GtkWidget *us,
-                           GtkWidget *t, int x, int y, 
+                           GtkWidget *t, int x, int y,
                            const gchar *ll, const gchar *lr,
                            int digits, unsigned int sensitive,
                            GCallback cb, GtkWidget *dlg )
@@ -187,29 +187,29 @@ sp_export_spinbutton_new ( gchar *key, float val, float min, float max,
     GtkObject *a = gtk_adjustment_new (val, min, max, step, page, page);
     gtk_object_set_data (a, "key", key);
     gtk_object_set_data (GTK_OBJECT (dlg), (const gchar *)key, a);
-    
+
     if (us) {
-        sp_unit_selector_add_adjustment ( SP_UNIT_SELECTOR (us), 
+        sp_unit_selector_add_adjustment ( SP_UNIT_SELECTOR (us),
                                           GTK_ADJUSTMENT (a) );
     }
-    
+
     int pos = 0;
 
     GtkWidget *l = NULL;
 
     if (ll) {
-    
+
         l = gtk_label_new_with_mnemonic ((const gchar *)ll);
         gtk_misc_set_alignment (GTK_MISC (l), 1.0, 0.5);
-        gtk_table_attach ( GTK_TABLE (t), l, x + pos, x + pos + 1, y, y + 1, 
+        gtk_table_attach ( GTK_TABLE (t), l, x + pos, x + pos + 1, y, y + 1,
                            (GtkAttachOptions)0, (GtkAttachOptions)0, 0, 0 );
         gtk_widget_set_sensitive (l, sensitive);
         pos += 1;
-    
+
     }
 
     GtkWidget *sb = gtk_spin_button_new (GTK_ADJUSTMENT (a), 1.0, digits);
-    gtk_table_attach ( GTK_TABLE (t), sb, x + pos, x + pos + 1, y, y + 1, 
+    gtk_table_attach ( GTK_TABLE (t), sb, x + pos, x + pos + 1, y, y + 1,
                        (GtkAttachOptions)0, (GtkAttachOptions)0, 0, 0 );
     gtk_widget_set_size_request (sb, 80, -1);
     gtk_widget_set_sensitive (sb, sensitive);
@@ -218,10 +218,10 @@ sp_export_spinbutton_new ( gchar *key, float val, float min, float max,
     if (ll) { gtk_label_set_mnemonic_widget (GTK_LABEL(l), sb); }
 
     if (lr) {
-    
+
         l = gtk_label_new_with_mnemonic ((const gchar *)lr);
         gtk_misc_set_alignment (GTK_MISC (l), 0.0, 0.5);
-        gtk_table_attach ( GTK_TABLE (t), l, x + pos, x + pos + 1, y, y + 1, 
+        gtk_table_attach ( GTK_TABLE (t), l, x + pos, x + pos + 1, y, y + 1,
                            (GtkAttachOptions)0, (GtkAttachOptions)0, 0, 0 );
         gtk_widget_set_sensitive (l, sensitive);
         pos += 1;
@@ -229,7 +229,7 @@ sp_export_spinbutton_new ( gchar *key, float val, float min, float max,
         gtk_label_set_mnemonic_widget (GTK_LABEL(l), sb);
     }
 
-    if (cb) 
+    if (cb)
         gtk_signal_connect (a, "value_changed", cb, dlg);
 
     return;
@@ -334,53 +334,53 @@ sp_export_dialog (void)
         sp_ui_dialog_title_string (Inkscape::Verb::get(SP_VERB_FILE_EXPORT), title);
 
         dlg = sp_window_new (title, TRUE);
-        
+
         if (x == -1000 || y == -1000) {
             x = prefs_get_int_attribute (prefs_path, "x", 0);
             y = prefs_get_int_attribute (prefs_path, "y", 0);
         }
-        
+
         if (w ==0 || h == 0) {
             w = prefs_get_int_attribute (prefs_path, "w", 0);
             h = prefs_get_int_attribute (prefs_path, "h", 0);
         }
-        
+
         if (x != 0 || y != 0) {
             gtk_window_move ((GtkWindow *) dlg, x, y);
         } else {
             gtk_window_set_position(GTK_WINDOW(dlg), GTK_WIN_POS_CENTER);
         }
-        
-        if (w && h) 
+
+        if (w && h)
             gtk_window_resize ((GtkWindow *) dlg, w, h);
-        
+
         sp_transientize (dlg);
         wd.win = dlg;
         wd.stop = 0;
-        
-        g_signal_connect   ( G_OBJECT (INKSCAPE), "activate_desktop", 
+
+        g_signal_connect   ( G_OBJECT (INKSCAPE), "activate_desktop",
                              G_CALLBACK (sp_transientize_callback), &wd);
-                            
-        gtk_signal_connect ( GTK_OBJECT (dlg), "event", 
+
+        gtk_signal_connect ( GTK_OBJECT (dlg), "event",
                              GTK_SIGNAL_FUNC (sp_dialog_event_handler), dlg);
-                             
-        gtk_signal_connect ( GTK_OBJECT (dlg), "destroy", 
+
+        gtk_signal_connect ( GTK_OBJECT (dlg), "destroy",
                              G_CALLBACK (sp_export_dialog_destroy), dlg);
-                             
-        gtk_signal_connect ( GTK_OBJECT (dlg), "delete_event", 
+
+        gtk_signal_connect ( GTK_OBJECT (dlg), "delete_event",
                              G_CALLBACK (sp_export_dialog_delete), dlg);
-                             
-        g_signal_connect   ( G_OBJECT (INKSCAPE), "shut_down", 
+
+        g_signal_connect   ( G_OBJECT (INKSCAPE), "shut_down",
                              G_CALLBACK (sp_export_dialog_delete), dlg);
-                             
-        g_signal_connect   ( G_OBJECT (INKSCAPE), "dialogs_hide", 
+
+        g_signal_connect   ( G_OBJECT (INKSCAPE), "dialogs_hide",
                              G_CALLBACK (sp_dialog_hide), dlg);
-                             
-        g_signal_connect   ( G_OBJECT (INKSCAPE), "dialogs_unhide", 
+
+        g_signal_connect   ( G_OBJECT (INKSCAPE), "dialogs_unhide",
                              G_CALLBACK (sp_dialog_unhide), dlg);
 
         GtkTooltips *tt = gtk_tooltips_new();
-                             
+
         vb = gtk_vbox_new (FALSE, 4);
         gtk_container_set_border_width (GTK_CONTAINER (vb), 0);
         gtk_container_add (GTK_CONTAINER (dlg), vb);
@@ -442,7 +442,7 @@ sp_export_dialog (void)
             GtkWidget *fe = gtk_entry_new ();
 
             /*
-             * set the default filename to be that of the current path + document 
+             * set the default filename to be that of the current path + document
              * with .png extension
              *
              * One thing to notice here is that this filename may get
@@ -487,13 +487,13 @@ sp_export_dialog (void)
                     name = g_strconcat(uri, ".png", NULL);
                     gtk_entry_set_text (GTK_ENTRY (fe), name);
                     g_free(name);
-                } 
+                }
 
                 doc_export_name = g_strdup(gtk_entry_get_text(GTK_ENTRY(fe)));
             }
-            g_signal_connect ( G_OBJECT (fe), "changed", 
+            g_signal_connect ( G_OBJECT (fe), "changed",
                                G_CALLBACK (sp_export_filename_modified), dlg);
-        
+
             hb = gtk_hbox_new (FALSE, 5);
             gtk_container_add (GTK_CONTAINER (frame), hb);
             gtk_container_set_border_width (GTK_CONTAINER (hb), 4);
@@ -501,7 +501,7 @@ sp_export_dialog (void)
             {
                 GtkWidget *b = gtk_button_new_with_mnemonic (_("_Browse..."));
                 gtk_box_pack_end (GTK_BOX (hb), b, FALSE, FALSE, 4);
-                g_signal_connect ( G_OBJECT (b), "clicked", 
+                g_signal_connect ( G_OBJECT (b), "clicked",
                                    G_CALLBACK (sp_export_browse_clicked), NULL );
             }
 
@@ -510,7 +510,7 @@ sp_export_dialog (void)
             gtk_object_set_data (GTK_OBJECT (dlg), "filename-modified", (gpointer)FALSE);
             original_name = g_strdup(gtk_entry_get_text (GTK_ENTRY (fe)));
             // pressing enter in the filename field is the same as clicking export:
-            g_signal_connect ( G_OBJECT (fe), "activate", 
+            g_signal_connect ( G_OBJECT (fe), "activate",
                                G_CALLBACK (sp_export_export_clicked), dlg );
             // focus is in the filename initially:
             gtk_widget_grab_focus (GTK_WIDGET (fe));
@@ -529,19 +529,19 @@ sp_export_dialog (void)
             gtk_label_set_markup_with_mnemonic (GTK_LABEL(l), _(" <b>_Export</b> "));
             gtk_container_add (GTK_CONTAINER(b), l);
             gtk_tooltips_set_tip (tt, b, _("Export the bitmap file with these settings"), NULL);
-            gtk_signal_connect ( GTK_OBJECT (b), "clicked", 
+            gtk_signal_connect ( GTK_OBJECT (b), "clicked",
                                  GTK_SIGNAL_FUNC (sp_export_export_clicked), dlg );
             gtk_box_pack_end (GTK_BOX (hb), b, FALSE, FALSE, 0);
         }
 
         gtk_widget_show_all (vb);
-  
+
     } // end of if (!dlg)
 
     sp_export_find_default_selection(dlg);
 
     gtk_window_present ((GtkWindow *) dlg);
-    
+
     return;
 } // end of sp_export_dialog()
 
@@ -560,7 +560,7 @@ sp_export_find_default_selection(GtkWidget * dlg)
         int i = SELECTION_NUMBER_OF;
 
         what = prefs_get_string_attribute ("dialogs.export.exportarea", "value");
-        
+
         if (what != NULL) {
             for (i = 0; i < SELECTION_NUMBER_OF; i++) {
                 if (!strcmp (what, selection_names[i])) {
@@ -600,8 +600,8 @@ sp_export_selection_changed ( Inkscape::Application *inkscape,
     if ((current_key == SELECTION_DRAWING || current_key == SELECTION_PAGE) &&
             (SP_DT_SELECTION(SP_ACTIVE_DESKTOP))->isEmpty() == false &&
             was_empty) {
-        gtk_toggle_button_set_active 
-            ( GTK_TOGGLE_BUTTON ( gtk_object_get_data (base, selection_names[SELECTION_SELECTION])), 
+        gtk_toggle_button_set_active
+            ( GTK_TOGGLE_BUTTON ( gtk_object_get_data (base, selection_names[SELECTION_SELECTION])),
               TRUE );
     }
     was_empty = (SP_DT_SELECTION(SP_ACTIVE_DESKTOP))->isEmpty();
@@ -637,7 +637,7 @@ sp_export_selection_modified ( Inkscape::Application *inkscape,
                 doc = SP_DT_DOCUMENT (SP_ACTIVE_DESKTOP);
                 sp_item_bbox_desktop (SP_ITEM (SP_DOCUMENT_ROOT (doc)), &bbox);
 
-                if (!(bbox.x0 > bbox.x1 && bbox.y0 > bbox.y1)) { 
+                if (!(bbox.x0 > bbox.x1 && bbox.y0 > bbox.y1)) {
                     sp_export_set_area (base, bbox.x0, bbox.y0, bbox.x1, bbox.y1);
                 }
             }
@@ -684,8 +684,8 @@ sp_export_area_toggled (GtkToggleButton *tb, GtkObject *base)
     gtk_object_set_data(GTK_OBJECT(base), "selection-type", (gpointer)key);
 
     if (old_key != key) {
-        gtk_toggle_button_set_active 
-            ( GTK_TOGGLE_BUTTON ( gtk_object_get_data (base, selection_names[old_key])), 
+        gtk_toggle_button_set_active
+            ( GTK_TOGGLE_BUTTON ( gtk_object_get_data (base, selection_names[old_key])),
               FALSE );
     }
 
@@ -694,7 +694,7 @@ sp_export_area_toggled (GtkToggleButton *tb, GtkObject *base)
         SPDocument *doc;
         NRRect bbox;
         doc = SP_DT_DOCUMENT (SP_ACTIVE_DESKTOP);
-        
+
         /* Notice how the switch is used to 'fall through' here to get
            various backups.  If you modify this without noticing you'll
            probabaly screw something up. */
@@ -849,7 +849,7 @@ sp_export_area_toggled (GtkToggleButton *tb, GtkObject *base)
                             // std::cout << "Directory from dialog" << std::endl;
                             directory = g_dirname(file_entry_text);
                         }
-                        
+
                         if (directory == NULL) {
                             /* Grab document directory */
                             if (SP_DOCUMENT_URI(SP_ACTIVE_DOCUMENT)) {
@@ -892,7 +892,7 @@ sp_export_area_toggled (GtkToggleButton *tb, GtkObject *base)
             sp_export_value_set(base, "ydpi", ydpi);
         }
     }
-   
+
     return;
 } // end of sp_export_area_toggled()
 
@@ -917,23 +917,23 @@ sp_export_progress_callback (float value, void *data)
 {
     GtkWidget *prg;
     int evtcount;
-    
-    if (g_object_get_data ((GObject *) data, "cancel")) 
+
+    if (g_object_get_data ((GObject *) data, "cancel"))
         return FALSE;
-    
+
     prg = (GtkWidget *) g_object_get_data ((GObject *) data, "progress");
     gtk_progress_bar_set_fraction ((GtkProgressBar *) prg, value);
-    
+
     evtcount = 0;
     while ((evtcount < 16) && gdk_events_pending ()) {
             gtk_main_iteration_do (FALSE);
             evtcount += 1;
     }
-    
+
     gtk_main_iteration_do (FALSE);
 
     return TRUE;
-    
+
 } // end of sp_export_progress_callback()
 
 /// Called when export button is clicked
@@ -1023,7 +1023,7 @@ sp_export_export_clicked (GtkButton *button, GtkObject *base)
         g_free(safeFile);
         g_free(error);
     }
-            
+
     /* Reset the filename so that it can be changed again by changing
        selections and all that */
     g_free(original_name);
@@ -1060,7 +1060,7 @@ sp_export_export_clicked (GtkButton *button, GtkObject *base)
                 sp_repr_set_svg_double(repr, "inkscape:export-ydpi", ydpi);
                 modified = TRUE;
             }
-            
+
             if (modified)
                 repr->setAttribute("sodipodi:modified", "TRUE");
             sp_document_set_undo_sensitive(doc, saved);
@@ -1081,7 +1081,7 @@ sp_export_export_clicked (GtkButton *button, GtkObject *base)
 
                 if (repr->attribute("id") == NULL ||
                         !(g_strrstr(filename, repr->attribute("id")) != NULL &&
-                          (!SP_DOCUMENT_URI(SP_ACTIVE_DOCUMENT) || 
+                          (!SP_DOCUMENT_URI(SP_ACTIVE_DOCUMENT) ||
                             strcmp(g_dirname(filename), g_dirname(SP_DOCUMENT_URI(SP_ACTIVE_DOCUMENT))) == 0))) {
                     temp_string = repr->attribute("inkscape:export-filename");
                     if (temp_string == NULL || strcmp(temp_string, filename)) {
@@ -1113,7 +1113,7 @@ sp_export_export_clicked (GtkButton *button, GtkObject *base)
             break;
     }
 
-    
+
     return;
 } // end of sp_export_export_clicked()
 
@@ -1149,14 +1149,14 @@ sp_export_browse_clicked (GtkButton *button, gpointer userdata)
                                G_CALLBACK (gtk_widget_destroy),
                                (gpointer) fs );
 
-    g_signal_connect_swapped ( GTK_OBJECT 
+    g_signal_connect_swapped ( GTK_OBJECT
                                    (GTK_FILE_SELECTION (fs)->cancel_button),
                                "clicked",
                                G_CALLBACK (gtk_widget_destroy),
                                (gpointer) fs );
 
     gtk_widget_show (fs);
-    
+
     return;
 } // end of sp_export_browse_clicked()
 
@@ -1213,7 +1213,7 @@ sp_export_bbox_equal(NR::Rect const &one, NR::Rect const &two)
     that, so for this to work for them - it needs to check on that level
     of accuracy.
 
-    \todo finish writing this up 
+    \todo finish writing this up
 */
 static void
 sp_export_detect_size(GtkObject * base) {
@@ -1307,13 +1307,13 @@ sp_export_area_x_value_changed (GtkAdjustment *adj, GtkObject *base)
 
     if (gtk_object_get_data (base, "update"))
         return;
-        
-    if (sp_unit_selector_update_test ((SPUnitSelector *)gtk_object_get_data 
-            (base, "units"))) 
+
+    if (sp_unit_selector_update_test ((SPUnitSelector *)gtk_object_get_data
+            (base, "units")))
     {
         return;
     }
-    
+
     gtk_object_set_data ( base, "update", GUINT_TO_POINTER (TRUE) );
 
     x0 = sp_export_value_get_px (base, "x0");
@@ -1326,7 +1326,7 @@ sp_export_area_x_value_changed (GtkAdjustment *adj, GtkObject *base)
         const gchar *key;
         width = SP_EXPORT_MIN_SIZE;
         key = (const gchar *)gtk_object_get_data (GTK_OBJECT (adj), "key");
-        
+
         if (!strcmp (key, "x0")) {
             x1 = x0 + width * DPI_BASE / xdpi;
             sp_export_value_set_px (base, "x1", x1);
@@ -1354,13 +1354,13 @@ sp_export_area_y_value_changed (GtkAdjustment *adj, GtkObject *base)
 
     if (gtk_object_get_data (base, "update"))
         return;
-    
-    if (sp_unit_selector_update_test ((SPUnitSelector *)gtk_object_get_data 
-           (base, "units"))) 
+
+    if (sp_unit_selector_update_test ((SPUnitSelector *)gtk_object_get_data
+           (base, "units")))
     {
         return;
     }
-       
+
     gtk_object_set_data (base, "update", GUINT_TO_POINTER (TRUE));
 
     y0 = sp_export_value_get_px (base, "y0");
@@ -1388,7 +1388,7 @@ sp_export_area_y_value_changed (GtkAdjustment *adj, GtkObject *base)
     sp_export_detect_size(base);
 
     gtk_object_set_data (base, "update", GUINT_TO_POINTER (FALSE));
-    
+
     return;
 } // end of sp_export_area_y_value_changed()
 
@@ -1398,14 +1398,14 @@ sp_export_area_width_value_changed (GtkAdjustment *adj, GtkObject *base)
 {
     float x0, x1, xdpi, width, bmwidth;
 
-    if (gtk_object_get_data (base, "update")) 
+    if (gtk_object_get_data (base, "update"))
         return;
-    
-    if (sp_unit_selector_update_test ((SPUnitSelector *)gtk_object_get_data 
+
+    if (sp_unit_selector_update_test ((SPUnitSelector *)gtk_object_get_data
            (base, "units"))) {
         return;
     }
-    
+
     gtk_object_set_data (base, "update", GUINT_TO_POINTER (TRUE));
 
     x0 = sp_export_value_get_px (base, "x0");
@@ -1415,7 +1415,7 @@ sp_export_area_width_value_changed (GtkAdjustment *adj, GtkObject *base)
     bmwidth = floor (width * xdpi / DPI_BASE + 0.5);
 
     if (bmwidth < SP_EXPORT_MIN_SIZE) {
-    
+
         bmwidth = SP_EXPORT_MIN_SIZE;
         width = bmwidth * DPI_BASE / xdpi;
         sp_export_value_set_px (base, "width", width);
@@ -1438,12 +1438,12 @@ sp_export_area_height_value_changed (GtkAdjustment *adj, GtkObject *base)
 
     if (gtk_object_get_data (base, "update"))
         return;
-    
-    if (sp_unit_selector_update_test ((SPUnitSelector *)gtk_object_get_data 
+
+    if (sp_unit_selector_update_test ((SPUnitSelector *)gtk_object_get_data
            (base, "units"))) {
         return;
     }
-    
+
     gtk_object_set_data (base, "update", GUINT_TO_POINTER (TRUE));
 
     y0 = sp_export_value_get_px (base, "y0");
@@ -1462,7 +1462,7 @@ sp_export_area_height_value_changed (GtkAdjustment *adj, GtkObject *base)
     sp_export_value_set (base, "bmheight", bmheight);
 
     gtk_object_set_data (base, "update", GUINT_TO_POINTER (FALSE));
-    
+
     return;
 } // end of sp_export_area_height_value_changed()
 
@@ -1495,14 +1495,14 @@ sp_export_bitmap_width_value_changed (GtkAdjustment *adj, GtkObject *base)
 {
     float x0, x1, bmwidth, xdpi;
 
-    if (gtk_object_get_data (base, "update")) 
+    if (gtk_object_get_data (base, "update"))
         return;
-        
-    if (sp_unit_selector_update_test ((SPUnitSelector *)gtk_object_get_data 
+
+    if (sp_unit_selector_update_test ((SPUnitSelector *)gtk_object_get_data
            (base, "units"))) {
        return;
     }
-    
+
     gtk_object_set_data (base, "update", GUINT_TO_POINTER (TRUE));
 
     x0 = sp_export_value_get_px (base, "x0");
@@ -1535,7 +1535,7 @@ sp_export_bitmap_width_value_changed (GtkAdjustment *adj, GtkObject *base)
     units change, we also assume that everyone is being updated appropriately
     and there is nothing for us to do.
 
-    If we're the highest level function, we set the update flag, and 
+    If we're the highest level function, we set the update flag, and
     continue on our way.
 
     All of the values are grabbed using the \c sp_export_value_get functions
@@ -1557,14 +1557,14 @@ sp_export_xdpi_value_changed (GtkAdjustment *adj, GtkObject *base)
 {
     float x0, x1, xdpi, bmwidth;
 
-    if (gtk_object_get_data (base, "update")) 
+    if (gtk_object_get_data (base, "update"))
         return;
-    
-    if (sp_unit_selector_update_test ((SPUnitSelector *)gtk_object_get_data 
+
+    if (sp_unit_selector_update_test ((SPUnitSelector *)gtk_object_get_data
            (base, "units"))) {
        return;
     }
-    
+
     gtk_object_set_data (base, "update", GUINT_TO_POINTER (TRUE));
 
     x0 = sp_export_value_get_px (base, "x0");
@@ -1578,9 +1578,9 @@ sp_export_xdpi_value_changed (GtkAdjustment *adj, GtkObject *base)
 
     if (bmwidth < SP_EXPORT_MIN_SIZE) {
         bmwidth = SP_EXPORT_MIN_SIZE;
-        if (x1 != x0) 
+        if (x1 != x0)
             xdpi = bmwidth * DPI_BASE / (x1 - x0);
-        else 
+        else
             xdpi = DPI_BASE;
         sp_export_value_set (base, "xdpi", xdpi);
     }
diff --git a/src/dialogs/fill-style.cpp b/src/dialogs/fill-style.cpp
index 1c151deeb..2aaf6e6c2 100644
--- a/src/dialogs/fill-style.cpp
+++ b/src/dialogs/fill-style.cpp
@@ -130,7 +130,7 @@ sp_fill_style_widget_construct ( SPWidget *spw, SPPaintSelector *psel )
 
         sp_fill_style_widget_update (spw);
 
-    } 
+    }
 
 } // end of sp_fill_style_widget_construct()
 
@@ -149,7 +149,7 @@ sp_fill_style_widget_modify_selection ( SPWidget *spw,
 }
 
 static void
-sp_fill_style_widget_change_subselection ( Inkscape::Application *inkscape, 
+sp_fill_style_widget_change_subselection ( Inkscape::Application *inkscape,
                                         SPDesktop *desktop,
                                         SPWidget *spw )
 {
@@ -398,7 +398,7 @@ sp_fill_style_widget_paint_changed ( SPPaintSelector *psel,
             // on release, toggle undo_label so that the next drag will not be lumped with this one
             if (undo_label == undo_label_1)
                 undo_label = undo_label_2;
-            else 
+            else
                 undo_label = undo_label_1;
 
             break;
diff --git a/src/dialogs/item-properties.cpp b/src/dialogs/item-properties.cpp
index a8031b13e..7a9b37dcf 100644
--- a/src/dialogs/item-properties.cpp
+++ b/src/dialogs/item-properties.cpp
@@ -46,7 +46,7 @@ static GtkWidget *dlg = NULL;
 static win_data wd;
 
 // impossible original values to make sure they are read from prefs
-static gint x = -1000, y = -1000, w = 0, h = 0; 
+static gint x = -1000, y = -1000, w = 0, h = 0;
 static gchar *prefs_path = "dialogs.object";
 
 static void sp_item_widget_modify_selection (SPWidget *spw, Inkscape::Selection *selection, guint flags, GtkWidget *itemw);
@@ -94,11 +94,11 @@ sp_item_widget_new (void)
 
     /* Create container widget */
     spw = sp_widget_new_global (INKSCAPE);
-    gtk_signal_connect ( GTK_OBJECT (spw), "modify_selection", 
-                         GTK_SIGNAL_FUNC (sp_item_widget_modify_selection), 
+    gtk_signal_connect ( GTK_OBJECT (spw), "modify_selection",
+                         GTK_SIGNAL_FUNC (sp_item_widget_modify_selection),
                          spw );
-    gtk_signal_connect ( GTK_OBJECT (spw), "change_selection", 
-                         GTK_SIGNAL_FUNC (sp_item_widget_change_selection), 
+    gtk_signal_connect ( GTK_OBJECT (spw), "change_selection",
+                         GTK_SIGNAL_FUNC (sp_item_widget_change_selection),
                          spw );
 
     vb = gtk_vbox_new (FALSE, 0);
@@ -114,8 +114,8 @@ sp_item_widget_new (void)
     /* Create the label for the object id */
     l = gtk_label_new_with_mnemonic (_("_Id"));
     gtk_misc_set_alignment (GTK_MISC (l), 1, 0.5);
-    gtk_table_attach ( GTK_TABLE (t), l, 0, 1, 0, 1, 
-                       (GtkAttachOptions)( GTK_SHRINK | GTK_FILL ), 
+    gtk_table_attach ( GTK_TABLE (t), l, 0, 1, 0, 1,
+                       (GtkAttachOptions)( GTK_SHRINK | GTK_FILL ),
                        (GtkAttachOptions)0, 0, 0 );
     gtk_object_set_data (GTK_OBJECT (spw), "id_label", l);
 
@@ -123,8 +123,8 @@ sp_item_widget_new (void)
     tf = gtk_entry_new ();
     gtk_tooltips_set_tip (tt, tf, _("The id= attribute (only letters, digits, and the characters .-_: allowed)"), NULL);
     gtk_entry_set_max_length (GTK_ENTRY (tf), 64);
-    gtk_table_attach ( GTK_TABLE (t), tf, 1, 2, 0, 1, 
-                       (GtkAttachOptions)( GTK_EXPAND | GTK_FILL ), 
+    gtk_table_attach ( GTK_TABLE (t), tf, 1, 2, 0, 1,
+                       (GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),
                        (GtkAttachOptions)0, 0, 0 );
     gtk_object_set_data (GTK_OBJECT (spw), "id", tf);
     gtk_label_set_mnemonic_widget (GTK_LABEL(l), tf);
@@ -136,18 +136,18 @@ sp_item_widget_new (void)
 
     /* Button for setting the object's id, label, title and description. */
     pb = gtk_button_new_with_mnemonic (_("_Set"));
-    gtk_table_attach ( GTK_TABLE (t), pb, 2, 3, 0, 1, 
-                       (GtkAttachOptions)( GTK_SHRINK | GTK_FILL ), 
+    gtk_table_attach ( GTK_TABLE (t), pb, 2, 3, 0, 1,
+                       (GtkAttachOptions)( GTK_SHRINK | GTK_FILL ),
                        (GtkAttachOptions)0, 0, 0 );
-    gtk_signal_connect ( GTK_OBJECT (pb), "clicked", 
-                         GTK_SIGNAL_FUNC (sp_item_widget_label_changed), 
+    gtk_signal_connect ( GTK_OBJECT (pb), "clicked",
+                         GTK_SIGNAL_FUNC (sp_item_widget_label_changed),
                          spw );
 
     /* Create the label for the object label */
     l = gtk_label_new_with_mnemonic (_("_Label"));
     gtk_misc_set_alignment (GTK_MISC (l), 1, 0.5);
-    gtk_table_attach ( GTK_TABLE (t), l, 0, 1, 1, 2, 
-                       (GtkAttachOptions)( GTK_SHRINK | GTK_FILL ), 
+    gtk_table_attach ( GTK_TABLE (t), l, 0, 1, 1, 2,
+                       (GtkAttachOptions)( GTK_SHRINK | GTK_FILL ),
                        (GtkAttachOptions)0, 0, 0 );
     gtk_object_set_data (GTK_OBJECT (spw), "label_label", l);
 
@@ -155,8 +155,8 @@ sp_item_widget_new (void)
     tf = gtk_entry_new ();
     gtk_tooltips_set_tip (tt, tf, _("A freeform label for the object"), NULL);
     gtk_entry_set_max_length (GTK_ENTRY (tf), 256);
-    gtk_table_attach ( GTK_TABLE (t), tf, 1, 2, 1, 2, 
-                       (GtkAttachOptions)( GTK_EXPAND | GTK_FILL ), 
+    gtk_table_attach ( GTK_TABLE (t), tf, 1, 2, 1, 2,
+                       (GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),
                        (GtkAttachOptions)0, 0, 0 );
     gtk_object_set_data (GTK_OBJECT (spw), "label", tf);
     gtk_label_set_mnemonic_widget (GTK_LABEL(l), tf);
@@ -167,8 +167,8 @@ sp_item_widget_new (void)
     /* Create the label for the object title */
     l = gtk_label_new (_("Title"));
     gtk_misc_set_alignment (GTK_MISC (l), 1, 0.5);
-    gtk_table_attach ( GTK_TABLE (t), l, 0, 1, 2, 3, 
-                       (GtkAttachOptions)( GTK_SHRINK | GTK_FILL ), 
+    gtk_table_attach ( GTK_TABLE (t), l, 0, 1, 2, 3,
+                       (GtkAttachOptions)( GTK_SHRINK | GTK_FILL ),
                        (GtkAttachOptions)0, 0, 0 );
     gtk_object_set_data (GTK_OBJECT (spw), "title_label", l);
 
@@ -176,15 +176,15 @@ sp_item_widget_new (void)
     tf = gtk_entry_new ();
     gtk_widget_set_sensitive (GTK_WIDGET (tf), FALSE);
     gtk_entry_set_max_length (GTK_ENTRY (tf), 256);
-    gtk_table_attach ( GTK_TABLE (t), tf, 1, 3, 2, 3, 
-                       (GtkAttachOptions)( GTK_EXPAND | GTK_FILL ), 
+    gtk_table_attach ( GTK_TABLE (t), tf, 1, 3, 2, 3,
+                       (GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),
                        (GtkAttachOptions)0, 0, 0 );
     gtk_object_set_data (GTK_OBJECT (spw), "title", tf);
 
     /* Create the frame for the object description */
     f = gtk_frame_new (_("Description"));
-    gtk_table_attach ( GTK_TABLE (t), f, 0, 3, 3, 4, 
-                       (GtkAttachOptions)( GTK_EXPAND | GTK_FILL ), 
+    gtk_table_attach ( GTK_TABLE (t), f, 0, 3, 3, 4,
+                       (GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),
                        (GtkAttachOptions)( GTK_EXPAND | GTK_FILL ), 0, 0 );
     gtk_object_set_data (GTK_OBJECT (spw), "desc_frame", l);
 
@@ -211,8 +211,8 @@ sp_item_widget_new (void)
     /* Hide */
     cb = gtk_check_button_new_with_mnemonic (_("_Hide"));
     gtk_tooltips_set_tip (tt, cb, _("Check to make the object invisible"), NULL);
-    gtk_table_attach ( GTK_TABLE (t), cb, 0, 1, 0, 1, 
-                       (GtkAttachOptions)( GTK_EXPAND | GTK_FILL ), 
+    gtk_table_attach ( GTK_TABLE (t), cb, 0, 1, 0, 1,
+                       (GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),
                        (GtkAttachOptions)0, 0, 0 );
     g_signal_connect (G_OBJECT(cb), "toggled", G_CALLBACK(sp_item_widget_hidden_toggled), spw);
     gtk_object_set_data(GTK_OBJECT(spw), "hidden", cb);
@@ -221,11 +221,11 @@ sp_item_widget_new (void)
     // TRANSLATORS: "Lock" is a verb here
     cb = gtk_check_button_new_with_mnemonic (_("L_ock"));
     gtk_tooltips_set_tip (tt, cb, _("Check to make the object insensitive (not selectable by mouse)"), NULL);
-    gtk_table_attach ( GTK_TABLE (t), cb, 1, 2, 0, 1, 
-                       (GtkAttachOptions)( GTK_EXPAND | GTK_FILL ), 
+    gtk_table_attach ( GTK_TABLE (t), cb, 1, 2, 0, 1,
+                       (GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),
                        (GtkAttachOptions)0, 0, 0 );
-    gtk_signal_connect ( GTK_OBJECT (cb), "toggled", 
-                         GTK_SIGNAL_FUNC (sp_item_widget_sensitivity_toggled), 
+    gtk_signal_connect ( GTK_OBJECT (cb), "toggled",
+                         GTK_SIGNAL_FUNC (sp_item_widget_sensitivity_toggled),
                          spw );
     gtk_object_set_data (GTK_OBJECT (spw), "sensitive", cb);
 
@@ -234,15 +234,15 @@ sp_item_widget_new (void)
     sp_item_widget_setup (SP_WIDGET (spw), SP_DT_SELECTION (SP_ACTIVE_DESKTOP));
 
     return (GtkWidget *) spw;
-    
+
 } //end of sp_item_widget_new()
 
 
 
 static void
-sp_item_widget_modify_selection ( SPWidget *spw, 
-                                  Inkscape::Selection *selection, 
-                                  guint flags, 
+sp_item_widget_modify_selection ( SPWidget *spw,
+                                  Inkscape::Selection *selection,
+                                  guint flags,
                                   GtkWidget *itemw )
 {
     sp_item_widget_setup (spw, selection);
@@ -251,8 +251,8 @@ sp_item_widget_modify_selection ( SPWidget *spw,
 
 
 static void
-sp_item_widget_change_selection ( SPWidget *spw, 
-                                  Inkscape::Selection *selection, 
+sp_item_widget_change_selection ( SPWidget *spw,
+                                  Inkscape::Selection *selection,
                                   GtkWidget *itemw )
 {
     sp_item_widget_setup (spw, selection);
@@ -276,7 +276,7 @@ sp_item_widget_setup ( SPWidget *spw, Inkscape::Selection *selection )
     } else {
         gtk_widget_set_sensitive (GTK_WIDGET (spw), TRUE);
     }
-    
+
     gtk_object_set_data (GTK_OBJECT (spw), "blocked", GUINT_TO_POINTER (TRUE));
 
     SPItem *item = selection->singleItem();
@@ -290,21 +290,21 @@ sp_item_widget_setup ( SPWidget *spw, Inkscape::Selection *selection )
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), item->isExplicitlyHidden());
 
     if (SP_OBJECT_IS_CLONED (item)) {
-    
+
         /* ID */
         w = GTK_WIDGET(gtk_object_get_data (GTK_OBJECT (spw), "id"));
         gtk_entry_set_text (GTK_ENTRY (w), "");
         gtk_widget_set_sensitive (w, FALSE);
         w = GTK_WIDGET(gtk_object_get_data (GTK_OBJECT (spw), "id_label"));
         gtk_label_set_text (GTK_LABEL (w), _("Ref"));
-    
+
         /* Label */
         w = GTK_WIDGET(gtk_object_get_data (GTK_OBJECT (spw), "label"));
         gtk_entry_set_text (GTK_ENTRY (w), "");
         gtk_widget_set_sensitive (w, FALSE);
         w = GTK_WIDGET(gtk_object_get_data (GTK_OBJECT (spw), "label_label"));
         gtk_label_set_text (GTK_LABEL (w), _("Ref"));
-    
+
     } else {
         SPObject *obj = (SPObject*)item;
 
@@ -323,8 +323,8 @@ sp_item_widget_setup ( SPWidget *spw, Inkscape::Selection *selection )
     }
 
     gtk_object_set_data (GTK_OBJECT (spw), "blocked", GUINT_TO_POINTER (FALSE));
-    
-    
+
+
 } // end of sp_item_widget_setup()
 
 
@@ -368,7 +368,7 @@ sp_item_widget_hidden_toggled(GtkWidget *widget, SPWidget *spw)
 static void
 sp_item_widget_label_changed (GtkWidget *widget, SPWidget *spw)
 {
-    if (gtk_object_get_data (GTK_OBJECT (spw), "blocked")) 
+    if (gtk_object_get_data (GTK_OBJECT (spw), "blocked"))
         return;
 
     SPItem *item = SP_DT_SELECTION(SP_ACTIVE_DESKTOP)->singleItem();
@@ -401,7 +401,7 @@ sp_item_widget_label_changed (GtkWidget *widget, SPWidget *spw)
     g_assert(label != NULL);
 
     /* Give feedback on success of setting the drawing object's label
-     * using the widget's label text 
+     * using the widget's label text
      */
     SPObject *obj = (SPObject*)item;
     if (strcmp (label, obj->defaultLabel())) {
@@ -430,7 +430,7 @@ sp_item_widget_label_changed (GtkWidget *widget, SPWidget *spw)
 
 
 /**
- * \brief  Dialog 
+ * \brief  Dialog
  *
  */
 void
@@ -446,26 +446,26 @@ sp_item_dialog (void)
             x = prefs_get_int_attribute (prefs_path, "x", 0);
             y = prefs_get_int_attribute (prefs_path, "y", 0);
         }
-        
+
         if (w ==0 || h == 0) {
             w = prefs_get_int_attribute (prefs_path, "w", 0);
             h = prefs_get_int_attribute (prefs_path, "h", 0);
         }
-        
+
         if (x != 0 || y != 0) {
             gtk_window_move ((GtkWindow *) dlg, x, y);
         } else {
             gtk_window_set_position(GTK_WINDOW(dlg), GTK_WIN_POS_CENTER);
         }
-        
+
         if (w && h) {
             gtk_window_resize ((GtkWindow *) dlg, w, h);
         }
-        
+
         sp_transientize (dlg);
         wd.win = dlg;
         wd.stop = 0;
-        
+
         g_signal_connect   ( G_OBJECT (INKSCAPE), "activate_desktop", G_CALLBACK (sp_transientize_callback), &wd);
         gtk_signal_connect ( GTK_OBJECT (dlg), "event", GTK_SIGNAL_FUNC (sp_dialog_event_handler), dlg);
         gtk_signal_connect ( GTK_OBJECT (dlg), "destroy", G_CALLBACK (sp_item_dialog_destroy), dlg);
@@ -478,11 +478,11 @@ sp_item_dialog (void)
         GtkWidget *itemw = sp_item_widget_new ();
         gtk_widget_show (itemw);
         gtk_container_add (GTK_CONTAINER (dlg), itemw);
-      
+
     }
 
     gtk_window_present ((GtkWindow *) dlg);
-} 
+}
 
 
 /*
diff --git a/src/dialogs/object-attributes.cpp b/src/dialogs/object-attributes.cpp
index 05370d1d0..b62287aff 100644
--- a/src/dialogs/object-attributes.cpp
+++ b/src/dialogs/object-attributes.cpp
@@ -71,8 +71,8 @@ window_destroyed (GtkObject *window, GtkObject *object)
 
 
 static void
-sp_object_attr_show_dialog ( SPObject *object, 
-                             const SPAttrDesc *desc, 
+sp_object_attr_show_dialog ( SPObject *object,
+                             const SPAttrDesc *desc,
                              const gchar *tag )
 {
     const gchar **labels, **attrs;
@@ -99,10 +99,10 @@ sp_object_attr_show_dialog ( SPObject *object,
     gtk_widget_show (t);
     gtk_container_add (GTK_CONTAINER (w), t);
 
-    g_signal_connect ( G_OBJECT (w), "destroy", 
+    g_signal_connect ( G_OBJECT (w), "destroy",
                        G_CALLBACK (window_destroyed), object );
-                       
-    g_signal_connect ( G_OBJECT (object), "release", 
+
+    g_signal_connect ( G_OBJECT (object), "release",
                        G_CALLBACK (object_released), w );
 
     gtk_widget_show (w);
diff --git a/src/dialogs/text-edit.cpp b/src/dialogs/text-edit.cpp
index b4dcd4bce..8de2dedac 100644
--- a/src/dialogs/text-edit.cpp
+++ b/src/dialogs/text-edit.cpp
@@ -78,7 +78,7 @@ static const gchar *spacings[] = {"50%", "80%", "90%", "100%", "110%", "120%", "
 static GtkWidget *dlg = NULL;
 static win_data wd;
 // impossible original values to make sure they are read from prefs
-static gint x = -1000, y = -1000, w = 0, h = 0; 
+static gint x = -1000, y = -1000, w = 0, h = 0;
 static gchar const *prefs_path = "dialogs.textandfont";
 
 
@@ -136,7 +136,7 @@ sp_text_edit_dialog (void)
 {
 
     if (!dlg) {
-    
+
         gchar title[500];
         sp_ui_dialog_title_string (Inkscape::Verb::get(SP_VERB_DIALOG_TEXT), title);
 
@@ -145,32 +145,32 @@ sp_text_edit_dialog (void)
             x = prefs_get_int_attribute (prefs_path, "x", 0);
             y = prefs_get_int_attribute (prefs_path, "y", 0);
         }
-        
+
         if (w ==0 || h == 0) {
             w = prefs_get_int_attribute (prefs_path, "w", 0);
             h = prefs_get_int_attribute (prefs_path, "h", 0);
         }
-        
+
         if (x != 0 || y != 0) {
             gtk_window_move ((GtkWindow *) dlg, x, y);
         } else {
             gtk_window_set_position(GTK_WINDOW(dlg), GTK_WIN_POS_CENTER);
         }
-        
-        if (w && h) 
+
+        if (w && h)
             gtk_window_resize ((GtkWindow *) dlg, w, h);
-        
+
         sp_transientize (dlg);
         wd.win = dlg;
         wd.stop = 0;
         g_signal_connect ( G_OBJECT (INKSCAPE), "activate_desktop", G_CALLBACK (sp_transientize_callback), &wd );
-                           
+
         gtk_signal_connect ( GTK_OBJECT (dlg), "event", GTK_SIGNAL_FUNC (sp_dialog_event_handler), dlg );
-                             
+
         gtk_signal_connect ( GTK_OBJECT (dlg), "destroy", G_CALLBACK (sp_text_edit_dialog_destroy), dlg );
         gtk_signal_connect ( GTK_OBJECT (dlg), "delete_event", G_CALLBACK (sp_text_edit_dialog_delete), dlg );
         g_signal_connect ( G_OBJECT (INKSCAPE), "shut_down", G_CALLBACK (sp_text_edit_dialog_delete), dlg );
-                           
+
         g_signal_connect ( G_OBJECT (INKSCAPE), "dialogs_hide", G_CALLBACK (sp_dialog_hide), dlg );
         g_signal_connect ( G_OBJECT (INKSCAPE), "dialogs_unhide", G_CALLBACK (sp_dialog_unhide), dlg );
 
@@ -325,8 +325,8 @@ sp_text_edit_dialog (void)
                         g_list_free (sl);
                     }
 
-                    g_signal_connect ( (GObject *) ((GtkCombo *) c)->entry, 
-                                       "changed", 
+                    g_signal_connect ( (GObject *) ((GtkCombo *) c)->entry,
+                                       "changed",
                                        (GCallback) sp_text_edit_dialog_line_spacing_changed,
                                        dlg );
                     gtk_box_pack_start (GTK_BOX (row), c, FALSE, FALSE, VB_MARGIN);
@@ -378,7 +378,7 @@ sp_text_edit_dialog (void)
             gtk_text_view_set_editable (GTK_TEXT_VIEW (txt), TRUE);
             gtk_container_add (GTK_CONTAINER (scroller), txt);
             gtk_box_pack_start (GTK_BOX (vb), scroller, TRUE, TRUE, 0);
-            g_signal_connect ( G_OBJECT (tb), "changed", 
+            g_signal_connect ( G_OBJECT (tb), "changed",
                                G_CALLBACK (sp_text_edit_dialog_text_changed), dlg );
             g_signal_connect (G_OBJECT (txt), "focus-in-event", G_CALLBACK (text_view_focus_in), dlg);
             g_signal_connect (G_OBJECT (txt), "focus-out-event", G_CALLBACK (text_view_focus_out), dlg);
@@ -393,8 +393,8 @@ sp_text_edit_dialog (void)
 
         {
             GtkWidget *b = gtk_button_new_with_label (_("Set as default"));
-            g_signal_connect ( G_OBJECT (b), "clicked", 
-                               G_CALLBACK (sp_text_edit_dialog_set_default), 
+            g_signal_connect ( G_OBJECT (b), "clicked",
+                               G_CALLBACK (sp_text_edit_dialog_set_default),
                                dlg );
             gtk_box_pack_start (GTK_BOX (hb), b, FALSE, FALSE, 0);
             g_object_set_data (G_OBJECT (dlg), "default", b);
@@ -481,7 +481,7 @@ sp_text_edit_dialog_update_object_text ( SPItem *text )
             gtk_text_buffer_get_bounds (tb, &start, &end);
             str = gtk_text_buffer_get_text (tb, &start, &end, TRUE);
             sp_te_set_repr_text_multiline (text, str);
-            g_free (str);    
+            g_free (str);
             gtk_text_buffer_set_modified (tb, FALSE);
         }
 }
@@ -538,9 +538,9 @@ sp_get_text_dialog_style ()
                 sp_repr_css_set_property (css, "text-align", "end");
             }
         }
-        
+
         b = (GtkWidget*)g_object_get_data (G_OBJECT (dlg), INKSCAPE_STOCK_WRITING_MODE_LR );
-        
+
         if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (b))) {
             sp_repr_css_set_property (css, "writing-mode", "lr");
         } else {
@@ -591,7 +591,7 @@ sp_text_edit_dialog_apply (GtkButton *button, GtkWidget *dlg)
 
     sp_desktop_set_style(desktop, css, true);
 
-    for (; item_list != NULL; item_list = item_list->next) { 
+    for (; item_list != NULL; item_list = item_list->next) {
         // apply style to the reprs of all text objects in the selection
         if (SP_IS_TEXT (item_list->data)) {
 
@@ -604,8 +604,8 @@ sp_text_edit_dialog_apply (GtkButton *button, GtkWidget *dlg)
             // no need to set sodipodi:linespacing, because Inkscape never supported it on flowtext
             ++items;
     }
-    
-    if (items == 0) { 
+
+    if (items == 0) {
         // no text objects; apply style to prefs for new objects
         sp_repr_css_change (inkscape_get_repr (INKSCAPE, "tools.text"), css, "style");
         gtk_widget_set_sensitive (def, FALSE);
@@ -615,7 +615,7 @@ sp_text_edit_dialog_apply (GtkButton *button, GtkWidget *dlg)
         if (SP_IS_TEXT (item) || SP_IS_FLOWTEXT(item)) {
             sp_text_edit_dialog_update_object_text (item);
         }
-    } 
+    }
 
     // complete the transaction
     sp_document_done (SP_DT_DOCUMENT (SP_ACTIVE_DESKTOP));
@@ -636,13 +636,13 @@ sp_text_edit_dialog_close (GtkButton *button, GtkWidget *dlg)
 }
 
 static void
-sp_text_edit_dialog_read_selection ( GtkWidget *dlg, 
-                                     gboolean dostyle, 
+sp_text_edit_dialog_read_selection ( GtkWidget *dlg,
+                                     gboolean dostyle,
                                      gboolean docontent )
 {
-    if (g_object_get_data (G_OBJECT (dlg), "blocked")) 
+    if (g_object_get_data (G_OBJECT (dlg), "blocked"))
         return;
-    
+
     g_object_set_data (G_OBJECT (dlg), "blocked", GINT_TO_POINTER (TRUE));
 
     GtkWidget *notebook = (GtkWidget*)g_object_get_data (G_OBJECT (dlg), "notebook");
@@ -689,7 +689,7 @@ sp_text_edit_dialog_read_selection ( GtkWidget *dlg,
             }
         } // end of if (docontent)
         repr = SP_OBJECT_REPR (text);
-        
+
     } else {
         gtk_widget_set_sensitive (textw, FALSE);
         gtk_widget_set_sensitive (apply, FALSE);
@@ -767,7 +767,7 @@ sp_text_edit_dialog_text_changed (GtkTextBuffer *tb, GtkWidget *dlg)
     GtkTextIter start, end;
     gchar *str;
 
-    if (g_object_get_data (G_OBJECT (dlg), "blocked")) 
+    if (g_object_get_data (G_OBJECT (dlg), "blocked"))
         return;
 
     SPItem *text = sp_ted_get_selected_text_item ();
@@ -797,13 +797,13 @@ sp_text_edit_dialog_text_changed (GtkTextBuffer *tb, GtkWidget *dlg)
 
 
 static void
-sp_text_edit_dialog_font_changed ( SPFontSelector *fsel, 
-                                   font_instance *font, 
+sp_text_edit_dialog_font_changed ( SPFontSelector *fsel,
+                                   font_instance *font,
                                    GtkWidget *dlg )
 {
     GtkWidget *preview, *apply, *def;
 
-    if (g_object_get_data (G_OBJECT (dlg), "blocked")) 
+    if (g_object_get_data (G_OBJECT (dlg), "blocked"))
         return;
 
     SPItem *text = sp_ted_get_selected_text_item ();
@@ -849,7 +849,7 @@ sp_text_edit_dialog_line_spacing_changed (GtkEditable *editable, GtkWidget *dlg)
 {
     GtkWidget *apply, *def;
 
-    if (g_object_get_data ((GObject *) dlg, "blocked")) 
+    if (g_object_get_data ((GObject *) dlg, "blocked"))
         return;
 
     SPItem *text = sp_ted_get_selected_text_item ();
@@ -887,7 +887,7 @@ sp_ted_get_selected_text_item (void)
 static unsigned
 sp_ted_get_selected_text_count (void)
 {
-    if (!SP_ACTIVE_DESKTOP) 
+    if (!SP_ACTIVE_DESKTOP)
         return 0;
 
     unsigned int items = 0;