Remove trailing whitespaces

43 files changed, 191 insertions, 191 deletions

diff --git a/applets/clock/calendar-window.c b/applets/clock/calendar-window.c
index ed53f060..e230088d 100644
--- a/applets/clock/calendar-window.c
+++ b/applets/clock/calendar-window.c
@@ -206,7 +206,7 @@ create_hig_frame (CalendarWindow *calwin,
 	g_signal_connect (expander, "notify::expanded",
 			  G_CALLBACK (expand_collapse), vbox);
 
-	/* FIXME: this doesn't really work, since "add" does not 
+	/* FIXME: this doesn't really work, since "add" does not
 	 * get emitted for e.g. gtk_box_pack_start
 	 */
 	g_signal_connect (vbox, "add", G_CALLBACK (add_child), expander);
diff --git a/applets/clock/clock-sunpos.c b/applets/clock/clock-sunpos.c
index 69e04343..20a7b619 100644
--- a/applets/clock/clock-sunpos.c
+++ b/applets/clock/clock-sunpos.c
@@ -20,7 +20,7 @@
  *     Jonathan Blandford <[email protected]>
  *     Matthias Clasen <[email protected]>
  */
- 
+
 #include <time.h>
 #include <gtk/gtk.h>
 #include <math.h>
@@ -70,7 +70,7 @@ solve_keplers_equation (gdouble e,
 
   /* start with an initial estimate */
   E = M;
-  
+
   d = E - e * sin (E) - M;
 
   while (ABS (d) > ERROR_ACCURACY)
diff --git a/applets/clock/clock-utils.c b/applets/clock/clock-utils.c
index 19cf74fe..a21c3b86 100644
--- a/applets/clock/clock-utils.c
+++ b/applets/clock/clock-utils.c
@@ -73,7 +73,7 @@ clock_utils_display_help (GtkWidget  *widget,
 	else
 		uri = g_strdup_printf ("help:%s", doc_id);
 
-	gtk_show_uri_on_window (NULL, uri, 
+	gtk_show_uri_on_window (NULL, uri,
 		gtk_get_current_event_time (), &error);
 	g_free (uri);
 
diff --git a/applets/clock/set-timezone.c b/applets/clock/set-timezone.c
index 0df3e24b..109ca2ad 100644
--- a/applets/clock/set-timezone.c
+++ b/applets/clock/set-timezone.c
@@ -223,7 +223,7 @@ set_time_async (SetTimeCallbackData *data)
 				   NULL,
 				   set_time_notify,
 				   data);
-	else 
+	else
 		g_dbus_proxy_call (proxy,
 				   "SetTimezone",
 				   g_variant_new ("(s)", data->filename),
diff --git a/applets/clock/system-timezone.c b/applets/clock/system-timezone.c
index d3745e3d..6aa1c5ae 100644
--- a/applets/clock/system-timezone.c
+++ b/applets/clock/system-timezone.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2008 Novell, Inc.
  *
  * Authors: Vincent Untz <[email protected]>
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -17,11 +17,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
- * 
+ *
  * Some code is based on previous code in clock-location.c and on code from
  * tz.c (shipped with version <= 2.22.0). Those files were under the same
  * license, with those authors and copyrights:
- * 
+ *
  * clock-location.c:
  * ================
  * No header, but most of the work was done (AFAIK) by
@@ -36,7 +36,7 @@
  * Authors: Hans Petter Jansson <[email protected]>
  *	    additional functions by Erwann Chenede <[email protected]>
  *	    reworked by Vincent Untz <[email protected]>
- * 
+ *
  * Largely based on Michael Fulbright's work on Anaconda.
  */
 
@@ -161,7 +161,7 @@ system_timezone_init (SystemTimezone *systz)
 
         priv->tz = NULL;
         priv->env_tz = NULL;
-        for (i = 0; i < CHECK_NB; i++) 
+        for (i = 0; i < CHECK_NB; i++)
                 priv->monitors[i] = NULL;
 }
 
@@ -215,7 +215,7 @@ system_timezone_constructor (GType                  type,
 
                 if (priv->monitors[i])
                         g_signal_connect (G_OBJECT (priv->monitors[i]),
-                                          "changed", 
+                                          "changed",
                                           G_CALLBACK (system_timezone_monitor_changed),
                                           obj);
         }
@@ -448,7 +448,7 @@ system_timezone_write_key_file (const char  *filename,
         gboolean   replaced;
         gboolean   retval;
         int        n;
-        
+
         if (!g_file_test (filename, G_FILE_TEST_IS_REGULAR))
                 return TRUE;
 
diff --git a/applets/clock/test-system-timezone.c b/applets/clock/test-system-timezone.c
index 79084618..f7d100be 100644
--- a/applets/clock/test-system-timezone.c
+++ b/applets/clock/test-system-timezone.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2008-2010 Novell, Inc.
  *
  * Authors: Vincent Untz <[email protected]>
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/applets/fish/fish.c b/applets/fish/fish.c
index 976c3087..9f9635e2 100644
--- a/applets/fish/fish.c
+++ b/applets/fish/fish.c
@@ -155,7 +155,7 @@ static void show_help(FishApplet* fish, const char* link_id)
 	else
 		uri = g_strdup_printf ("help:%s", FISH_HELP_DOC);
 
-	gtk_show_uri_on_window (NULL, uri, 
+	gtk_show_uri_on_window (NULL, uri,
 			  gtk_get_current_event_time (), &error);
 	g_free (uri);
 
diff --git a/applets/notification_area/main.c b/applets/notification_area/main.c
index 12a1e073..f99b11c7 100644
--- a/applets/notification_area/main.c
+++ b/applets/notification_area/main.c
@@ -178,19 +178,19 @@ na_preferences_dialog_response (NaTrayApplet *applet,
 
 static void
 ensure_prefs_window_is_created (NaTrayApplet *applet)
-{  
+{
   if (applet->priv->dialog)
     return;
 
   applet->priv->dialog = g_new0 (NAPreferencesDialog, 1);
-  
+
   applet->priv->dialog->preferences_dialog = GTK_WIDGET (gtk_builder_get_object (applet->priv->builder, "notification_area_preferences_dialog"));
 
   gtk_window_set_icon_name (GTK_WINDOW (applet->priv->dialog->preferences_dialog), NOTIFICATION_AREA_ICON);
-  
+
   applet->priv->dialog->min_icon_size_spin = GTK_WIDGET (gtk_builder_get_object (applet->priv->builder, "min_icon_size_spin"));
   g_return_if_fail (applet->priv->dialog->min_icon_size_spin != NULL);
-  
+
   gtk_spin_button_set_range (GTK_SPIN_BUTTON (applet->priv->dialog->min_icon_size_spin), 7, 100);
   gtk_spin_button_set_value (GTK_SPIN_BUTTON (applet->priv->dialog->min_icon_size_spin), applet->priv->min_icon_size);
 
diff --git a/applets/notification_area/na-grid.c b/applets/notification_area/na-grid.c
index 8465fcab..8d0434c9 100644
--- a/applets/notification_area/na-grid.c
+++ b/applets/notification_area/na-grid.c
@@ -13,7 +13,7 @@
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
@@ -138,7 +138,7 @@ refresh_grid (NaGrid *self)
   GtkOrientation orientation;
   GtkAllocation allocation;
   gint rows, cols, length;
-  
+
   orientation = gtk_orientable_get_orientation (GTK_ORIENTABLE (self));
   gtk_widget_get_allocation (GTK_WIDGET (self), &allocation);
   length = g_slist_length (self->items);
@@ -161,13 +161,13 @@ refresh_grid (NaGrid *self)
       if (length % cols)
         rows++;
     }
-  
+
   if (self->cols != cols || self->rows != rows || self->length != length)
     {
       self->cols = cols;
       self->rows = rows;
       self->length = length;
-      
+
       SortData data;
       data.orientation = gtk_orientable_get_orientation (GTK_ORIENTABLE (self));
       data.index = 0;
@@ -186,7 +186,7 @@ na_grid_set_min_icon_size (NaGrid *grid,
   g_return_if_fail (NA_IS_GRID (grid));
 
   grid->min_icon_size = min_icon_size;
-  
+
   refresh_grid (grid);
 }
 
@@ -244,7 +244,7 @@ na_grid_init (NaGrid *self)
 
   self->hosts = NULL;
   self->items = NULL;
-  
+
   gtk_grid_set_row_homogeneous (GTK_GRID (self), TRUE);
   gtk_grid_set_column_homogeneous (GTK_GRID (self), TRUE);
 
diff --git a/applets/notification_area/status-notifier/sn-dbus-menu.c b/applets/notification_area/status-notifier/sn-dbus-menu.c
index 5b73db00..1cc3bb5a 100644
--- a/applets/notification_area/status-notifier/sn-dbus-menu.c
+++ b/applets/notification_area/status-notifier/sn-dbus-menu.c
@@ -378,7 +378,7 @@ sn_dbus_menu_constructed (GObject *object)
   /* Fix any failures of compiz/other wm's to communicate with gtk for transparency */
   screen = gtk_widget_get_screen(GTK_WIDGET(toplevel));
   visual = gdk_screen_get_rgba_visual(screen);
-  gtk_widget_set_visual(GTK_WIDGET(toplevel), visual); 
+  gtk_widget_set_visual(GTK_WIDGET(toplevel), visual);
   /* Set menu and it's toplevel window to follow panel theme */
   context = gtk_widget_get_style_context (GTK_WIDGET(toplevel));
   gtk_style_context_add_class(context,"gnome-panel-menu-bar");
diff --git a/applets/notification_area/status-notifier/sn-item.c b/applets/notification_area/status-notifier/sn-item.c
index a7fa6fea..bb8e75ae 100644
--- a/applets/notification_area/status-notifier/sn-item.c
+++ b/applets/notification_area/status-notifier/sn-item.c
@@ -446,7 +446,7 @@ sn_item_class_init (SnItemClass *item_class)
 
   install_properties (object_class);
   install_signals (item_class);
-  
+
   g_type_class_add_private (item_class, sizeof (SnItemPrivate));
 }
 
diff --git a/applets/wncklet/window-list.c b/applets/wncklet/window-list.c
index 207fc2e5..9a8039bf 100644
--- a/applets/wncklet/window-list.c
+++ b/applets/wncklet/window-list.c
@@ -736,23 +736,23 @@ gboolean window_list_applet_fill(MatePanelApplet* applet)
 	for (i = 0; i < G_N_ELEMENTS(system_monitors); i += 1)
 	{
 		programpath = g_find_program_in_path(system_monitors[i]);
-		
+
 		if (programpath != NULL)
 		{
 			g_free(programpath);
 			/* we give up */
 			goto _system_monitor_found;
 		}
-		
+
 		/* search another */
 	}
 
 	/* system monitor not found */
 	gtk_action_set_visible(gtk_action_group_get_action(action_group, "TasklistSystemMonitor"), FALSE);
-	
+
 	_system_monitor_found:;
 	/* end of system monitor item */
-	
+
 
 	mate_panel_applet_setup_menu_from_resource (MATE_PANEL_APPLET (tasklist->applet),
 	                                            WNCKLET_RESOURCE_PATH "window-list-menu.xml",
diff --git a/libmate-panel-applet/mate-panel-applet.c b/libmate-panel-applet/mate-panel-applet.c
index 642b3b92..7cbf2900 100644
--- a/libmate-panel-applet/mate-panel-applet.c
+++ b/libmate-panel-applet/mate-panel-applet.c
@@ -270,7 +270,7 @@ mate_panel_applet_size_hints_changed (MatePanelApplet *applet,
 }
 
 /**
- * mate_panel_applet_set_size_hints: 
+ * mate_panel_applet_set_size_hints:
  * @applet: applet
  * @size_hints: (array length=n_elements): List of integers
  * @n_elements: Length of @size_hints
@@ -846,7 +846,7 @@ mate_panel_applet_menu_popup (MatePanelApplet *applet,
 /* Fix any failures of compiz/other wm's to communicate with gtk for transparency */
 	GdkScreen *screen = gtk_widget_get_screen(GTK_WIDGET(toplevel));
 	GdkVisual *visual = gdk_screen_get_rgba_visual(screen);
-	gtk_widget_set_visual(GTK_WIDGET(toplevel), visual); 
+	gtk_widget_set_visual(GTK_WIDGET(toplevel), visual);
 /* Set menu and it's toplevel window to follow panel theme */
 	GtkStyleContext *context;
 	context = gtk_widget_get_style_context (GTK_WIDGET(toplevel));
@@ -1840,7 +1840,7 @@ mate_panel_applet_constructor (GType                  type,
 
 	return object;
 }
- 
+
 static void
 mate_panel_applet_constructed (GObject* object)
 {
@@ -2291,7 +2291,7 @@ _mate_panel_applet_factory_main_internal (const gchar               *factory_id,
 				     GType                      applet_type,
 				     MatePanelAppletFactoryCallback callback,
 					 gpointer                   user_data)
-	
+
 {
 	MatePanelAppletFactory* factory;
 	GClosure* closure;
diff --git a/libmate-panel-applet/panel-applet-private.h b/libmate-panel-applet/panel-applet-private.h
index 637f0d81..3d6fdf7b 100644
--- a/libmate-panel-applet/panel-applet-private.h
+++ b/libmate-panel-applet/panel-applet-private.h
@@ -31,7 +31,7 @@ guint32      mate_panel_applet_get_xid           (MatePanelApplet *applet,
 const gchar *mate_panel_applet_get_object_path   (MatePanelApplet *applet);
 
 GtkWidget   *mate_panel_applet_get_applet_widget (const gchar *factory_id,
-                                              guint        uid);       
+                                              guint        uid);
 
 G_END_DECLS
 
diff --git a/mate-panel/applet.c b/mate-panel/applet.c
index 268ecaa6..b217932a 100644
--- a/mate-panel/applet.c
+++ b/mate-panel/applet.c
@@ -602,7 +602,7 @@ mate_panel_applet_create_menu (AppletInfo *info)
 /* Fix any failures of compiz/other wm's to communicate with gtk for transparency */
 	GdkScreen *screen = gtk_widget_get_screen(GTK_WIDGET(toplevel));
 	GdkVisual *visual = gdk_screen_get_rgba_visual(screen);
-	gtk_widget_set_visual(GTK_WIDGET(toplevel), visual); 
+	gtk_widget_set_visual(GTK_WIDGET(toplevel), visual);
 /* Set menu and it's toplevel window to follow panel theme */
 	GtkStyleContext *context;
 	context = gtk_widget_get_style_context (GTK_WIDGET(toplevel));
diff --git a/mate-panel/button-widget.c b/mate-panel/button-widget.c
index d2e25400..1f3abb0c 100644
--- a/mate-panel/button-widget.c
+++ b/mate-panel/button-widget.c
@@ -309,7 +309,7 @@ calc_arrow (PanelOrientation  orientation,
 		if (button_height > 50)
 			button_height = 50;
 	}
-	
+
 	*size = ((orientation & PANEL_HORIZONTAL_MASK) ? button_width : button_height) / 2;
 	*angle = 0;
 
@@ -454,7 +454,7 @@ button_widget_get_preferred_width (GtkWidget *widget,
 
 		/* should get this value (50) from gsettings, user defined value in properties of the panel (max_icon_size) OR use 48*/
 		if ( size > 50 )
-			size = 50;	
+			size = 50;
 
 	} else
 		size = gtk_widget_get_allocated_width (parent);
@@ -477,11 +477,11 @@ button_widget_get_preferred_height (GtkWidget *widget,
 		size = gtk_widget_get_allocated_height (parent);
 	else {
 		size = gtk_widget_get_allocated_width (parent);
-		
+
 		/* should get this value (50) from gsettings, user defined value in properties of the panel (max_icon_size) OR use 48*/
 		if ( size > 50 )
-			size = 50;	
-	
+			size = 50;
+
 	}
 
 	*minimal_height = *natural_height = size;
@@ -497,14 +497,14 @@ button_widget_size_allocate (GtkWidget     *widget,
 	/* should get this value (50) from gsettings, user defined value in properties of the panel (max_icon_size) OR use 48?*/
 	if (button_widget->priv->orientation & PANEL_HORIZONTAL_MASK) {
 		if ( allocation->height > 50 ) {
-			allocation->width = 50;	
+			allocation->width = 50;
 		}
 	} else {
 		if ( allocation->width > 50 ) {
-			allocation->height = 50;	
+			allocation->height = 50;
 		}
 	}
-	
+
 	GTK_WIDGET_CLASS (button_widget_parent_class)->size_allocate (widget, allocation);
 
 	if (button_widget->priv->orientation & PANEL_HORIZONTAL_MASK)
@@ -710,7 +710,7 @@ button_widget_new (const char       *filename,
 			"orientation", orientation,
 			"icon-name", filename,
 			NULL);
-	
+
 	return retval;
 }
 
diff --git a/mate-panel/launcher.c b/mate-panel/launcher.c
index 470c0d04..ebbe31f7 100644
--- a/mate-panel/launcher.c
+++ b/mate-panel/launcher.c
@@ -88,7 +88,7 @@ launcher_widget_destroy_open_dialogs (Launcher *launcher)
 }
 
 static void
-launcher_register_error_dialog (Launcher *launcher, 
+launcher_register_error_dialog (Launcher *launcher,
 				GtkWidget *dialog)
 {
 	launcher->error_dialogs = g_slist_append (launcher->error_dialogs,
@@ -314,7 +314,7 @@ is_this_drop_ok (GtkWidget      *widget,
 	return l ? TRUE : FALSE;
 }
 
-static void  
+static void
 drag_leave_cb(GtkWidget	       *widget,
 	      GdkDragContext   *context,
 	      guint             time,
@@ -816,7 +816,7 @@ launcher_properties (Launcher  *launcher)
 							launcher->location,
 							_("Launcher Properties"));
 
-	panel_widget_register_open_dialog (PANEL_WIDGET 
+	panel_widget_register_open_dialog (PANEL_WIDGET
 					   (gtk_widget_get_parent (launcher->info->widget)),
 					   launcher->prop_dialog);
 
@@ -902,7 +902,7 @@ launcher_load_from_gsettings (PanelWidget *panel_widget,
 
 	path = g_strdup_printf ("%s%s/", PANEL_OBJECT_PATH, id);
 	settings = g_settings_new_with_path (PANEL_OBJECT_SCHEMA, path);
-	g_free (path); 
+	g_free (path);
 
 	launcher_location = g_settings_get_string (settings, PANEL_OBJECT_LAUNCHER_LOCATION_KEY);
 
@@ -1119,7 +1119,7 @@ panel_launcher_create_copy (PanelToplevel *toplevel,
 
 	copied = g_file_copy (source, dest, G_FILE_COPY_OVERWRITE,
 			      NULL, NULL, NULL, NULL);
-	
+
 	if (!copied) {
 		g_free (new_location);
 		return FALSE;
diff --git a/mate-panel/libegg/eggsmclient-xsmp.c b/mate-panel/libegg/eggsmclient-xsmp.c
index 98cd85d5..9af69dc2 100644
--- a/mate-panel/libegg/eggsmclient-xsmp.c
+++ b/mate-panel/libegg/eggsmclient-xsmp.c
@@ -231,7 +231,7 @@ sm_client_xsmp_set_initial_properties (gpointer user_data)
 
       if (xsmp->restart_style == SmRestartIfRunning)
 	{
-	  if (egg_desktop_file_get_boolean (desktop_file, 
+	  if (egg_desktop_file_get_boolean (desktop_file,
 					    "X-MATE-AutoRestart", NULL))
 	    xsmp->restart_style = SmRestartImmediately;
 	}
@@ -1134,7 +1134,7 @@ delete_properties (EggSMClientXSMP *xsmp, ...)
  * until you're done with the SmProp.
  */
 static SmProp *
-array_prop (const char *name, ...) 
+array_prop (const char *name, ...)
 {
   SmProp *prop;
   SmPropValue pv;
@@ -1351,13 +1351,13 @@ ice_error_handler (IceConn       ice_conn,
 		   IcePointer    values)
 {
   /* Do nothing */
-} 
+}
 
 static void
 ice_io_error_handler (IceConn ice_conn)
 {
   /* Do nothing */
-} 
+}
 
 static void
 smc_error_handler (SmcConn       smc_conn,
diff --git a/mate-panel/libegg/eggsmclient.c b/mate-panel/libegg/eggsmclient.c
index f66f5a4b..150e669b 100644
--- a/mate-panel/libegg/eggsmclient.c
+++ b/mate-panel/libegg/eggsmclient.c
@@ -112,7 +112,7 @@ egg_sm_client_class_init (EggSMClientClass *klass)
    * handling this signal; if the user has requested that the session
    * be saved when logging out, then ::save_state will be emitted
    * separately.
-   * 
+   *
    * If the application agrees to quit, it should then wait for either
    * the ::quit_cancelled or ::quit signals to be emitted.
    **/
diff --git a/mate-panel/libpanel-util/panel-color.c b/mate-panel/libpanel-util/panel-color.c
index 864d68d8..f6148aaa 100644
--- a/mate-panel/libpanel-util/panel-color.c
+++ b/mate-panel/libpanel-util/panel-color.c
@@ -164,7 +164,7 @@ hls_to_rgb (gdouble *h, gdouble *l, gdouble *s)
  * Takes a colour "a", scales the lightness and saturation by a certain amount,
  * and sets "b" to the resulting colour.
  * gtkstyle.c cut-and-pastage.
- */ 
+ */
 void
 gtk_style_shade (GdkRGBA *a, GdkRGBA *b, gdouble k)
 {
diff --git a/mate-panel/libpanel-util/panel-gtk.c b/mate-panel/libpanel-util/panel-gtk.c
index b575a7b2..a1db40fc 100644
--- a/mate-panel/libpanel-util/panel-gtk.c
+++ b/mate-panel/libpanel-util/panel-gtk.c
@@ -197,14 +197,14 @@ panel_image_menu_item_new_from_icon (const gchar *icon_name,
 	concat = g_strconcat (label_name, "     ", NULL);
 	GtkWidget *label_menu = gtk_label_new_with_mnemonic (concat);
 	GtkWidget *menuitem = gtk_menu_item_new ();
- 
+
 	context = gtk_widget_get_style_context (GTK_WIDGET(icon_box));
 	gtk_style_context_add_class(context,"mate-panel-menu-icon-box");
 
 	gtk_container_add (GTK_CONTAINER (icon_box), icon);
 	gtk_container_add (GTK_CONTAINER (box), icon_box);
 	gtk_container_add (GTK_CONTAINER (box), label_menu);
- 
+
 	gtk_container_add (GTK_CONTAINER (menuitem), box);
 	gtk_widget_show_all (menuitem);
 
@@ -238,11 +238,11 @@ panel_image_menu_item_new_from_gicon (GIcon       *gicon,
 
 	context = gtk_widget_get_style_context (GTK_WIDGET(icon_box));
 	gtk_style_context_add_class(context,"mate-panel-menu-icon-box");
- 
+
 	gtk_container_add (GTK_CONTAINER (icon_box), icon);
 	gtk_container_add (GTK_CONTAINER (box), icon_box);
 	gtk_container_add (GTK_CONTAINER (box), label_menu);
- 
+
 	gtk_container_add (GTK_CONTAINER (menuitem), box);
 	gtk_widget_show_all (menuitem);
 
diff --git a/mate-panel/libpanel-util/panel-keyfile.c b/mate-panel/libpanel-util/panel-keyfile.c
index 5cf4996e..181d1cff 100644
--- a/mate-panel/libpanel-util/panel-keyfile.c
+++ b/mate-panel/libpanel-util/panel-keyfile.c
@@ -191,7 +191,7 @@ panel_key_file_load_from_uri (GKeyFile       *keyfile,
 		ret = g_file_load_contents (file, NULL, &contents, &size,
 					    NULL, NULL);
 		g_object_unref (file);
-		
+
 		if (!ret)
 			return FALSE;
 
@@ -213,7 +213,7 @@ panel_key_file_copy_and_mark_trusted (const char  *source_path,
 	gboolean  res = FALSE;
 
 	key_file = g_key_file_new ();
-	res = g_key_file_load_from_file (key_file, source_path, 
+	res = g_key_file_load_from_file (key_file, source_path,
 					 G_KEY_FILE_KEEP_COMMENTS|G_KEY_FILE_KEEP_TRANSLATIONS,
 					 error);
 	if (!res) {
@@ -260,7 +260,7 @@ panel_key_file_set_locale_string (GKeyFile    *keyfile,
 	for (i = 0; langs_pointer[i] != NULL; i++) {
 		/* find first without encoding  */
 		if (strchr (langs_pointer[i], '.') == NULL) {
-			locale = langs_pointer[i]; 
+			locale = langs_pointer[i];
 			break;
 		}
 	}
diff --git a/mate-panel/libpanel-util/panel-list.c b/mate-panel/libpanel-util/panel-list.c
index 3c0a9eec..9b1ad3f9 100644
--- a/mate-panel/libpanel-util/panel-list.c
+++ b/mate-panel/libpanel-util/panel-list.c
@@ -84,7 +84,7 @@ panel_g_list_insert_after (GList *list,
 			link->prev = sibling;
 			return list;
 		}
-			
+
 	} else {
 		link->next = list;
 		list->prev = link;
diff --git a/mate-panel/libpanel-util/panel-show.h b/mate-panel/libpanel-util/panel-show.h
index 34111aaa..9964319a 100644
--- a/mate-panel/libpanel-util/panel-show.h
+++ b/mate-panel/libpanel-util/panel-show.h
@@ -1,5 +1,5 @@
 /*
- * panel-show.h: a helper around gtk_show_uri_on_window for gtk 3.22 
+ * panel-show.h: a helper around gtk_show_uri_on_window for gtk 3.22
  * or gtk_show_uri for gtk 3.20 and earlier
  *
  * Copyright (C) 2008 Novell, Inc.
diff --git a/mate-panel/mate-desktop-item-edit.c b/mate-panel/mate-desktop-item-edit.c
index 4860cf84..5a699b03 100644
--- a/mate-panel/mate-desktop-item-edit.c
+++ b/mate-panel/mate-desktop-item-edit.c
@@ -44,7 +44,7 @@ validate_for_filename (char *file)
 	char *ptr;
 
 	g_return_if_fail (file != NULL);
-	
+
 	ptr = file;
 	while (*ptr != '\0') {
 		if (*ptr == '/')
diff --git a/mate-panel/menu.c b/mate-panel/menu.c
index 082f9a24..f5d88fad 100644
--- a/mate-panel/menu.c
+++ b/mate-panel/menu.c
@@ -949,13 +949,13 @@ create_fake_menu (MateMenuTreeDirectory *directory)
 
 	g_signal_connect (menu, "button_press_event",
 			  G_CALLBACK (menu_dummy_button_press_event), NULL);
-			  
-			  
+
+
 /* Fix any failures of compiz/other wm's to communicate with gtk for transparency */
 	GtkWidget *toplevel = gtk_widget_get_toplevel (menu);
 	GdkScreen *screen = gtk_widget_get_screen(GTK_WIDGET(toplevel));
 	GdkVisual *visual = gdk_screen_get_rgba_visual(screen);
-	gtk_widget_set_visual(GTK_WIDGET(toplevel), visual); 
+	gtk_widget_set_visual(GTK_WIDGET(toplevel), visual);
 
 	return menu;
 }
@@ -1265,12 +1265,12 @@ create_applications_menu (const char *menu_file,
 	g_signal_connect (menu, "destroy", G_CALLBACK (remove_matemenu_tree_monitor), tree);
 
 	g_object_unref(tree);
-	
+
 /*HACK Fix any failures of compiz/other wm's to communicate with gtk for transparency */
 	GtkWidget *toplevel = gtk_widget_get_toplevel (menu);
 	GdkScreen *screen = gtk_widget_get_screen(GTK_WIDGET(toplevel));
 	GdkVisual *visual = gdk_screen_get_rgba_visual(screen);
-	gtk_widget_set_visual(GTK_WIDGET(toplevel), visual); 
+	gtk_widget_set_visual(GTK_WIDGET(toplevel), visual);
 
 	return menu;
 }
diff --git a/mate-panel/panel-a11y.c b/mate-panel/panel-a11y.c
index 3842226d..531f4b8b 100644
--- a/mate-panel/panel-a11y.c
+++ b/mate-panel/panel-a11y.c
@@ -36,7 +36,7 @@ panel_a11y_get_is_a11y_enabled (GtkWidget *widget)
 
 void
 panel_a11y_set_atk_name_desc (GtkWidget  *widget,
-			      const char *name, 
+			      const char *name,
 			      const char *desc)
 {
 	AtkObject *aobj;
@@ -69,7 +69,7 @@ panel_a11y_set_atk_relation (GtkWidget *widget,
 {
 	AtkObject      *aobject;
 	AtkRelationSet *relation_set;
-	AtkRelation    *relation; 
+	AtkRelation    *relation;
 	AtkObject      *targets [1];
 
 	g_return_if_fail (GTK_IS_WIDGET(widget));
diff --git a/mate-panel/panel-action-button.c b/mate-panel/panel-action-button.c
index 48d0f693..99b74dd4 100644
--- a/mate-panel/panel-action-button.c
+++ b/mate-panel/panel-action-button.c
@@ -108,7 +108,7 @@ obsolete_enum_to_string (ObsoleteEnumStringPair lookup_table[],
                          gint enum_value)
 {
   int i = 0;
-  
+
   while (lookup_table[i].str != NULL)
     {
       if (lookup_table[i].enum_value == enum_value)
@@ -126,7 +126,7 @@ obsolete_string_to_enum (ObsoleteEnumStringPair lookup_table[],
                       gint* enum_value_retloc)
 {
   int i = 0;
-  
+
   while (lookup_table[i].str != NULL)
     {
       if (g_ascii_strcasecmp (lookup_table[i].str, str) == 0)
diff --git a/mate-panel/panel-background.c b/mate-panel/panel-background.c
index 3ec53ee0..c9bf65fd 100644
--- a/mate-panel/panel-background.c
+++ b/mate-panel/panel-background.c
@@ -621,7 +621,7 @@ load_background_file (PanelBackground *background)
 
 	//FIXME add a monitor on the file so that we reload the background
 	//when it changes
-	background->loaded_image = 
+	background->loaded_image =
 		gdk_pixbuf_new_from_file (background->image, &error);
 	if (!background->loaded_image) {
 		g_assert (error != NULL);
@@ -885,7 +885,7 @@ panel_background_change_region (PanelBackground *background,
 			    background->region.height != height) &&
 			   (background->fit_image ||
 			    background->stretch_image)) {
-			/* or if the size changes and we are 
+			/* or if the size changes and we are
 			   stretching or fitting the image */
 			need_to_retransform = TRUE;
 		}
diff --git a/mate-panel/panel-background.h b/mate-panel/panel-background.h
index 65baf2a2..7d92078a 100644
--- a/mate-panel/panel-background.h
+++ b/mate-panel/panel-background.h
@@ -39,7 +39,7 @@
 
 typedef struct _PanelBackground PanelBackground;
 
-typedef void (*PanelBackgroundChangedNotify) 
+typedef void (*PanelBackgroundChangedNotify)
 				(PanelBackground *background,
 				 gpointer         user_data);
 
@@ -52,7 +52,7 @@ struct _PanelBackground {
 	GdkRGBA                 color;
 
 	char                   *image;
-	GdkPixbuf              *loaded_image; 
+	GdkPixbuf              *loaded_image;
 
 	GtkOrientation          orientation;
 	GdkRectangle            region;
@@ -90,7 +90,7 @@ void  panel_background_set               (PanelBackground     *background,
 					  const char          *image,
 					  gboolean             fit_image,
 					  gboolean             stretch_image,
-					  gboolean             rotate_image); 
+					  gboolean             rotate_image);
 void  panel_background_set_type          (PanelBackground     *background,
 					  PanelBackgroundType  type);
 void  panel_background_set_opacity       (PanelBackground     *background,
diff --git a/mate-panel/panel-bindings.c b/mate-panel/panel-bindings.c
index 96351561..493de6ab 100644
--- a/mate-panel/panel-bindings.c
+++ b/mate-panel/panel-bindings.c
@@ -49,8 +49,8 @@ typedef struct {
 } PanelBinding;
 
 static gboolean initialised = FALSE;
-static GSettings *marco_settings = NULL; 
-static GSettings *marco_keybindings_settings = NULL; 
+static GSettings *marco_settings = NULL;
+static GSettings *marco_keybindings_settings = NULL;
 
 static PanelBinding bindings [] = {
 	{ MARCO_ACTIVATE_WINDOW_MENU_KEY, "popup-panel-menu", 0, 0 },
@@ -117,7 +117,7 @@ panel_binding_set_entry (PanelBinding  *binding,
 {
 	binding_set = get_binding_set (binding_set);
 
-        gtk_binding_entry_add_signal (binding_set,	
+        gtk_binding_entry_add_signal (binding_set,
 				      binding->keyval,
 				      binding->modifiers,
 				      binding->signal,
diff --git a/mate-panel/panel-context-menu.c b/mate-panel/panel-context-menu.c
index 7a600b43..0c2c5e01 100644
--- a/mate-panel/panel-context-menu.c
+++ b/mate-panel/panel-context-menu.c
@@ -248,7 +248,7 @@ panel_context_menu_build_edition (PanelWidget *panel_widget,
 	gtk_widget_show (menuitem);
 	gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
 	g_signal_connect_swapped (menuitem, "activate",
-				  G_CALLBACK (panel_properties_dialog_present), 
+				  G_CALLBACK (panel_properties_dialog_present),
 				  panel_widget->toplevel);
 
 	add_menu_separator (menu);
@@ -278,9 +278,9 @@ panel_context_menu_build_edition (PanelWidget *panel_widget,
 	gtk_widget_show (menuitem);
 	gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
 	g_signal_connect (menuitem, "activate",
-			  G_CALLBACK (panel_context_menu_create_new_panel), 
+			  G_CALLBACK (panel_context_menu_create_new_panel),
 			  NULL);
-	gtk_widget_set_sensitive (menuitem, 
+	gtk_widget_set_sensitive (menuitem,
 				  panel_profile_id_lists_are_writable ());
 
 	add_menu_separator (menu);
@@ -329,7 +329,7 @@ panel_context_menu_create (PanelWidget *panel)
 	g_signal_connect (menuitem, "activate",
 			  G_CALLBACK (panel_context_menu_show_about_dialog),
 			  NULL);
-	
+
 	//FIXME: can we get rid of this? (needed by menu_get_panel())
 	g_object_set_data (G_OBJECT (retval), "menu_panel", panel);
 
@@ -338,7 +338,7 @@ panel_context_menu_create (PanelWidget *panel)
 /* Fix any failures of compiz/other wm's to communicate with gtk for transparency */
 	GdkScreen *screen = gtk_widget_get_screen(GTK_WIDGET(toplevel));
 	GdkVisual *visual = gdk_screen_get_rgba_visual(screen);
-	gtk_widget_set_visual(GTK_WIDGET(toplevel), visual); 
+	gtk_widget_set_visual(GTK_WIDGET(toplevel), visual);
 /* Set menu and it's toplevel window to follow panel theme */
 	GtkStyleContext *context;
 	context = gtk_widget_get_style_context (GTK_WIDGET(toplevel));
diff --git a/mate-panel/panel-force-quit.c b/mate-panel/panel-force-quit.c
index 82a67010..4ed60fb8 100644
--- a/mate-panel/panel-force-quit.c
+++ b/mate-panel/panel-force-quit.c
@@ -158,7 +158,7 @@ wm_state_set (Display *xdisplay,
 	return TRUE;
 }
 
-static Window 
+static Window
 find_managed_window (Display *xdisplay,
 		     Window   window)
 {
@@ -225,7 +225,7 @@ static void
 kill_window_question (gpointer window)
 {
 	GtkWidget *dialog;
- 
+
 	dialog = gtk_message_dialog_new (NULL, 0,
 					 GTK_MESSAGE_WARNING,
 					 GTK_BUTTONS_NONE,
@@ -243,7 +243,7 @@ kill_window_question (gpointer window)
 	gtk_dialog_add_button (GTK_DIALOG (dialog),
 			       PANEL_STOCK_FORCE_QUIT,
 			       GTK_RESPONSE_ACCEPT);
- 
+
 	gtk_dialog_set_default_response (GTK_DIALOG (dialog),
 					 GTK_RESPONSE_CANCEL);
 	gtk_window_set_skip_taskbar_hint (GTK_WINDOW (dialog), FALSE);
@@ -255,7 +255,7 @@ kill_window_question (gpointer window)
 	gtk_widget_show (dialog);
 }
 
-static void 
+static void
 handle_button_press_event (GtkWidget *popup,
 			   Display *display,
 			   Window subwindow)
diff --git a/mate-panel/panel-lockdown.c b/mate-panel/panel-lockdown.c
index 212f66f5..1c728511 100644
--- a/mate-panel/panel-lockdown.c
+++ b/mate-panel/panel-lockdown.c
@@ -170,7 +170,7 @@ panel_lockdown_init (void)
                                           panel_lockdown.lockdown_settings,
                                           LOCKDOWN_DISABLE_COMMAND_LINE_KEY,
                                           G_CALLBACK (disable_command_line_notify));
-        
+
         panel_lockdown.disable_lock_screen =
                 panel_lockdown_load_bool (&panel_lockdown,
                                           panel_lockdown.lockdown_settings,
diff --git a/mate-panel/panel-menu-items.c b/mate-panel/panel-menu-items.c
index a8722f23..046d3ee3 100644
--- a/mate-panel/panel-menu-items.c
+++ b/mate-panel/panel-menu-items.c
@@ -1124,7 +1124,7 @@ panel_place_menu_item_create_menu (PanelPlaceMenuItem *place_item)
 	GtkWidget *toplevel = gtk_widget_get_toplevel (places_menu);
 	GdkScreen *screen = gtk_widget_get_screen(GTK_WIDGET(toplevel));
 	GdkVisual *visual = gdk_screen_get_rgba_visual(screen);
-	gtk_widget_set_visual(GTK_WIDGET(toplevel), visual); 
+	gtk_widget_set_visual(GTK_WIDGET(toplevel), visual);
 
 	return places_menu;
 }
diff --git a/mate-panel/panel-multimonitor.h b/mate-panel/panel-multimonitor.h
index 8829a5f3..13aa6472 100644
--- a/mate-panel/panel-multimonitor.h
+++ b/mate-panel/panel-multimonitor.h
@@ -4,8 +4,8 @@
  * Copyright (C) 2001 George Lebl <[email protected]>
  *               2002 Sun Microsystems Inc.
  *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU General Public License as 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
  *
diff --git a/mate-panel/panel-properties-dialog.c b/mate-panel/panel-properties-dialog.c
index 97a9babd..f71c126a 100644
--- a/mate-panel/panel-properties-dialog.c
+++ b/mate-panel/panel-properties-dialog.c
@@ -397,7 +397,7 @@ panel_properties_dialog_setup_image_chooser (PanelPropertiesDialog *dialog,
 	else
 		gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (dialog->image_chooser),
 					       image);
-	
+
 	if (image)
 		g_free (image);
 
@@ -494,7 +494,7 @@ panel_properties_dialog_background_toggled (PanelPropertiesDialog *dialog,
 
 	panel_profile_set_background_type (dialog->toplevel, background_type);
 }
-				
+
 static void
 panel_properties_dialog_setup_background_radios (PanelPropertiesDialog *dialog,
 						 GtkBuilder            *gui)
diff --git a/mate-panel/panel-recent.c b/mate-panel/panel-recent.c
index e02b8d95..3795b12b 100644
--- a/mate-panel/panel-recent.c
+++ b/mate-panel/panel-recent.c
@@ -61,7 +61,7 @@ recent_documents_activate_cb (GtkRecentChooser *chooser,
 	GError        *error = NULL;
 
 	screen = gtk_widget_get_screen (GTK_WIDGET (chooser));
-	
+
 	recent_info = gtk_recent_chooser_get_current_item (chooser);
 	uri = gtk_recent_info_get_uri (recent_info);
 	mime_type = gtk_recent_info_get_mime_type (recent_info);
@@ -205,7 +205,7 @@ panel_recent_append_documents_menu (GtkWidget        *top_menu,
 
 	gtk_menu_shell_append (GTK_MENU_SHELL (top_menu), menu_item);
 	gtk_widget_show_all (menu_item);
-	
+
 	gtk_recent_chooser_set_local_only (GTK_RECENT_CHOOSER (recent_menu),
 					   FALSE);
 	gtk_recent_chooser_set_show_tips (GTK_RECENT_CHOOSER (recent_menu),
diff --git a/mate-panel/panel-run-dialog.c b/mate-panel/panel-run-dialog.c
index 77e17a4f..e632acd6 100644
--- a/mate-panel/panel-run-dialog.c
+++ b/mate-panel/panel-run-dialog.c
@@ -2066,6 +2066,6 @@ panel_run_dialog_present (GdkScreen *screen,
 void
 panel_run_dialog_quit_on_destroy (void)
 {
-	g_signal_connect(static_dialog->run_dialog, "destroy", 
+	g_signal_connect(static_dialog->run_dialog, "destroy",
 			 G_CALLBACK(gtk_main_quit), NULL);
 }
diff --git a/mate-panel/panel-test-applets.c b/mate-panel/panel-test-applets.c
index 8123a882..34790dbf 100644
--- a/mate-panel/panel-test-applets.c
+++ b/mate-panel/panel-test-applets.c
@@ -323,7 +323,7 @@ setup_options (void)
 		if (dconf_paths)
 			g_strfreev (dconf_paths);
 	}
-	
+
 	prefs_path = g_strdup_printf ("/tmp/%s/", unique_key);
 	if (unique_key)
 		g_free (unique_key);
diff --git a/mate-panel/panel-toplevel.c b/mate-panel/panel-toplevel.c
index b1cafa65..8a7b6c7b 100644
--- a/mate-panel/panel-toplevel.c
+++ b/mate-panel/panel-toplevel.c
@@ -2925,7 +2925,7 @@ panel_toplevel_move_resize_window (PanelToplevel *toplevel,
 
 	if(resize || move)
 	{
-		for(list = toplevel->priv->panel_widget->applet_list;list!=NULL;list = g_list_next(list)) 
+		for(list = toplevel->priv->panel_widget->applet_list;list!=NULL;list = g_list_next(list))
 		{
 			AppletData *ad = list->data;
 			id = mate_panel_applet_get_id_by_widget (ad->applet);
@@ -2975,7 +2975,7 @@ set_background_default_style (GtkWidget *widget)
 		return;
 
 	toplevel = PANEL_TOPLEVEL (widget);
- 
+
 	context = gtk_widget_get_style_context (widget);
 	state = gtk_style_context_get_state (context);
 
@@ -3475,7 +3475,7 @@ panel_toplevel_button_release_event (GtkWidget      *widget,
 static gboolean
 panel_toplevel_configure_event (GtkWidget	  *widget,
 				GdkEventConfigure *event)
-{	
+{
 	PanelToplevel *toplevel;
 
 	toplevel = PANEL_TOPLEVEL (widget);
@@ -4812,7 +4812,7 @@ panel_toplevel_init (PanelToplevel *toplevel)
 
 	panel_background_init (&toplevel->background,
 			       (PanelBackgroundChangedNotify) background_changed,
-			       toplevel);	
+			       toplevel);
 
 	update_style_classes (toplevel);
 }
diff --git a/mate-panel/panel-widget.c b/mate-panel/panel-widget.c
index 4dcf2dfe..3dc85d95 100644
--- a/mate-panel/panel-widget.c
+++ b/mate-panel/panel-widget.c
@@ -293,7 +293,7 @@ panel_widget_class_init (PanelWidgetClass *class)
                               G_SIGNAL_RUN_LAST,
                               G_STRUCT_OFFSET (PanelWidgetClass, size_change),
                               NULL,
-                              NULL, 
+                              NULL,
                               g_cclosure_marshal_VOID__VOID,
                               G_TYPE_NONE,
                               0);
@@ -304,7 +304,7 @@ panel_widget_class_init (PanelWidgetClass *class)
                               G_SIGNAL_RUN_LAST,
                               G_STRUCT_OFFSET (PanelWidgetClass, back_change),
                               NULL,
-                              NULL, 
+                              NULL,
                               g_cclosure_marshal_VOID__VOID,
                               G_TYPE_NONE,
                               0);
@@ -315,11 +315,11 @@ panel_widget_class_init (PanelWidgetClass *class)
                               G_SIGNAL_RUN_LAST,
                               G_STRUCT_OFFSET (PanelWidgetClass, applet_move),
                               NULL,
-                              NULL, 
+                              NULL,
                               g_cclosure_marshal_VOID__POINTER,
                               G_TYPE_NONE,
                               1,
-                              G_TYPE_POINTER); 
+                              G_TYPE_POINTER);
 
 	panel_widget_signals[APPLET_ADDED_SIGNAL] =
                 g_signal_new ("applet_added",
@@ -327,11 +327,11 @@ panel_widget_class_init (PanelWidgetClass *class)
                               G_SIGNAL_RUN_LAST,
                               G_STRUCT_OFFSET (PanelWidgetClass, applet_added),
                               NULL,
-                              NULL, 
+                              NULL,
                               g_cclosure_marshal_VOID__POINTER,
                               G_TYPE_NONE,
                               1,
-                              G_TYPE_POINTER); 
+                              G_TYPE_POINTER);
 
 	panel_widget_signals[APPLET_REMOVED_SIGNAL] =
                 g_signal_new ("applet_removed",
@@ -339,11 +339,11 @@ panel_widget_class_init (PanelWidgetClass *class)
                               G_SIGNAL_RUN_LAST,
                               G_STRUCT_OFFSET (PanelWidgetClass, applet_removed),
                               NULL,
-                              NULL, 
+                              NULL,
                               g_cclosure_marshal_VOID__POINTER,
                               G_TYPE_NONE,
                               1,
-                              G_TYPE_POINTER); 
+                              G_TYPE_POINTER);
 
 	panel_widget_signals[PUSH_MOVE_SIGNAL] =
 		g_signal_new ("push_move",
@@ -356,7 +356,7 @@ panel_widget_class_init (PanelWidgetClass *class)
                               G_TYPE_NONE,
                               1,
                               GTK_TYPE_DIRECTION_TYPE);
-	
+
 	panel_widget_signals[SWITCH_MOVE_SIGNAL] =
                 g_signal_new ("switch_move",
                               G_TYPE_FROM_CLASS (class),
@@ -434,7 +434,7 @@ remove_panel_from_forbidden(PanelWidget *panel, PanelWidget *r)
 {
 	GSList *list;
 	GtkWidget *parent_panel;
-	
+
 	g_return_if_fail(PANEL_IS_WIDGET(panel));
 	g_return_if_fail(PANEL_IS_WIDGET(r));
 
@@ -570,9 +570,9 @@ panel_widget_cremove (GtkContainer *container, GtkWidget *widget)
 
 	g_return_if_fail (PANEL_IS_WIDGET (container));
 	g_return_if_fail (GTK_IS_WIDGET (widget));
-	
+
 	panel = PANEL_WIDGET (container);
-	
+
 	ad = g_object_get_data (G_OBJECT (widget), MATE_PANEL_APPLET_DATA);
 	p = g_object_get_data (G_OBJECT (widget),
 				 MATE_PANEL_APPLET_ASSOC_PANEL_KEY);
@@ -609,7 +609,7 @@ get_applet_list_pos (PanelWidget *panel,
 	GList *l;
 
 	g_return_val_if_fail (PANEL_IS_WIDGET (panel), NULL);
-	
+
 	for (l = panel->applet_list; l; l = l->next) {
 		AppletData *ad = l->data;
 
@@ -637,7 +637,7 @@ panel_widget_is_applet_stuck (PanelWidget *panel_widget,
 	if (applet) {
 		GList *applet_list, *l;
 		int    end_pos = -1;
-	
+
 		applet_list = g_list_find (panel_widget->applet_list, applet);
 
 		for (l = applet_list; l; l = l->next) {
@@ -659,7 +659,7 @@ static int
 get_size_from_hints (AppletData *ad, int cells)
 {
 	int i;
-	
+
 	for (i = 0; i < ad->size_hints_len; i += 2) {
 		if (cells > ad->size_hints[i]) {
 			/* Clip to top */
@@ -672,7 +672,7 @@ get_size_from_hints (AppletData *ad, int cells)
 			break;
 		}
 	}
-	
+
 	return MAX (cells, ad->min_cells);
 }
 
@@ -717,7 +717,7 @@ panel_widget_switch_applet_right (PanelWidget *panel,
 {
 	AppletData *ad;
 	AppletData *nad = NULL;
-	
+
 	g_assert (list != NULL);
 
 	ad = list->data;
@@ -741,7 +741,7 @@ panel_widget_switch_applet_right (PanelWidget *panel,
 						nad->constrained + nad->min_cells);
 		return;
 	}
-						  
+
 	nad->constrained = nad->pos = ad->constrained;
 	ad->constrained = ad->pos = ad->constrained + nad->min_cells;
 	panel->applet_list = panel_g_list_swap_next (panel->applet_list, list);
@@ -919,7 +919,7 @@ panel_widget_try_push_left (PanelWidget *panel,
 
 	if (ad->constrained - push < 0)
 		return FALSE;
-	
+
 	if (!pad || pad->constrained + pad->min_cells <= ad->constrained - push)
 		return TRUE;
 
@@ -961,7 +961,7 @@ panel_widget_get_left_switch_pos (PanelWidget *panel,
 	ad = list->data;
 	if (list->prev)
 		pad = list->prev->data;
-	
+
 	if (!pad || pad->constrained + pad->min_cells <= ad->constrained - MOVE_INCREMENT)
 		return ad->constrained - MOVE_INCREMENT;
 
@@ -970,7 +970,7 @@ panel_widget_get_left_switch_pos (PanelWidget *panel,
 						       ad,
 						       list->prev->prev,
 						       pad->constrained - ad->min_cells);
-	
+
 	return pad->constrained;
 }
 
@@ -1035,7 +1035,7 @@ panel_widget_switch_move (PanelWidget *panel,
 
 			panel_widget_switch_applet_left (panel, list);
 		}
-		
+
 	}
 }
 
@@ -1048,7 +1048,7 @@ panel_widget_push_applet_right (PanelWidget *panel,
 	AppletData *nad = NULL;
 
 	g_assert (list != NULL);
-	
+
 	ad = list->data;
 	if (ad->constrained + ad->min_cells + push >= panel->size)
 		return FALSE;
@@ -1074,7 +1074,7 @@ panel_widget_push_applet_right (PanelWidget *panel,
 	ad->pos = ad->constrained += push;;
 	gtk_widget_queue_resize (GTK_WIDGET (panel));
 	emit_applet_moved (panel, ad);
-	
+
 	return TRUE;
 }
 
@@ -1113,7 +1113,7 @@ panel_widget_push_applet_left (PanelWidget *panel,
 	ad->pos = ad->constrained -= push;
 	gtk_widget_queue_resize (GTK_WIDGET (panel));
 	emit_applet_moved (panel, ad);
-	
+
 	return TRUE;
 }
 
@@ -1167,20 +1167,20 @@ panel_widget_right_stick(PanelWidget *panel,int old_size)
 
 	g_return_if_fail(PANEL_IS_WIDGET(panel));
 	g_return_if_fail(old_size>=0);
-	
+
 	if(old_size>=panel->size ||
 	   panel->packed)
 	   	return;
-	
+
 	list = get_applet_list_pos(panel,old_size-1);
 
 	if(!list)
 		return;
-	
+
 	pos = panel->size-1;
 
 	ad = list->data;
-	do { 
+	do {
 		i = ad->pos;
 		ad->pos = ad->constrained = pos--;
 		ad->cells = 1;
@@ -1305,7 +1305,7 @@ panel_widget_get_preferred_size(GtkWidget	     *widget,
 			panel->applets_using_hint = g_new0 (AppletSizeHintsAlloc, panel->nb_applets_size_hints);
 		}
 	}
-	
+
 	dont_fill = panel->packed && panel->nb_applets_size_hints != 0;
 
 	if (panel->orient == GTK_ORIENTATION_HORIZONTAL) {
@@ -1378,7 +1378,7 @@ panel_widget_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
 
 	old_size = panel->size;
 	ltr = gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR;
-	
+
 	gtk_widget_set_allocation (widget, allocation);
 	if (gtk_widget_get_realized (widget))
 		gdk_window_move_resize (gtk_widget_get_window (widget),
@@ -1409,7 +1409,7 @@ panel_widget_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
 			gtk_widget_get_preferred_size (ad->applet, &chreq, NULL);
 
 			ad->constrained = i;
-			
+
 			challoc.width = chreq.width;
 			challoc.height = chreq.height;
 			if(panel->orient == GTK_ORIENTATION_HORIZONTAL) {
@@ -1486,14 +1486,14 @@ panel_widget_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
 		    list = g_list_previous(list)) {
 			AppletData *ad = list->data;
 			int cells;
-			
+
 			if (ad->constrained + ad->min_cells > i)
 				ad->constrained = MAX (i - ad->min_cells, 0);
-			
+
 			if (ad->expand_major) {
 				cells = (i - ad->constrained) - 1;
 
-				if (ad->size_hints) 
+				if (ad->size_hints)
 					cells = get_size_from_hints (ad, cells);
 				cells = MAX (cells, ad->min_cells);
 				cells = MIN (cells, panel->size);
@@ -1513,10 +1513,10 @@ panel_widget_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
 			    list!=NULL;
 			    list = g_list_next(list)) {
 				AppletData *ad = list->data;
-				
+
 				if (ad->constrained < i)
 					ad->constrained = i;
-				
+
 				i = ad->constrained + ad->cells;
 			}
 		}
@@ -1546,10 +1546,10 @@ panel_widget_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
 				challoc.x = allocation->width / 2 - challoc.width / 2;
 				challoc.y = ad->constrained;
 			}
-			
+
 			challoc.width = MAX(challoc.width, 1);
 			challoc.height = MAX(challoc.height, 1);
-			
+
 			gtk_widget_size_allocate(ad->applet,&challoc);
 		}
 	}
@@ -1569,7 +1569,7 @@ panel_widget_is_cursor(PanelWidget *panel, int overlap)
 	g_return_val_if_fail(PANEL_IS_WIDGET(panel),FALSE);
 
 	widget = panel->drop_widget;
-	
+
 	if(!widget ||
 	   !GTK_IS_WIDGET(widget) ||
 	   !gtk_widget_get_visible(widget))
@@ -1670,7 +1670,7 @@ panel_widget_init (PanelWidget *panel)
 	gtk_widget_set_events (
 		widget,
 		gtk_widget_get_events (widget) | GDK_BUTTON_RELEASE_MASK);
-	
+
 	panel->packed        = FALSE;
 	panel->orient        = GTK_ORIENTATION_HORIZONTAL;
 	panel->size          = 0;
@@ -1760,7 +1760,7 @@ panel_widget_applet_drag_start_no_grab (PanelWidget *panel,
 	add_all_move_bindings (panel);
 
 	mate_panel_applet_in_drag = TRUE;
-	
+
 	return TRUE;
 }
 
@@ -1870,7 +1870,7 @@ panel_widget_get_cursorloc (PanelWidget *panel)
 	device = gdk_seat_get_pointer (gdk_display_get_default_seat (gtk_widget_get_display (GTK_WIDGET(panel))));
 	gdk_window_get_device_position(gtk_widget_get_window (GTK_WIDGET(panel)), device, &x, &y, NULL);
 	rtl = gtk_widget_get_direction (GTK_WIDGET (panel)) == GTK_TEXT_DIR_RTL;
-	
+
 	if (panel->orient == GTK_ORIENTATION_HORIZONTAL)
 		return (rtl ? panel->size - x : x);
 	else
@@ -2106,7 +2106,7 @@ panel_widget_applet_move_to_cursor (PanelWidget *panel)
 		else if (mods & GDK_MOD1_MASK)
 			movement = PANEL_FREE_MOVE;
 	}
-	
+
 	switch (movement) {
 	case PANEL_SWITCH_MOVE:
 		moveby = panel_widget_get_moveby (panel, pos, ad->drag_off);
@@ -2161,7 +2161,7 @@ move_timeout_handler(gpointer data)
 	}
 
 	moving_timeout = 0;
-	
+
 	return FALSE;
 }
 
@@ -2196,7 +2196,7 @@ panel_widget_applet_button_press_event (GtkWidget      *widget,
 
 	/* don't propagate this event */
 	if (panel->currently_dragged_applet) {
-		g_signal_stop_emission (G_OBJECT (widget), 
+		g_signal_stop_emission (G_OBJECT (widget),
 					g_signal_lookup ("button-press-event",
 							 G_OBJECT_TYPE (widget)),
 					0);
@@ -2231,7 +2231,7 @@ panel_widget_applet_button_release_event (GtkWidget      *widget,
 	g_return_val_if_fail (PANEL_IS_WIDGET (parent), FALSE);
 
 	panel = PANEL_WIDGET (parent);
-	
+
 	/* don't propagate this event */
 	if (panel->currently_dragged_applet) {
 		g_signal_stop_emission (G_OBJECT (widget),
@@ -2260,7 +2260,7 @@ panel_widget_applet_motion_notify_event (GtkWidget *widget,
 		return FALSE;
 
 	panel = PANEL_WIDGET (parent);
-	
+
 	schedule_try_move (panel, FALSE);
 
 	return FALSE;
@@ -2272,7 +2272,7 @@ panel_widget_applet_key_press_event (GtkWidget   *widget,
 {
 	GtkWidget   *parent;
 	PanelWidget *panel;
-	
+
 	parent = gtk_widget_get_parent (widget);
 
 	g_return_val_if_fail (PANEL_IS_WIDGET (parent), FALSE);
@@ -2283,8 +2283,8 @@ panel_widget_applet_key_press_event (GtkWidget   *widget,
 		return FALSE;
 
 	return gtk_bindings_activate (G_OBJECT (panel),
-				      ((GdkEventKey *)event)->keyval, 
-				      ((GdkEventKey *)event)->state);	
+				      ((GdkEventKey *)event)->keyval,
+				      ((GdkEventKey *)event)->state);
 }
 
 static int
@@ -2329,12 +2329,12 @@ bind_applet_events(GtkWidget *widget, gpointer data)
 	 * until the event gets to the applet wrapper (the
 	 * GtkEventBox) for processing by us.
 	 */
-	
+
 	if (gtk_widget_get_has_window (widget))
 		g_signal_connect (G_OBJECT(widget), "event",
 				  G_CALLBACK (panel_sub_event_handler),
 				  data);
-	
+
 	if (GTK_IS_CONTAINER(widget))
 		gtk_container_foreach (GTK_CONTAINER (widget),
 				       bind_applet_events, data);
@@ -2481,7 +2481,7 @@ panel_widget_add (PanelWidget *panel,
 
 	if (!insert_at_pos || pos < 0) {
 		if (panel->packed) {
-			if (get_applet_list_pos (panel, pos)) 
+			if (get_applet_list_pos (panel, pos))
 				/*this is a slight hack so that this applet
 				  is inserted AFTER an applet with this pos
 				  number*/
@@ -2490,7 +2490,7 @@ panel_widget_add (PanelWidget *panel,
 			int newpos = panel_widget_find_empty_pos (panel, pos);
 			if (newpos >= 0)
 				pos = newpos;
-			else if (get_applet_list_pos (panel, pos)) 
+			else if (get_applet_list_pos (panel, pos))
 				/*this is a slight hack so that this applet
 				  is inserted AFTER an applet with this pos
 				  number*/
@@ -2515,7 +2515,7 @@ panel_widget_add (PanelWidget *panel,
 		ad->size_hints = NULL;
 		g_object_set_data (G_OBJECT (applet),
 				   MATE_PANEL_APPLET_DATA, ad);
-		
+
 		/*this is a completely new applet, which was not yet bound*/
 		bind_top_applet_events (applet);
 	}
@@ -2538,7 +2538,7 @@ panel_widget_add (PanelWidget *panel,
 	g_signal_emit (G_OBJECT(panel),
 		       panel_widget_signals[APPLET_ADDED_SIGNAL],
 		       0, applet);
-	
+
 	/*NOTE: forbidden list is not updated on addition, use the
 	function above for the panel*/
 
@@ -2569,7 +2569,7 @@ panel_widget_reparent (PanelWidget *old_panel,
 	 */
 	if (panel_toplevel_get_is_hidden (new_panel->toplevel))
 		return FALSE;
-	
+
 	info = g_object_get_data (G_OBJECT (ad->applet), "applet_info");
 
 	ad->pos = ad->constrained = panel_widget_get_free_spot (new_panel, ad, pos);
@@ -2642,7 +2642,7 @@ panel_widget_set_size (PanelWidget *panel_widget,
 		return;
 
 	panel_widget->sz = size;
-	
+
 	queue_resize_on_all_applets (panel_widget);
 
 	g_signal_emit (panel_widget, panel_widget_signals [SIZE_CHANGE_SIGNAL], 0);
@@ -2656,7 +2656,7 @@ panel_widget_emit_background_changed (PanelWidget *panel)
 	g_signal_emit (panel, panel_widget_signals [BACK_CHANGE_SIGNAL], 0);
 }
 
-static void 
+static void
 panel_widget_push_move_applet (PanelWidget     *panel,
                                GtkDirectionType dir)
 {
@@ -2682,7 +2682,7 @@ panel_widget_push_move_applet (PanelWidget     *panel,
 	panel_widget_push_move (panel, applet, increment);
 }
 
-static void 
+static void
 panel_widget_switch_move_applet (PanelWidget      *panel,
                                  GtkDirectionType  dir)
 {
@@ -2709,7 +2709,7 @@ panel_widget_switch_move_applet (PanelWidget      *panel,
 	}
 }
 
-static void 
+static void
 panel_widget_free_move_applet (PanelWidget      *panel,
                                GtkDirectionType  dir)
 {
@@ -2747,8 +2747,8 @@ panel_widget_tab_move (PanelWidget *panel,
 	ad = panel->currently_dragged_applet;
 
 	if (!ad)
-		return;	
-	
+		return;
+
 	for (l = panels; l; l = l->next) {
 		PanelWidget *panel_in_list = l->data;
 
@@ -2758,7 +2758,7 @@ panel_widget_tab_move (PanelWidget *panel,
 					new_panel = l->next->data;
 				else
 					new_panel = ((GSList *)panels)->data;
-				
+
 			} else {
 				if (previous_panel)
 					new_panel = previous_panel;
@@ -2766,7 +2766,7 @@ panel_widget_tab_move (PanelWidget *panel,
 					continue;
 			}
 			break;
-		} else {		
+		} else {
 			if (!next)
 				previous_panel = panel_in_list;
 		}
@@ -2776,7 +2776,7 @@ panel_widget_tab_move (PanelWidget *panel,
 
 	if (!new_panel && previous_panel)
 		new_panel = previous_panel;
-	
+
 	if (new_panel &&
 	    (new_panel != panel) &&
 	    !panel_lockdown_get_locked_down ())
@@ -2799,7 +2799,7 @@ panel_widget_real_focus (GtkWidget        *widget,
 	return GTK_WIDGET_CLASS (panel_widget_parent_class)->focus (widget, direction);
 }
 
-void 
+void
 panel_widget_focus (PanelWidget *panel_widget)
 {
 	if (panel_toplevel_get_is_attached (panel_widget->toplevel))
@@ -2942,7 +2942,7 @@ mate_panel_applet_is_in_drag (void)
 	return mate_panel_applet_in_drag;
 }
 
-void 
+void
 panel_widget_register_open_dialog (PanelWidget *panel,
 				   GtkWidget   *dialog)
 {
@@ -2953,7 +2953,7 @@ panel_widget_register_open_dialog (PanelWidget *panel,
 
 	panel->open_dialogs = g_slist_append (panel->open_dialogs,
 					      dialog);
-	
+
 	g_signal_connect_object (dialog, "destroy",
 				 G_CALLBACK (panel_widget_open_dialog_destroyed),
 				 panel,
diff --git a/mate-panel/panel.c b/mate-panel/panel.c
index a53dc2a5..67bd7689 100644
--- a/mate-panel/panel.c
+++ b/mate-panel/panel.c
@@ -111,7 +111,7 @@ orient_change_foreach(GtkWidget *w, gpointer data)
 {
 	AppletInfo *info = g_object_get_data (G_OBJECT (w), "applet_info");
 	PanelWidget *panel = data;
-	
+
 	orientation_change(info,panel);
 }
 
@@ -141,7 +141,7 @@ size_change_foreach(GtkWidget *w, gpointer data)
 {
 	AppletInfo *info = g_object_get_data (G_OBJECT (w), "applet_info");
 	PanelWidget *panel = data;
-	
+
 	size_change(info,panel);
 }
 
@@ -396,12 +396,12 @@ panel_key_press_event (GtkWidget   *widget,
 #ifdef HAVE_X11
 	/*
   	 * If the focus widget is a GtkSocket, i.e. the
-	 * focus is in an applet in another process, then key 
+	 * focus is in an applet in another process, then key
 	 * bindings do not work. We get around this by
 	 * activating the key bindings here.
 	 *
 	 * Will always be false when not using X
-	 */ 
+	 */
 	if (GTK_IS_SOCKET (gtk_window_get_focus (GTK_WINDOW (widget))) &&
 	    event->keyval == GDK_KEY_F10 &&
 	    (event->state & gtk_accelerator_get_default_mod_mask ()) == GDK_CONTROL_MASK)
@@ -482,7 +482,7 @@ drop_url (PanelWidget *panel,
 		g_strfreev (netscape_url);
 		return FALSE;
 	}
-	
+
 	comment = g_strdup_printf (_("Open URL: %s"),
 				   netscape_url[NETSCAPE_URL_URL]);
 
@@ -717,7 +717,7 @@ drop_internal_icon (PanelWidget *panel,
 
 	if (action == GDK_ACTION_MOVE)
 		old_launcher = find_launcher (icon_name);
-	
+
 	if (!panel_launcher_create_copy (panel->toplevel, pos, icon_name))
 		return FALSE;
 
@@ -1053,7 +1053,7 @@ drag_drop_cb (GtkWidget	        *widget,
 	return TRUE;
 }
 
-static void  
+static void
 drag_leave_cb (GtkWidget	*widget,
 	       GdkDragContext   *context,
 	       guint             time,
@@ -1163,9 +1163,9 @@ drag_data_recieved_cb (GtkWidget	*widget,
 	panel_widget = panel_toplevel_get_panel_widget (PANEL_TOPLEVEL (widget));
 
 	pos = panel_widget_get_cursorloc (panel_widget);
-	
-	/* 
-	 * -1 passed to mate_panel_applet_register will turn on 
+
+	/*
+	 * -1 passed to mate_panel_applet_register will turn on
 	 * the insert_at_pos flag for panel_widget_add_full,
 	 * which will not place it after the first applet.
 	 */
@@ -1220,7 +1220,7 @@ panel_setup (PanelToplevel *toplevel)
 	pd->deactivate_idle = 0;
 
 	panel_list = g_slist_append (panel_list, pd);
-	
+
 	g_object_set_data (G_OBJECT (toplevel), "PanelData", pd);
 
 	panel_lockdown_notify_add (G_CALLBACK (panel_recreate_context_menu),
@@ -1248,7 +1248,7 @@ panel_setup (PanelToplevel *toplevel)
 
 	g_signal_connect_swapped (toplevel, "notify::orientation",
 				  G_CALLBACK (panel_orient_change), panel_widget);
- 
+
 	g_signal_connect (toplevel, "destroy", G_CALLBACK (panel_destroy), pd);
 
 	return pd;
@@ -1300,7 +1300,7 @@ panel_delete_without_query (PanelToplevel *toplevel)
 		panel_profile_delete_object (info);
 	} else
 		panel_profile_delete_toplevel (toplevel);
-} 
+}
 
 static void
 panel_deletion_response (GtkWidget     *dialog,
@@ -1348,9 +1348,9 @@ panel_deletion_dialog (PanelToplevel *toplevel)
 			GTK_MESSAGE_WARNING,
 			GTK_BUTTONS_NONE,
 			"%s", text1);
-	
+
 	gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
-	                                          "%s", text2);	
+	                                          "%s", text2);
 
 	panel_dialog_add_button (GTK_DIALOG (dialog),
 				 _("_Cancel"), "process-stop",