Merge lp:~jeremywootten/pantheon-files/split-view-preparation-code-clean into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

Code clean: tabs, trailing space, headers, comments

In preparation for implementation of Split View:

1) All trailing spaces and tabs removed. Subsequent merges should not reintroduce.
2) In Vala code, file header format and comment style made more consistent. /* ... */ used for permanent helpful comments, // used for temporary comments (to be normally removed before merging unless explanation given)
3) Old commented code lines removed from Vala code.

Subsequent Split View branches will depend on this one.

[Cody Garver (codygarver)]

I only had the stamina to scan 2000 lines tonight. Will be back for more soon.

review: Needs Fixing

[Jeremy Wootten (jeremywootten)]

Thanks Cody. Ricotz pointed out a number of issues caused by my not noticing that a few files had a differently defined tab size. I'll be pushing a revised branch later.

[Rico Tzschichholz (ricotz)]

Check the alignment of "signals[CHANGED] = g_signal_new ("changed", ..." assignments and following

review: Needs Fixing

[Danielle Foré (danrabbit)]

Might be worth being consistent with your email address since you're changing those lines. You have your personal email and also "<email address hidden>" which is a typo :p Either "<email address hidden>" or @elementary.io would work ;)

[Jeremy Wootten (jeremywootten)]

Dan, Rico - thanks. I have made the changes you pointed out.

[Rico Tzschichholz (ricotz)]

Double-check the alignment of occurrences of "signals[CHANGED] = g_signal_new ("changed", ..." assignments and following

review: Needs Fixing

[lp:~jeremywootten/pantheon-files/split-view-preparation-code-clean]

1813. By Jeremy Wootten on 2015-05-09

Fix alignment in marlin-progress-info.c

[Jeremy Wootten (jeremywootten)]

Alignment in marlin-progress-info fixed.

[Cody Garver (codygarver)]

review: Approve

=== modified file 'libcore/AbstractSidebar.vala'
--- libcore/AbstractSidebar.vala	2015-04-03 17:29:50 +0000
+++ libcore/AbstractSidebar.vala	2015-05-09 10:55:27 +0000
@@ -1,20 +1,20 @@
 /***
-  Copyright (C) 2014 elementary Developers and Jeremy Wootten
-
-  This program is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License version 3, as published
-  by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranties of
-  MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
-
- Authors : Lucas Baudin <[e-mail]>
-           Jeremy Wootten <[e-mail]>
+    Copyright (C) 2015 elementary Developers
+
+    This program is free software: you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License version 3, as published
+    by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranties of
+    MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
+
+    Authors : Lucas Baudin <[e-mail]>
+              Jeremy Wootten <[e-mail]>
 ***/
 
 namespace Marlin {
@@ -76,7 +76,7 @@
                                         typeof (bool),              /* Show spinner */
                                         typeof (uint),              /* Spinner pulse */
                                         typeof (uint64),            /* Free space */
-                                        typeof (uint64),             /* For disks, total size */
+                                        typeof (uint64),            /* For disks, total size */
                                         typeof (Marlin.PluginCallbackFunc)
                                         );
 

=== modified file 'libcore/AbstractSlot.vala'
--- libcore/AbstractSlot.vala	2015-04-06 10:43:26 +0000
+++ libcore/AbstractSlot.vala	2015-05-09 10:55:27 +0000
@@ -1,20 +1,20 @@
 /***
-  Copyright (C) 2014 elementary Developers and Jeremy Wootten
-
-  This program is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License version 3, as published
-  by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranties of
-  MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
-
- Authors : Lucas Baudin <[e-mail]>
-           Jeremy Wootten <[e-mail]>
+    Copyright (C) 2015 elementary Developers
+
+    This program is free software: you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License version 3, as published
+    by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranties of
+    MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
+
+    Authors : Lucas Baudin <[e-mail]>
+              Jeremy Wootten <[e-mail]>
 ***/
 
 namespace GOF {

=== modified file 'libcore/CMakeLists.txt'
--- libcore/CMakeLists.txt	2014-08-23 11:50:48 +0000
+++ libcore/CMakeLists.txt	2015-05-09 10:55:27 +0000
@@ -107,16 +107,16 @@
 
 find_package(PkgConfig)
 pkg_check_modules(DEPS REQUIRED
-	glib-2.0>=2.29.0
-	gthread-2.0
-	gio-2.0
-	pango>=1.1.2
-	gtk+-3.0>=3.4.0
-	gail-3.0
+    glib-2.0>=2.29.0
+    gthread-2.0
+    gio-2.0
+    pango>=1.1.2
+    gtk+-3.0>=3.4.0
+    gail-3.0
     gee-0.8
     gmodule-2.0
-	sqlite3
-	libnotify>=0.7.2)
+    sqlite3
+    libnotify>=0.7.2)
 # Link all
 
 set(CFLAGS ${DEPS_CFLAGS} ${DEPS_CFLAGS_OTHER})

=== modified file 'libcore/PluginManager.vala'
--- libcore/PluginManager.vala	2014-10-09 12:36:25 +0000
+++ libcore/PluginManager.vala	2015-05-09 10:55:27 +0000
@@ -1,23 +1,23 @@
-/*
- * Copyright (C) 2011 Lucas Baudin <[e-mail]>
- *
- * Author: Zeeshan Ali (Khattak) <[e-mail]> (from Rygel)
- *
- * This file is part of Marlin.
- *
- * Marlin 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 3 of the License, or
- * (at your option) any later version.
- *
- * Marlin is distributed in the hope that it will be useful, but
- * 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, see <http://www.gnu.org/licenses/>.
- */
+/***
+    Copyright (C) 2011 Lucas Baudin <[e-mail]>
+
+    Author: Zeeshan Ali (Khattak) <[e-mail]> (from Rygel)
+
+    This file is part of Marlin.
+
+    Marlin 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 3 of the License, or
+    (at your option) any later version.
+
+    Marlin is distributed in the hope that it will be useful, but
+    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, see <http://www.gnu.org/licenses/>.
+***/
 
 public static Marlin.PluginManager plugins;
 
@@ -30,7 +30,7 @@
     bool update_queued = false;
 
     [Deprecated (replacement = "Marlin.PluginManager.menuitem_references")]
-    public GLib.List<Gtk.Widget>? menus; // this doesn't manage GObject references properly
+    public GLib.List<Gtk.Widget>? menus; /* this doesn't manage GObject references properly */
 
     public Gee.List<Gtk.Widget> menuitem_references { get; private set; }
 
@@ -48,7 +48,7 @@
 
         load_plugins ();
 
-        // Monitor plugin dirs
+        /* Monitor plugin dirs */
         foreach (string path in plugin_dirs)
             set_directory_monitor (path);
     }
@@ -66,7 +66,7 @@
         try {
             var monitor = dir.monitor_directory (FileMonitorFlags.NONE, null);
             monitor.changed.connect (on_plugin_directory_change);
-            monitor.ref (); // keep alive
+            monitor.ref (); /* keep alive */
         } catch (IOError e) {
             critical ("Could not setup monitor for '%s': %s", dir.get_path (), e.message);
         }
@@ -223,10 +223,7 @@
 
     public void update_file_info (GOF.File file) {
         foreach (var plugin in plugin_hash.values)
-            /*Idle.add (() => {*/
-                plugin.update_file_info (file);
-                /*return false;
-            });*/
+            plugin.update_file_info (file);
     }
 
     public Gee.List<string> get_available_plugins () {

=== modified file 'libcore/eel-accessibility.c'
--- libcore/eel-accessibility.c	2013-09-09 03:08:16 +0000
+++ libcore/eel-accessibility.c	2015-05-09 10:55:27 +0000
@@ -18,9 +18,8 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 
-   Authors:
-	Anders Carlsson <[e-mail]>
-	Michael Meeks   <[e-mail]>
+   Authors:  Anders Carlsson <[e-mail]>
+             Michael Meeks   <[e-mail]>
 */
 #include <gtk/gtk.h>
 #include <atk/atkrelationset.h>
@@ -29,16 +28,16 @@
 void
 eel_accessibility_set_up_label_widget_relation (GtkWidget *label, GtkWidget *widget)
 {
-	AtkObject *atk_widget, *atk_label;
-
-	atk_label = gtk_widget_get_accessible (label);
-	atk_widget = gtk_widget_get_accessible (widget);
-
-	/* Create the label -> widget relation */
-	atk_object_add_relationship (atk_label, ATK_RELATION_LABEL_FOR, atk_widget);
-
-	/* Create the widget -> label relation */
-	atk_object_add_relationship (atk_widget, ATK_RELATION_LABELLED_BY, atk_label);
+    AtkObject *atk_widget, *atk_label;
+
+    atk_label = gtk_widget_get_accessible (label);
+    atk_widget = gtk_widget_get_accessible (widget);
+
+    /* Create the label -> widget relation */
+    atk_object_add_relationship (atk_label, ATK_RELATION_LABEL_FOR, atk_widget);
+
+    /* Create the widget -> label relation */
+    atk_object_add_relationship (atk_widget, ATK_RELATION_LABELLED_BY, atk_label);
 }
 
 /*
@@ -64,76 +63,72 @@
  **/
 GType
 eel_accessibility_create_derived_type (const char *type_name,
-				       GType existing_gobject_with_proxy,
-				       EelAccessibilityClassInitFn class_init)
+                                       GType existing_gobject_with_proxy,
+                                       EelAccessibilityClassInitFn class_init)
 {
-	GType type;
-	GType parent_atk_type;
-	GTypeInfo tinfo = { 0 };
-	GTypeQuery query;
-	AtkObjectFactory *factory;
-
-	if ((type = g_type_from_name (type_name))) {
-		return type;
-	}
-
-	factory = atk_registry_get_factory
-		(atk_get_default_registry (),
-		 existing_gobject_with_proxy);
-	if (!factory) {
-		return G_TYPE_INVALID;
-	}
-	
-	parent_atk_type = atk_object_factory_get_accessible_type (factory);
-	if (!parent_atk_type) {
-		return G_TYPE_INVALID;
-	}
-
-	/*
-	 * Figure out the size of the class and instance
-	 * we are deriving from
-	 */
-	g_type_query (parent_atk_type, &query);
-
-	if (class_init) {
-		tinfo.class_init = (GClassInitFunc) class_init;
-	}
-
-	tinfo.class_size    = query.class_size;
-	tinfo.instance_size = query.instance_size;
-
-	/* Register the type */
-	type = g_type_register_static (
-		parent_atk_type, type_name, &tinfo, 0);
-
-	return type;
+    GType type;
+    GType parent_atk_type;
+    GTypeInfo tinfo = { 0 };
+    GTypeQuery query;
+    AtkObjectFactory *factory;
+
+    if ((type = g_type_from_name (type_name))) {
+        return type;
+    }
+
+    factory = atk_registry_get_factory (atk_get_default_registry (),
+                                        existing_gobject_with_proxy);
+    if (!factory) {
+        return G_TYPE_INVALID;
+    }
+
+    parent_atk_type = atk_object_factory_get_accessible_type (factory);
+    if (!parent_atk_type) {
+        return G_TYPE_INVALID;
+    }
+
+    /*
+     * Figure out the size of the class and instance
+     * we are deriving from
+     */
+    g_type_query (parent_atk_type, &query);
+
+    if (class_init) {
+        tinfo.class_init = (GClassInitFunc) class_init;
+    }
+
+    tinfo.class_size    = query.class_size;
+    tinfo.instance_size = query.instance_size;
+
+    /* Register the type */
+    type = g_type_register_static (parent_atk_type, type_name, &tinfo, 0);
+
+    return type;
 }
 
 
 static GQuark
 get_quark_accessible (void)
 {
-	static GQuark quark_accessible_object = 0;
-
-	if (!quark_accessible_object) {
-		quark_accessible_object = g_quark_from_static_string
-			("accessible-object");
-	}
-
-	return quark_accessible_object;
+    static GQuark quark_accessible_object = 0;
+
+    if (!quark_accessible_object) {
+        quark_accessible_object = g_quark_from_static_string ("accessible-object");
+    }
+
+    return quark_accessible_object;
 }
 
 static GQuark
 get_quark_gobject (void)
 {
-	static GQuark quark_accessible_gobject = 0;
-
-	if (!quark_accessible_gobject) {
-		quark_accessible_gobject = g_quark_from_static_string
-			("object-for-accessible");
-	}
-
-	return quark_accessible_gobject;
+    static GQuark quark_accessible_gobject = 0;
+
+    if (!quark_accessible_gobject) {
+        quark_accessible_gobject = g_quark_from_static_string ("object-for-accessible");
+    }
+
+    return quark_accessible_gobject;
 }
 
 /**
@@ -147,7 +142,7 @@
 AtkObject *
 eel_accessibility_get_atk_object (gpointer object)
 {
-	return g_object_get_qdata (object, get_quark_accessible ());
+    return g_object_get_qdata (object, get_quark_accessible ());
 }
 
 /**
@@ -162,10 +157,10 @@
 AtkObject *
 eel_accessibility_for_object (gpointer object)
 {
-	if (GTK_IS_WIDGET (object))
-		return gtk_widget_get_accessible (object);
+    if (GTK_IS_WIDGET (object))
+        return gtk_widget_get_accessible (object);
 
-	return atk_gobject_accessible_for_object (object);
+    return atk_gobject_accessible_for_object (object);
 }
 
 /**
@@ -180,18 +175,16 @@
 gpointer
 eel_accessibility_get_gobject (AtkObject *object)
 {
-	return g_object_get_qdata (G_OBJECT (object), get_quark_gobject ());
+    return g_object_get_qdata (G_OBJECT (object), get_quark_gobject ());
 }
 
 static void
 eel_accessibility_destroy (gpointer data,
-			   GObject *where_the_object_was)
+                           GObject *where_the_object_was)
 {
-	g_object_set_qdata
-		(G_OBJECT (data), get_quark_gobject (), NULL);
-	atk_object_notify_state_change
-		(ATK_OBJECT (data), ATK_STATE_DEFUNCT, TRUE);
-	g_object_unref (data);
+    g_object_set_qdata (G_OBJECT (data), get_quark_gobject (), NULL);
+    atk_object_notify_state_change (ATK_OBJECT (data), ATK_STATE_DEFUNCT, TRUE);
+    g_object_unref (data);
 }
 
 /**
@@ -205,211 +198,204 @@
  **/
 AtkObject *
 eel_accessibility_set_atk_object_return (gpointer   object,
-					 AtkObject *atk_object)
+                                         AtkObject *atk_object)
 {
-	atk_object_initialize (atk_object, object);
-
-	if (!ATK_IS_GOBJECT_ACCESSIBLE (atk_object)) {
-		g_object_set_qdata_full
-			(object, get_quark_accessible (), atk_object,
-			 (GDestroyNotify)eel_accessibility_destroy);
-		g_object_set_qdata
-			(G_OBJECT (atk_object), get_quark_gobject (), object);
-	}
-
-	return atk_object;
+    atk_object_initialize (atk_object, object);
+
+    if (!ATK_IS_GOBJECT_ACCESSIBLE (atk_object)) {
+        g_object_set_qdata_full (object, get_quark_accessible (), atk_object,
+                                 (GDestroyNotify)eel_accessibility_destroy);
+
+        g_object_set_qdata (G_OBJECT (atk_object), get_quark_gobject (), object);
+    }
+
+    return atk_object;
 }
 
 static GailTextUtil *
 get_simple_text (gpointer object)
 {
-	GObject *gobject;
-	EelAccessibleTextIface *aif;
-
-	if (GTK_IS_ACCESSIBLE (object)) {
-		gobject = G_OBJECT (gtk_accessible_get_widget (GTK_ACCESSIBLE (object)));
-	} else {
-		gobject = eel_accessibility_get_gobject (object);
-	}
-
-	if (!gobject) {
-		return NULL;
-	}
-
-	aif = EEL_ACCESSIBLE_TEXT_GET_IFACE (gobject);
-	if (!aif) {
-		g_warning ("No accessible text inferface on '%s'",
-			   g_type_name_from_instance ((gpointer) gobject));
-
-	} else if (aif->get_text) {
-		return aif->get_text (gobject);
-	}
-
-	return NULL;
+    GObject *gobject;
+    EelAccessibleTextIface *aif;
+
+    if (GTK_IS_ACCESSIBLE (object)) {
+        gobject = G_OBJECT (gtk_accessible_get_widget (GTK_ACCESSIBLE (object)));
+    } else {
+        gobject = eel_accessibility_get_gobject (object);
+    }
+
+    if (!gobject) {
+        return NULL;
+    }
+
+    aif = EEL_ACCESSIBLE_TEXT_GET_IFACE (gobject);
+    if (!aif) {
+        g_warning ("No accessible text inferface on '%s'",
+                   g_type_name_from_instance ((gpointer) gobject));
+
+    } else if (aif->get_text) {
+        return aif->get_text (gobject);
+    }
+
+    return NULL;
 }
 
 char *
 eel_accessibility_text_get_text (AtkText *text,
-				 gint     start_pos,
-				 gint     end_pos)
+                                 gint     start_pos,
+                                 gint     end_pos)
 {
-	GailTextUtil *util = get_simple_text (text);
-	g_return_val_if_fail (util != NULL, NULL);
+    GailTextUtil *util = get_simple_text (text);
+    g_return_val_if_fail (util != NULL, NULL);
 
-	return gail_text_util_get_substring (util, start_pos, end_pos);
+    return gail_text_util_get_substring (util, start_pos, end_pos);
 }
 
 gunichar
 eel_accessibility_text_get_character_at_offset (AtkText *text,
-						gint     offset)
+                                                gint     offset)
 {
-	char *txt, *index;
-	gint sucks1 = 0, sucks2 = -1;
-	gunichar c;
-	GailTextUtil *util = get_simple_text (text);
-	g_return_val_if_fail (util != NULL, 0);
-
-	txt = gail_text_util_get_substring (util, sucks1, sucks2);
-
-	index = g_utf8_offset_to_pointer (txt, offset);
-	c = g_utf8_get_char (index);
-	g_free (txt);
-
-	return c;
+    char *txt, *index;
+    gint sucks1 = 0, sucks2 = -1;
+    gunichar c;
+    GailTextUtil *util = get_simple_text (text);
+    g_return_val_if_fail (util != NULL, 0);
+
+    txt = gail_text_util_get_substring (util, sucks1, sucks2);
+
+    index = g_utf8_offset_to_pointer (txt, offset);
+    c = g_utf8_get_char (index);
+    g_free (txt);
+
+    return c;
 }
 
 char *
-eel_accessibility_text_get_text_before_offset (AtkText	      *text,
-					       gint            offset,
-					       AtkTextBoundary boundary_type,
-					       gint           *start_offset,
-					       gint           *end_offset)
+eel_accessibility_text_get_text_before_offset (AtkText        *text,
+                                               gint            offset,
+                                               AtkTextBoundary boundary_type,
+                                               gint           *start_offset,
+                                               gint           *end_offset)
 {
-	GailTextUtil *util = get_simple_text (text);
-	g_return_val_if_fail (util != NULL, NULL);
+    GailTextUtil *util = get_simple_text (text);
+    g_return_val_if_fail (util != NULL, NULL);
 
-	return gail_text_util_get_text (
-		util, NULL, GAIL_BEFORE_OFFSET,
-		boundary_type, offset, start_offset, end_offset);
+    return gail_text_util_get_text (util, NULL, GAIL_BEFORE_OFFSET,
+                                    boundary_type, offset, start_offset, end_offset);
 }
 
 char *
 eel_accessibility_text_get_text_at_offset (AtkText        *text,
-					   gint            offset,
-					   AtkTextBoundary boundary_type,
-					   gint           *start_offset,
-					   gint           *end_offset)
+                                           gint            offset,
+                                           AtkTextBoundary boundary_type,
+                                           gint           *start_offset,
+                                           gint           *end_offset)
 {
-	GailTextUtil *util = get_simple_text (text);
-	g_return_val_if_fail (util != NULL, NULL);
+    GailTextUtil *util = get_simple_text (text);
+    g_return_val_if_fail (util != NULL, NULL);
 
-	return gail_text_util_get_text (
-		util, NULL, GAIL_AT_OFFSET,
-		boundary_type, offset, start_offset, end_offset);
+    return gail_text_util_get_text (util, NULL, GAIL_AT_OFFSET,
+                                    boundary_type, offset, start_offset, end_offset);
 }
 
 gchar*
-eel_accessibility_text_get_text_after_offset  (AtkText	      *text,
-					       gint            offset,
-					       AtkTextBoundary boundary_type,
-					       gint           *start_offset,
-					       gint           *end_offset)
+eel_accessibility_text_get_text_after_offset  (AtkText        *text,
+                                               gint            offset,
+                                               AtkTextBoundary boundary_type,
+                                               gint           *start_offset,
+                                               gint           *end_offset)
 {
-	GailTextUtil *util = get_simple_text (text);
-	g_return_val_if_fail (util != NULL, NULL);
+    GailTextUtil *util = get_simple_text (text);
+    g_return_val_if_fail (util != NULL, NULL);
 
-	return gail_text_util_get_text (
-		util, NULL, GAIL_AFTER_OFFSET,
-		boundary_type, offset, start_offset, end_offset);
+    return gail_text_util_get_text (util, NULL, GAIL_AFTER_OFFSET,
+                                    boundary_type, offset, start_offset, end_offset);
 }
 
 gint
 eel_accessibility_text_get_character_count (AtkText *text)
 {
-	GailTextUtil *util = get_simple_text (text);
-	g_return_val_if_fail (util != NULL, -1);
+    GailTextUtil *util = get_simple_text (text);
+    g_return_val_if_fail (util != NULL, -1);
 
-	return gtk_text_buffer_get_char_count (util->buffer);
+    return gtk_text_buffer_get_char_count (util->buffer);
 }
 
 static void
 eel_accessibility_simple_text_interface_init (AtkTextIface *iface)
 {
-	iface->get_text                = eel_accessibility_text_get_text;
-	iface->get_character_at_offset = eel_accessibility_text_get_character_at_offset;
-	iface->get_text_before_offset  = eel_accessibility_text_get_text_before_offset;
-	iface->get_text_at_offset      = eel_accessibility_text_get_text_at_offset;
-	iface->get_text_after_offset   = eel_accessibility_text_get_text_after_offset;
-	iface->get_character_count     = eel_accessibility_text_get_character_count;
+    iface->get_text                = eel_accessibility_text_get_text;
+    iface->get_character_at_offset = eel_accessibility_text_get_character_at_offset;
+    iface->get_text_before_offset  = eel_accessibility_text_get_text_before_offset;
+    iface->get_text_at_offset      = eel_accessibility_text_get_text_at_offset;
+    iface->get_text_after_offset   = eel_accessibility_text_get_text_after_offset;
+    iface->get_character_count     = eel_accessibility_text_get_character_count;
 
-/*	iface->get_caret_offset = eel_accessibility_text_get_caret_offset;
-	iface->set_caret_offset = eel_accessibility_text_set_caret_offset;
-	iface->get_selection = eel_accessibility_text_get_selection;
-	iface->get_n_selections = eel_accessibility_text_get_n_selections;
-	iface->add_selection = eel_accessibility_text_add_selection;
-	iface->remove_selection = eel_accessibility_text_remove_selection;
-	iface->set_selection = eel_accessibility_text_set_selection;
-	iface->get_run_attributes = eel_accessibility_text_get_run_attributes;
-	iface->get_default_attributes = eel_accessibility_text_get_default_attributes;
-	iface->get_character_extents = eel_accessibility_text_get_character_extents;
-	iface->get_offset_at_point = eel_accessibility_text_get_offset_at_point; */
+/*  iface->get_caret_offset = eel_accessibility_text_get_caret_offset;
+    iface->set_caret_offset = eel_accessibility_text_set_caret_offset;
+    iface->get_selection = eel_accessibility_text_get_selection;
+    iface->get_n_selections = eel_accessibility_text_get_n_selections;
+    iface->add_selection = eel_accessibility_text_add_selection;
+    iface->remove_selection = eel_accessibility_text_remove_selection;
+    iface->set_selection = eel_accessibility_text_set_selection;
+    iface->get_run_attributes = eel_accessibility_text_get_run_attributes;
+    iface->get_default_attributes = eel_accessibility_text_get_default_attributes;
+    iface->get_character_extents = eel_accessibility_text_get_character_extents;
+    iface->get_offset_at_point = eel_accessibility_text_get_offset_at_point; */
 }
 
 void
 eel_accessibility_add_simple_text (GType type)
 {
-	const GInterfaceInfo simple_text_info = {
-		(GInterfaceInitFunc)
-		eel_accessibility_simple_text_interface_init,
-		(GInterfaceFinalizeFunc) NULL,
-		NULL
-	};
-
-	g_return_if_fail (type != G_TYPE_INVALID);
-
-	g_type_add_interface_static (
-		type, ATK_TYPE_TEXT, &simple_text_info);
+    const GInterfaceInfo simple_text_info = {
+        (GInterfaceInitFunc) eel_accessibility_simple_text_interface_init,
+        (GInterfaceFinalizeFunc) NULL,
+        NULL
+    };
+
+    g_return_if_fail (type != G_TYPE_INVALID);
+
+    g_type_add_interface_static (type, ATK_TYPE_TEXT, &simple_text_info);
 }
 
 GType
 eel_accessible_text_get_type (void)
 {
-	static GType type = 0;
-
-	if (!type) {
-		const GTypeInfo tinfo = {
-			sizeof (AtkTextIface),
-			(GBaseInitFunc) NULL,
-			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) NULL,
-			(GClassFinalizeFunc) NULL
-		};
-
-		type = g_type_register_static (
-			G_TYPE_INTERFACE, "EelAccessibleText", &tinfo, 0);
-	}
-
-	return type;
+    static GType type = 0;
+
+    if (!type) {
+        const GTypeInfo tinfo = {
+            sizeof (AtkTextIface),
+            (GBaseInitFunc) NULL,
+            (GBaseFinalizeFunc) NULL,
+            (GClassInitFunc) NULL,
+            (GClassFinalizeFunc) NULL
+        };
+
+        type = g_type_register_static ( G_TYPE_INTERFACE, "EelAccessibleText", &tinfo, 0);
+    }
+
+    return type;
 }
 
 void
 eel_accessibility_set_name (gpointer    object,
-			    const char *name)
+                            const char *name)
 {
-	AtkObject *atk_object = eel_accessibility_for_object (object);
+    AtkObject *atk_object = eel_accessibility_for_object (object);
 
-	if (atk_object) {
-		atk_object_set_name (atk_object, name);
-	}
+    if (atk_object) {
+        atk_object_set_name (atk_object, name);
+    }
 }
 
 void
 eel_accessibility_set_description (gpointer    object,
-				   const char *description)
+                                   const char *description)
 {
-	AtkObject *atk_object = eel_accessibility_for_object (object);
+    AtkObject *atk_object = eel_accessibility_for_object (object);
 
-	if (atk_object) {
-		atk_object_set_description (atk_object, description);
-	}
+    if (atk_object) {
+        atk_object_set_description (atk_object, description);
+    }
 }

=== modified file 'libcore/eel-accessibility.h'
--- libcore/eel-accessibility.h	2013-08-10 20:20:23 +0000
+++ libcore/eel-accessibility.h	2015-05-09 10:55:27 +0000
@@ -39,14 +39,14 @@
 AtkObject    *eel_accessibility_for_object            (gpointer              object);
 gpointer      eel_accessibility_get_gobject           (AtkObject            *object);
 AtkObject    *eel_accessibility_set_atk_object_return (gpointer              object,
-						       AtkObject            *atk_object);
+                                                       AtkObject            *atk_object);
 GType         eel_accessibility_create_derived_type   (const char           *type_name,
-						       GType                 existing_gobject_with_proxy,
-						       EelAccessibilityClassInitFn class_init);
+                                                       GType                existing_gobject_with_proxy,
+                                                       EelAccessibilityClassInitFn class_init);
 void          eel_accessibility_set_name              (gpointer              object,
-						       const char           *name);
+                                                       const char           *name);
 void          eel_accessibility_set_description       (gpointer              object,
-						       const char           *description);
+                                                       const char           *description);
 
 char*         eel_accessibility_text_get_text         (AtkText              *text,
                                                        gint                 start_pos,
@@ -85,68 +85,68 @@
 typedef struct _EelAccessibleText EelAccessibleText;
 
 typedef struct {
-	GTypeInterface parent;
-	
-	GailTextUtil *(*get_text)   (GObject *text);
-	PangoLayout  *(*get_layout) (GObject *text);
+    GTypeInterface parent;
+
+    GailTextUtil *(*get_text)   (GObject *text);
+    PangoLayout  *(*get_layout) (GObject *text);
 } EelAccessibleTextIface;
 
 GType eel_accessible_text_get_type      (void);
 void  eel_accessibility_add_simple_text (GType type);
 
 /* From gail - should be unneccessary when AtkObjectFactory is fixed */
-#define EEL_ACCESSIBLE_FACTORY(type, factory_name, type_as_function, opt_create_accessible)	\
-										\
-static GType									\
-type_as_function ## _factory_get_accessible_type (void)				\
-{										\
-  return type;									\
-}										\
-										\
-static AtkObject*								\
-type_as_function ## _factory_create_accessible (GObject *obj)			\
-{										\
-  AtkObject *accessible;							\
-										\
-  g_assert (G_IS_OBJECT (obj));  						\
-										\
-  accessible = opt_create_accessible (obj);					\
-										\
-  return accessible;								\
-}										\
-										\
-static void									\
-type_as_function ## _factory_class_init (AtkObjectFactoryClass *klass)		\
-{										\
-  klass->create_accessible   = type_as_function ## _factory_create_accessible;	\
-  klass->get_accessible_type = type_as_function ## _factory_get_accessible_type;\
-}										\
-										\
-static GType									\
-type_as_function ## _factory_get_type (void)					\
-{										\
-  static GType t = 0;								\
-										\
-  if (!t)									\
-  {										\
-    static const GTypeInfo tinfo =						\
-    {										\
-      sizeof (AtkObjectFactoryClass),					\
-      NULL, NULL, (GClassInitFunc) type_as_function ## _factory_class_init,			\
-      NULL, NULL, sizeof (AtkObjectFactory), 0, NULL, NULL			\
-    };										\
-										\
-    t = g_type_register_static (						\
-	    ATK_TYPE_OBJECT_FACTORY, factory_name, &tinfo, 0);			\
-  }										\
-										\
-  return t;									\
+#define EEL_ACCESSIBLE_FACTORY(type, factory_name, type_as_function, opt_create_accessible) \
+                                                                                            \
+static GType                                                                                \
+type_as_function ## _factory_get_accessible_type (void)                                     \
+{                                                                                           \
+  return type;                                                                              \
+}                                                                                           \
+                                                                                            \
+static AtkObject*                                                                           \
+type_as_function ## _factory_create_accessible (GObject *obj)                               \
+{                                                                                           \
+  AtkObject *accessible;                                                                    \
+                                                                                            \
+  g_assert (G_IS_OBJECT (obj));                                                             \
+                                                                                            \
+  accessible = opt_create_accessible (obj);                                                 \
+                                                                                            \
+  return accessible;                                                                        \
+}                                                                                           \
+                                                                                            \
+static void                                                                                 \
+type_as_function ## _factory_class_init (AtkObjectFactoryClass *klass)                      \
+{                                                                                           \
+  klass->create_accessible   = type_as_function ## _factory_create_accessible;              \
+  klass->get_accessible_type = type_as_function ## _factory_get_accessible_type;            \
+}                                                                                           \
+                                                                                            \
+static GType                                                                                \
+type_as_function ## _factory_get_type (void)                                                \
+{                                                                                           \
+  static GType t = 0;                                                                       \
+                                                                                            \
+  if (!t)                                                                                   \
+  {                                                                                         \
+    static const GTypeInfo tinfo =                                                          \
+    {                                                                                       \
+      sizeof (AtkObjectFactoryClass),                                                       \
+      NULL, NULL, (GClassInitFunc) type_as_function ## _factory_class_init,                 \
+      NULL, NULL, sizeof (AtkObjectFactory), 0, NULL, NULL                                  \
+    };                                                                                      \
+                                                                                            \
+    t = g_type_register_static (                                                            \
+        ATK_TYPE_OBJECT_FACTORY, factory_name, &tinfo, 0);                                  \
+  }                                                                                         \
+                                                                                            \
+  return t;                                                                                 \
 }
 
-#define EEL_OBJECT_SET_FACTORY(object_type, type_as_function)			\
-	atk_registry_set_factory_type (atk_get_default_registry (),		\
-				       object_type,				\
-				       type_as_function ## _factory_get_type ())
+#define EEL_OBJECT_SET_FACTORY(object_type, type_as_function)           \
+    atk_registry_set_factory_type (atk_get_default_registry (),         \
+                       object_type,                                     \
+                       type_as_function ## _factory_get_type ())
 
 
 #endif /* EEL_ACCESSIBILITY_H */

=== modified file 'libcore/eel-debug.c'
--- libcore/eel-debug.c	2013-09-09 03:08:16 +0000
+++ libcore/eel-debug.c	2015-05-09 10:55:27 +0000
@@ -29,8 +29,8 @@
 #include <stdio.h>
 
 typedef struct {
-	gpointer data;
-	GFreeFunc function;
+    gpointer data;
+    GFreeFunc function;
 } ShutdownFunction;
 
 static GList *shutdown_functions;
@@ -38,30 +38,30 @@
 void
 eel_debug_shut_down (void)
 {
-	ShutdownFunction *f;
-
-	while (shutdown_functions != NULL) {
-		f = shutdown_functions->data;
-		shutdown_functions = g_list_remove (shutdown_functions, f);
-		
-		f->function (f->data);
-		g_free (f);
-	}
+    ShutdownFunction *f;
+
+    while (shutdown_functions != NULL) {
+        f = shutdown_functions->data;
+        shutdown_functions = g_list_remove (shutdown_functions, f);
+
+        f->function (f->data);
+        g_free (f);
+    }
 }
 
 void
 eel_debug_call_at_shutdown (EelFunction function)
 {
-	eel_debug_call_at_shutdown_with_data ((GFreeFunc) function, NULL);
+    eel_debug_call_at_shutdown_with_data ((GFreeFunc) function, NULL);
 }
 
 void
 eel_debug_call_at_shutdown_with_data (GFreeFunc function, gpointer data)
 {
-	ShutdownFunction *f;
+    ShutdownFunction *f;
 
-	f = g_new (ShutdownFunction, 1);
-	f->data = data;
-	f->function = function;
-	shutdown_functions = g_list_prepend (shutdown_functions, f);
+    f = g_new (ShutdownFunction, 1);
+    f->data = data;
+    f->function = function;
+    shutdown_functions = g_list_prepend (shutdown_functions, f);
 }

=== modified file 'libcore/eel-debug.h'
--- libcore/eel-debug.h	2013-08-10 20:20:23 +0000
+++ libcore/eel-debug.h	2015-05-09 10:55:27 +0000
@@ -39,7 +39,7 @@
 void eel_debug_shut_down                              (void);
 void eel_debug_call_at_shutdown                       (EelFunction function);
 void eel_debug_call_at_shutdown_with_data             (GFreeFunc   function,
-						       gpointer    data);
+                                                       gpointer    data);
 
 G_END_DECLS
 

=== modified file 'libcore/eel-fcts.c'
--- libcore/eel-fcts.c	2014-07-09 05:30:17 +0000
+++ libcore/eel-fcts.c	2015-05-09 10:55:27 +0000
@@ -113,17 +113,17 @@
 GList *
 eel_get_user_names (void)
 {
-	GList *list;
-	struct passwd *user;
-
-	list = NULL;
-	setpwent ();
-	while ((user = getpwent ()) != NULL) {
-		list = g_list_prepend (list, g_strdup (user->pw_name));
-	}
-	endpwent ();
-
-	return eel_g_str_list_alphabetize (list);
+    GList *list;
+    struct passwd *user;
+
+    list = NULL;
+    setpwent ();
+    while ((user = getpwent ()) != NULL) {
+        list = g_list_prepend (list, g_strdup (user->pw_name));
+    }
+    endpwent ();
+
+    return eel_g_str_list_alphabetize (list);
 }
 
 /* Get a list of group names, filtered to only the ones
@@ -133,24 +133,24 @@
 GList *
 eel_get_group_names_for_user (void)
 {
-	GList *list;
-	struct group *group;
-	int count, i;
-	gid_t gid_list[NGROUPS_MAX + 1];
-	
-
-	list = NULL;
-
-	count = getgroups (NGROUPS_MAX + 1, gid_list);
-	for (i = 0; i < count; i++) {
-		group = getgrgid (gid_list[i]);
-		if (group == NULL)
-			break;
-		
-		list = g_list_prepend (list, g_strdup (group->gr_name));
-	}
-
-	return eel_g_str_list_alphabetize (list);
+    GList *list;
+    struct group *group;
+    int count, i;
+    gid_t gid_list[NGROUPS_MAX + 1];
+
+
+    list = NULL;
+
+    count = getgroups (NGROUPS_MAX + 1, gid_list);
+    for (i = 0; i < count; i++) {
+        group = getgrgid (gid_list[i]);
+        if (group == NULL)
+            break;
+
+        list = g_list_prepend (list, g_strdup (group->gr_name));
+    }
+
+    return eel_g_str_list_alphabetize (list);
 }
 
 /**
@@ -159,75 +159,75 @@
 GList *
 eel_get_all_group_names (void)
 {
-	GList *list;
-	struct group *group;
-	
-	list = NULL;
-
-	setgrent ();
-	
-	while ((group = getgrent ()) != NULL)
-		list = g_list_prepend (list, g_strdup (group->gr_name));
-	
-	endgrent ();
-	
-	return eel_g_str_list_alphabetize (list);
+    GList *list;
+    struct group *group;
+
+    list = NULL;
+
+    setgrent ();
+
+    while ((group = getgrent ()) != NULL)
+        list = g_list_prepend (list, g_strdup (group->gr_name));
+
+    endgrent ();
+
+    return eel_g_str_list_alphabetize (list);
 }
 
 gboolean
 eel_get_group_id_from_group_name (const char *group_name, uid_t *gid)
 {
-	struct group *group;
-
-	g_assert (gid != NULL);
-
-	group = getgrnam (group_name);
-
-	if (group == NULL)
-		return FALSE;
-
-	*gid = group->gr_gid;
-
-	return TRUE;
+    struct group *group;
+
+    g_assert (gid != NULL);
+
+    group = getgrnam (group_name);
+
+    if (group == NULL)
+        return FALSE;
+
+    *gid = group->gr_gid;
+
+    return TRUE;
 }
 
 gboolean
 eel_get_user_id_from_user_name (const char *user_name, uid_t *uid)
 {
-	struct passwd *password_info;
-
-	g_assert (uid != NULL);
-
-	password_info = getpwnam (user_name);
-
-	if (password_info == NULL)
+    struct passwd *password_info;
+
+    g_assert (uid != NULL);
+
+    password_info = getpwnam (user_name);
+
+    if (password_info == NULL)
         return FALSE;
 
-	*uid = password_info->pw_uid;
+    *uid = password_info->pw_uid;
 
-	return TRUE;
+    return TRUE;
 }
 
 gboolean
 eel_get_id_from_digit_string (const char *digit_string, uid_t *id)
 {
-	long scanned_id;
-	char c;
-
-	g_assert (id != NULL);
-
-	/* Only accept string if it has one integer with nothing
-	 * afterwards.
-	 */
-	if (sscanf (digit_string, "%ld%c", &scanned_id, &c) != 1) {
-		return FALSE;
-	}
-	*id = scanned_id;
-	return TRUE;
+    long scanned_id;
+    char c;
+
+    g_assert (id != NULL);
+
+    /* Only accept string if it has one integer with nothing
+     * afterwards.
+     */
+    if (sscanf (digit_string, "%ld%c", &scanned_id, &c) != 1) {
+        return FALSE;
+    }
+    *id = scanned_id;
+    return TRUE;
 }
 
 gchar
 *eel_format_size (guint64 size)
 {
     return g_format_size (size);
-}
\ No newline at end of file
+}

=== modified file 'libcore/eel-gdk-pixbuf-extensions.c'
--- libcore/eel-gdk-pixbuf-extensions.c	2014-11-21 19:24:45 +0000
+++ libcore/eel-gdk-pixbuf-extensions.c	2015-05-09 10:55:27 +0000
@@ -86,7 +86,7 @@
     for (i = 0; i < height; i++) {
         pixdest = target_pixels + i * dst_row_stride;
         pixsrc = original_pixels + i * src_row_stride;
-        for (j = 0; j < width; j++) {		
+        for (j = 0; j < width; j++) {
             *pixdest++ = lighten_component (*pixsrc++);
             *pixdest++ = lighten_component (*pixsrc++);
             *pixdest++ = lighten_component (*pixsrc++);
@@ -194,7 +194,7 @@
     for (i = 0; i < height; i++) {
         pixdest = target_pixels + i*dst_row_stride;
         pixsrc = original_pixels + i*src_row_stride;
-        for (j = 0; j < width; j++) {		
+        for (j = 0; j < width; j++) {
             *pixdest++ = (*pixsrc++ * red_value) >> 8;
             *pixdest++ = (*pixsrc++ * green_value) >> 8;
             *pixdest++ = (*pixsrc++ * blue_value) >> 8;

=== modified file 'libcore/eel-gio-extensions.c'
--- libcore/eel-gio-extensions.c	2013-08-10 20:20:23 +0000
+++ libcore/eel-gio-extensions.c	2015-05-09 10:55:27 +0000
@@ -74,13 +74,13 @@
 eel_g_file_get_trash_original_file (const gchar *string)
 {
     GFile *location = NULL;
-	char *filename;
+    char *filename;
 
     if (string != NULL) {
         /* file name is stored in URL encoding */
-		filename = g_uri_unescape_string (string, "");
-		location = g_file_new_for_path (filename);
-		g_free (filename);
+        filename = g_uri_unescape_string (string, "");
+        location = g_file_new_for_path (filename);
+        g_free (filename);
     }
 
     return location;

=== modified file 'libcore/eel-glib-extensions.c'
--- libcore/eel-glib-extensions.c	2013-08-10 20:20:23 +0000
+++ libcore/eel-glib-extensions.c	2015-05-09 10:55:27 +0000
@@ -92,7 +92,7 @@
 
     g_return_if_fail (pointer_location != NULL);
 
-    object_location = (gpointer *) pointer_location;	
+    object_location = (gpointer *) pointer_location;
     if (*object_location == NULL) {
         /* The object was already destroyed and the reference
          * nulled out, nothing to do.
@@ -145,7 +145,7 @@
 GList *
 eel_g_str_list_alphabetize (GList *list)
 {
-	return g_list_sort (list, (GCompareFunc) g_utf8_collate);
+    return g_list_sort (list, (GCompareFunc) g_utf8_collate);
 }
 
 

=== modified file 'libcore/eel-gtk-extensions.c'
--- libcore/eel-gtk-extensions.c	2014-07-03 16:08:14 +0000
+++ libcore/eel-gtk-extensions.c	2015-05-09 10:55:27 +0000
@@ -138,9 +138,9 @@
  * @event: The event that invoked this popup menu.
 **/
 void
-eel_pop_up_context_menu (GtkMenu	     *menu,
-                         gint16	      offset_x,
-                         gint16	      offset_y,
+eel_pop_up_context_menu (GtkMenu         *menu,
+                         gint16       offset_x,
+                         gint16       offset_y,
                          GdkEventButton *event)
 {
     GdkPoint offset;
@@ -165,12 +165,12 @@
         button = 0;
     }
 
-    gtk_menu_popup (menu,					/* menu */
-                    NULL,					/* parent_menu_shell */
-                    NULL,					/* parent_menu_item */
+    gtk_menu_popup (menu,                   /* menu */
+                    NULL,                   /* parent_menu_shell */
+                    NULL,                   /* parent_menu_item */
                     NULL,
-                    &offset,			        /* data */
-                    button,					/* button */
+                    &offset,                /* data */
+                    button,                 /* button */
                     event ? event->time : GDK_CURRENT_TIME); /* activate_time */
 
     g_object_ref_sink (menu);

=== modified file 'libcore/eel-gtk-extensions.h'
--- libcore/eel-gtk-extensions.h	2014-07-03 16:08:14 +0000
+++ libcore/eel-gtk-extensions.h	2015-05-09 10:55:27 +0000
@@ -1,6 +1,6 @@
 /* eel-gtk-extensions.h - interface for new functions that operate on
-  			       gtk classes. Perhaps some of these should be
-  			       rolled into gtk someday.
+                   gtk classes. Perhaps some of these should be
+                   rolled into gtk someday.
 
    Copyright (C) 1999, 2000, 2001 Eazel, Inc.
 
@@ -28,13 +28,13 @@
 
 #include <gtk/gtk.h>
 
-#define EEL_DEFAULT_POPUP_MENU_DISPLACEMENT 	2
+#define EEL_DEFAULT_POPUP_MENU_DISPLACEMENT     2
 
 GtkMenuItem *eel_gtk_menu_append_separator (GtkMenu *menu);
 
-void        eel_pop_up_context_menu (GtkMenu	     *menu,
-                                     gint16	      offset_x,
-                                     gint16	      offset_y,
+void        eel_pop_up_context_menu (GtkMenu         *menu,
+                                     gint16       offset_x,
+                                     gint16       offset_y,
                                      GdkEventButton *event);
 void        eel_gtk_widget_set_shown (GtkWidget *widget, gboolean shown);
 

=== modified file 'libcore/eel-pango-extensions.c'
--- libcore/eel-pango-extensions.c	2013-08-10 20:20:23 +0000
+++ libcore/eel-pango-extensions.c	2015-05-09 10:55:27 +0000
@@ -73,6 +73,7 @@
     static PangoAttrList *attr_list = NULL;
     if (G_UNLIKELY (attr_list == NULL))
         attr_list = eel_pango_attr_list_wrap (pango_attr_scale_new (PANGO_SCALE_LARGE), NULL);
+
     return attr_list;
 }
 
@@ -93,6 +94,7 @@
     static PangoAttrList *attr_list = NULL;
     if (G_UNLIKELY (attr_list == NULL))
         attr_list = eel_pango_attr_list_wrap (pango_attr_scale_new (PANGO_SCALE_SMALL), NULL);
+
     return attr_list;
 }
 
@@ -112,7 +114,8 @@
 {
     static PangoAttrList *attr_list = NULL;
     if (G_UNLIKELY (attr_list == NULL))
-        attr_list = eel_pango_attr_list_wrap (pango_attr_scale_new (PANGO_SCALE_LARGE), pango_attr_weight_new (PANGO_WEIGHT_BOLD), NULL);
+        attr_list = eel_pango_attr_list_wrap (pango_attr_scale_new (PANGO_SCALE_LARGE),
+                                              pango_attr_weight_new (PANGO_WEIGHT_BOLD), NULL);
     return attr_list;
 }
 
@@ -133,6 +136,7 @@
     static PangoAttrList *attr_list = NULL;
     if (G_UNLIKELY (attr_list == NULL))
         attr_list = eel_pango_attr_list_wrap (pango_attr_weight_new (PANGO_WEIGHT_BOLD), NULL);
+
     return attr_list;
 }
 
@@ -153,6 +157,7 @@
     static PangoAttrList *attr_list = NULL;
     if (G_UNLIKELY (attr_list == NULL))
         attr_list = eel_pango_attr_list_wrap (pango_attr_style_new (PANGO_STYLE_ITALIC), NULL);
+
     return attr_list;
 }
 
@@ -172,7 +177,8 @@
 {
     static PangoAttrList *attr_list = NULL;
     if (G_UNLIKELY (attr_list == NULL))
-        attr_list = eel_pango_attr_list_wrap (pango_attr_scale_new (PANGO_SCALE_SMALL), pango_attr_style_new (PANGO_STYLE_ITALIC), NULL);
+        attr_list = eel_pango_attr_list_wrap (pango_attr_scale_new (PANGO_SCALE_SMALL),
+                                              pango_attr_style_new (PANGO_STYLE_ITALIC), NULL);
     return attr_list;
 }
 
@@ -193,6 +199,7 @@
     static PangoAttrList *attr_list = NULL;
     if (G_UNLIKELY (attr_list == NULL))
         attr_list = eel_pango_attr_list_wrap (pango_attr_underline_new (PANGO_UNDERLINE_SINGLE), NULL);
+
     return attr_list;
 }
 

=== modified file 'libcore/eel-stock-dialogs.c'
--- libcore/eel-stock-dialogs.c	2014-08-13 10:40:54 +0000
+++ libcore/eel-stock-dialogs.c	2015-05-09 10:55:27 +0000
@@ -88,9 +88,9 @@
                          const char *secondary_text,
                          GtkWindow *parent)
 {
-	return show_ok_dialog (primary_text,
-			       secondary_text,
-			       GTK_MESSAGE_WARNING, parent);
+    return show_ok_dialog (primary_text,
+                           secondary_text,
+                           GTK_MESSAGE_WARNING, parent);
 }
 
 //TODO merge with marlin_dialogs_show_error

=== modified file 'libcore/eel-ui.c'
--- libcore/eel-ui.c	2014-08-05 22:40:12 +0000
+++ libcore/eel-ui.c	2015-05-09 10:55:27 +0000
@@ -49,11 +49,11 @@
                          guint *merge_id,
                          GtkActionGroup **action_group)
 {
-	*merge_id = gtk_ui_manager_new_merge_id (ui_manager);
-	*action_group = gtk_action_group_new (name);
-	gtk_action_group_set_translation_domain (*action_group, GETTEXT_PACKAGE);
-	gtk_ui_manager_insert_action_group (ui_manager, *action_group, 0);
-	g_object_unref (*action_group); /* owned by ui manager */
+    *merge_id = gtk_ui_manager_new_merge_id (ui_manager);
+    *action_group = gtk_action_group_new (name);
+    gtk_action_group_set_translation_domain (*action_group, GETTEXT_PACKAGE);
+    gtk_ui_manager_insert_action_group (ui_manager, *action_group, 0);
+    g_object_unref (*action_group); /* owned by ui manager */
 }
 
 

=== modified file 'libcore/eel-vfs-extensions.c'
--- libcore/eel-vfs-extensions.c	2013-09-09 03:08:16 +0000
+++ libcore/eel-vfs-extensions.c	2015-05-09 10:55:27 +0000
@@ -19,8 +19,8 @@
  * Boston, MA 02111-1307, USA.
  *
  * Authors: Darin Adler <[e-mail]>
- *	    Pavel Cisler <[e-mail]>
- *	    Mike Fleming  <[e-mail]>
+ *          Pavel Cisler <[e-mail]>
+ *          Mike Fleming  <[e-mail]>
  *          John Sullivan <[e-mail]>
  */
 

=== modified file 'libcore/eel-vfs-extensions.h'
--- libcore/eel-vfs-extensions.h	2013-08-10 20:20:23 +0000
+++ libcore/eel-vfs-extensions.h	2015-05-09 10:55:27 +0000
@@ -19,8 +19,8 @@
  * Boston, MA 02111-1307, USA.
  *
  * Authors: Darin Adler <[e-mail]>
- *	    Pavel Cisler <[e-mail]>
- *	    Mike Fleming  <[e-mail]>
+ *          Pavel Cisler <[e-mail]>
+ *          Mike Fleming  <[e-mail]>
  *          John Sullivan <[e-mail]>
  */
 
@@ -31,7 +31,7 @@
 
 G_BEGIN_DECLS
 
-/*#define	EEL_TRASH_URI "trash:"
+/*#define   EEL_TRASH_URI "trash:"
 #define EEL_DESKTOP_URI "x-nautilus-desktop:"
 #define EEL_SEARCH_URI "x-nautilus-search:"*/
 

=== modified file 'libcore/fm-list-model.c'
--- libcore/fm-list-model.c	2014-12-07 19:39:22 +0000
+++ libcore/fm-list-model.c	2015-05-09 10:55:27 +0000
@@ -64,7 +64,7 @@
 struct FMListModelDetails {
     GSequence *files;
     GHashTable *directory_reverse_map; /* map from directory to GSequenceIter's */
-    GHashTable *top_reverse_map;	   /* map from files in top dir to GSequenceIter's */
+    GHashTable *top_reverse_map;       /* map from files in top dir to GSequenceIter's */
 
     int stamp;
     gboolean        has_child;
@@ -79,7 +79,7 @@
 
 struct FileEntry {
     GOFFile *file;
-    GHashTable *reverse_map;	/* map from files to GSequenceIter's */
+    GHashTable *reverse_map;    /* map from files to GSequenceIter's */
     GOFDirectoryAsync *subdirectory;
     FileEntry *parent;
     GSequence *files;
@@ -1304,7 +1304,7 @@
 
 typedef struct {
     const gchar *name;
-    gint	    value;
+    gint        value;
 } ColumnsEnum;
 
 static const ColumnsEnum columnsview[] = {

=== modified file 'libcore/gof-callwhenready.vala'
--- libcore/gof-callwhenready.vala	2014-12-09 11:38:39 +0000
+++ libcore/gof-callwhenready.vala	2015-05-09 10:55:27 +0000
@@ -1,21 +1,21 @@
-/*
- * Copyright (C) 2011 Marlin Developers
- *
- * 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 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but 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, see <http://www.gnu.org/licenses/>.
- *
- * Author: ammonkey <[e-mail]>
- */
+/***
+    Copyright (C) 2011 Marlin Developers
+
+    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 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but 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, see <http://www.gnu.org/licenses/>.
+
+    Author: ammonkey <[e-mail]>
+***/
 
 GLib.List<GOF.CallWhenReady>? callwhenready_cache = null;
 
@@ -51,7 +51,8 @@
         gof.update ();
     }
 
-    /* TODO move this to GOF.File */
+    /**TODO** move this to GOF.File */
+    
     private unowned string gio_default_attributes = "standard::is-hidden,standard::is-backup,standard::is-symlink,standard::type,standard::name,standard::display-name,standard::fast-content-type,standard::size,standard::symlink-target,access::*,time::*,owner::*,trash::*,unix::*,id::filesystem,thumbnail::*";
 
     private delegate void func_query_info (GOF.File gof);
@@ -80,35 +81,3 @@
         callwhenready_cache.remove (this);
     }
 }
-
-/*public class GOF.CallWhenReadyFile : Object
-{
-    public delegate void call_when_ready_func (GOF.File file);
-
-    private GOF.File call_when_ready_list = null;
-
-
-    public CallWhenReadyFile (GOF.File file, call_when_ready_func? _f = null)
-    {
-        query_info_async (file, _f);
-        //message ("cwr %s", gof.uri);
-    }
-
-    private unowned string gio_default_attributes = "standard::is-hidden,standard::is-backup,standard::is-symlink,standard::type,standard::name,standard::display-name,standard::fast-content-type,standard::size,standard::symlink-target,access::*,time::*,owner::*,trash::*,unix::*,id::filesystem,thumbnail::*";
-
-    private async void query_info_async (GOF.File gof, call_when_ready_func? fqi = null) {
-        try {
-            gof.info = yield gof.location.query_info_async (gio_default_attributes,
-                                                            FileQueryInfoFlags.NONE,
-                                                            Priority.DEFAULT);
-            if (fqi != null)
-                fqi (gof);
-        } catch (Error err) {
-            warning ("query info failed, %s %s", err.message, gof.uri);
-            if (err is IOError.NOT_FOUND)
-                gof.exists = false;
-            if (err is IOError.NOT_MOUNTED)
-                gof.is_mounted = false;
-        }
-    }
-}*/

=== modified file 'libcore/gof-directory-async.vala'
--- libcore/gof-directory-async.vala	2015-04-08 08:06:09 +0000
+++ libcore/gof-directory-async.vala	2015-05-09 10:55:27 +0000
@@ -1,21 +1,21 @@
-/*
- * Copyright (C) 2011 Marlin Developers
- *
- * 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 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but 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, see <http://www.gnu.org/licenses/>.
- *
- * Author: ammonkey <[e-mail]>
- */
+/***
+    Copyright (C) 2011 Marlin Developers
+
+    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 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but 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, see <http://www.gnu.org/licenses/>.
+
+    Author: ammonkey <[e-mail]>
+***/
 
 private HashTable<GLib.File,GOF.Directory.Async> directory_cache;
 private Mutex dir_cache_lock;
@@ -124,12 +124,14 @@
     }
 
     /* This is also called when reloading the directory so that another attempt to connect to
-     * the network is made */
+     * the network is made
+     */
     private bool prepare_directory () {
         if (!get_file_info ()) {
             is_ready = true;
             /* local uris are deemed loadable even if they do not exist
-             * If they do not exist an opportunity will be given to create them */
+             * If they do not exist an opportunity will be given to create them
+             */
             can_load = is_local;
             return false;
         }
@@ -405,7 +407,7 @@
     }
 
     public async void mount_mountable () throws Error {
-        /* TODO pass GtkWindow *parent to Gtk.MountOperation */
+        /**TODO** pass GtkWindow *parent to Gtk.MountOperation */
         var mount_op = new Gtk.MountOperation (null);
         yield location.mount_enclosing_volume (0, mount_op, cancellable);
     }
@@ -510,7 +512,7 @@
         return (!) result;
     }
 
-    /* TODO move this to GOF.File */
+    /**TODO** move this to GOF.File */
     private delegate void func_query_info (GOF.File gof);
 
     private async void query_info_async (GOF.File gof, func_query_info? f = null) {

=== modified file 'libcore/gof-file.c'
--- libcore/gof-file.c	2015-03-26 02:19:38 +0000
+++ libcore/gof-file.c	2015-05-09 10:55:27 +0000
@@ -64,7 +64,7 @@
 static guint32  effective_user_id;
 
 static gpointer _g_object_ref0 (gpointer self) {
-	return self ? g_object_ref (self) : NULL;
+    return self ? g_object_ref (self) : NULL;
 }
 
 const gchar     *gof_file_get_thumbnail_path (GOFFile *file);
@@ -803,9 +803,9 @@
     }
 
     g_list_free_full (mounts, g_object_unref);
-	g_object_unref (monitor);
+    g_object_unref (monitor);
 
-	return found;
+    return found;
 }
 
 static GFileInfo *
@@ -1002,37 +1002,37 @@
     G_OBJECT_CLASS (klass)->finalize = gof_file_finalize;
 
     signals[CHANGED] = g_signal_new ("changed",
-                                    G_TYPE_FROM_CLASS (klass),
-                                    G_SIGNAL_RUN_LAST,
-                                    G_STRUCT_OFFSET (GOFFileClass, changed),
-                                    NULL, NULL,
-                                    g_cclosure_marshal_VOID__VOID,
-                                    G_TYPE_NONE, 0);
+                                     G_TYPE_FROM_CLASS (klass),
+                                     G_SIGNAL_RUN_LAST,
+                                     G_STRUCT_OFFSET (GOFFileClass, changed),
+                                     NULL, NULL,
+                                     g_cclosure_marshal_VOID__VOID,
+                                     G_TYPE_NONE, 0);
 
     signals[DESTROY] = g_signal_new ("destroy",
-                                    G_TYPE_FROM_CLASS (klass),
-                                    G_SIGNAL_RUN_LAST,
-                                    G_STRUCT_OFFSET (GOFFileClass, destroy),
-                                    NULL, NULL,
-                                    g_cclosure_marshal_VOID__VOID,
-                                    G_TYPE_NONE, 0);
+                                     G_TYPE_FROM_CLASS (klass),
+                                     G_SIGNAL_RUN_LAST,
+                                     G_STRUCT_OFFSET (GOFFileClass, destroy),
+                                     NULL, NULL,
+                                     g_cclosure_marshal_VOID__VOID,
+                                     G_TYPE_NONE, 0);
 
 
     signals[INFO_AVAILABLE] = g_signal_new ("info_available",
-                                    G_TYPE_FROM_CLASS (klass),
-                                    G_SIGNAL_RUN_LAST,
-                                    G_STRUCT_OFFSET (GOFFileClass, info_available),
-                                    NULL, NULL,
-                                    g_cclosure_marshal_VOID__VOID,
-                                    G_TYPE_NONE, 0);
+                                             G_TYPE_FROM_CLASS (klass),
+                                             G_SIGNAL_RUN_LAST,
+                                             G_STRUCT_OFFSET (GOFFileClass, info_available),
+                                             NULL, NULL,
+                                             g_cclosure_marshal_VOID__VOID,
+                                             G_TYPE_NONE, 0);
 
     signals[ICON_CHANGED] = g_signal_new ("icon_changed",
-                                    G_TYPE_FROM_CLASS (klass),
-                                    G_SIGNAL_RUN_LAST,
-                                    G_STRUCT_OFFSET (GOFFileClass, icon_changed),
-                                    NULL, NULL,
-                                    g_cclosure_marshal_VOID__VOID,
-                                    G_TYPE_NONE, 0);
+                                          G_TYPE_FROM_CLASS (klass),
+                                          G_SIGNAL_RUN_LAST,
+                                          G_STRUCT_OFFSET (GOFFileClass, icon_changed),
+                                          NULL, NULL,
+                                          g_cclosure_marshal_VOID__VOID,
+                                          G_TYPE_NONE, 0);
 
     /*g_object_class_install_property (G_OBJECT_CLASS (klass), gof_FILE_NAME, g_param_spec_string ("name", "name", "name", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
       g_object_class_install_property (G_OBJECT_CLASS (klass), gof_FILE_SIZE, g_param_spec_uint64 ("size", "size", "size", 0, G_MAXUINT64, 0U, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE));
@@ -1520,7 +1520,7 @@
     GOFDirectoryAsync *dir = NULL;
 
 g_return_val_if_fail (location != NULL && G_IS_FILE (location), NULL);
- 
+
     if ((parent = g_file_get_parent (location)) != NULL) {
         dir = gof_directory_async_cache_lookup (parent);
         if (dir != NULL) {
@@ -2278,10 +2278,10 @@
 {
     /* unknown file uid */
     if (file->uid == -1)
-		return FALSE;
+        return FALSE;
 
-	/* root */
-	return geteuid() == 0;
+    /* root */
+    return geteuid() == 0;
 }
 
 /* copied from nautilus-file.c */
@@ -2300,22 +2300,22 @@
 gboolean
 gof_file_can_set_group (GOFFile *file)
 {
-	uid_t user_id;
-
-	if (file->gid == -1)
-		return FALSE;
-
-	user_id = geteuid();
-
-	/* Owner is allowed to set group (with restrictions). */
-	if (user_id == (uid_t) file->uid)
-		return TRUE;
-
-	/* Root is also allowed to set group. */
-	if (user_id == 0)
-		return TRUE;
-
-	return FALSE;
+    uid_t user_id;
+
+    if (file->gid == -1)
+        return FALSE;
+
+    user_id = geteuid();
+
+    /* Owner is allowed to set group (with restrictions). */
+    if (user_id == (uid_t) file->uid)
+        return TRUE;
+
+    /* Root is also allowed to set group. */
+    if (user_id == 0)
+        return TRUE;
+
+    return FALSE;
 }
 
 /* copied from nautilus-file.c */
@@ -2330,26 +2330,26 @@
 GList *
 gof_file_get_settable_group_names (GOFFile *file)
 {
-	uid_t user_id;
-	GList *result = NULL;
-
-	if (!gof_file_can_set_group (file))
-		return NULL;
-
-	/* Check the user. */
-	user_id = geteuid();
-
-	if (user_id == 0) {
-		/* Root is allowed to set group to anything. */
-		result = eel_get_all_group_names ();
-	} else if (user_id == (uid_t) file->uid) {
-		/* Owner is allowed to set group to any that owner is member of. */
-		result = eel_get_group_names_for_user ();
-	} else {
-		g_warning ("unhandled case in %s", G_STRFUNC);
-	}
-
-	return result;
+    uid_t user_id;
+    GList *result = NULL;
+
+    if (!gof_file_can_set_group (file))
+        return NULL;
+
+    /* Check the user. */
+    user_id = geteuid();
+
+    if (user_id == 0) {
+        /* Root is allowed to set group to anything. */
+        result = eel_get_all_group_names ();
+    } else if (user_id == (uid_t) file->uid) {
+        /* Owner is allowed to set group to any that owner is member of. */
+        result = eel_get_group_names_for_user ();
+    } else {
+        g_warning ("unhandled case in %s", G_STRFUNC);
+    }
+
+    return result;
 }
 
 /* copied from nautilus-file.c */
@@ -2572,9 +2572,9 @@
 gboolean
 gof_file_can_unmount (GOFFile *file)
 {
-	g_return_val_if_fail (GOF_IS_FILE (file), FALSE);
+    g_return_val_if_fail (GOF_IS_FILE (file), FALSE);
 
-	return file->can_unmount || (file->mount != NULL && g_mount_can_unmount (file->mount));
+    return file->can_unmount || (file->mount != NULL && g_mount_can_unmount (file->mount));
 }
 
 gboolean

=== modified file 'libcore/gof-file.h'
--- libcore/gof-file.h	2015-01-09 15:42:09 +0000
+++ libcore/gof-file.h	2015-05-09 10:55:27 +0000
@@ -140,8 +140,8 @@
 #define GOF_FILE_GIO_DEFAULT_ATTRIBUTES "standard::is-hidden,standard::is-backup,standard::is-symlink,standard::type,standard::name,standard::display-name,standard::fast-content-type,standard::size,standard::symlink-target,standard::target-uri,access::*,time::*,owner::*,trash::*,unix::*,id::filesystem,thumbnail::*,mountable::*,metadata::marlin-sort-column-id,metadata::marlin-sort-reversed"
 
 typedef enum {
-	GOF_FILE_ICON_FLAGS_NONE = 0,
-	GOF_FILE_ICON_FLAGS_USE_THUMBNAILS = (1<<0)
+    GOF_FILE_ICON_FLAGS_NONE = 0,
+    GOF_FILE_ICON_FLAGS_USE_THUMBNAILS = (1<<0)
 } GOFFileIconFlags;
 
 typedef void (*GOFFileOperationCallback) (GOFFile  *file,
@@ -150,14 +150,14 @@
                                           gpointer callback_data);
 
 typedef struct {
-	GOFFile *file;
-	GCancellable *cancellable;
-	GOFFileOperationCallback callback;
-	gpointer callback_data;
-	gboolean is_rename;
+    GOFFile *file;
+    GCancellable *cancellable;
+    GOFFileOperationCallback callback;
+    gpointer callback_data;
+    gboolean is_rename;
 
-	gpointer data;
-	GDestroyNotify free_data;
+    gpointer data;
+    GDestroyNotify free_data;
 } GOFFileOperation;
 
 

=== modified file 'libcore/gof-preferences.vala'
--- libcore/gof-preferences.vala	2013-07-21 04:44:33 +0000
+++ libcore/gof-preferences.vala	2015-05-09 10:55:27 +0000
@@ -1,19 +1,19 @@
-/*
- * Copyright (C) 2011 ammonkey <[e-mail]>
- *
- * 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 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but 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, see <http://www.gnu.org/licenses/>.
- */
+/***
+    Copyright (C) 2011 ammonkey <[e-mail]>
+
+    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 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but 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, see <http://www.gnu.org/licenses/>.
+***/
 
 namespace GOF {
 

=== modified file 'libcore/marlin-file-changes-queue.c'
--- libcore/marlin-file-changes-queue.c	2014-08-25 10:19:38 +0000
+++ libcore/marlin-file-changes-queue.c	2015-05-09 10:55:27 +0000
@@ -310,5 +310,5 @@
         }
 
         g_free (change);
-    }	
+    }
 }

=== modified file 'libcore/marlin-file-conflict-dialog.c'
--- libcore/marlin-file-conflict-dialog.c	2014-08-05 22:40:12 +0000
+++ libcore/marlin-file-conflict-dialog.c	2015-05-09 10:55:27 +0000
@@ -34,7 +34,7 @@
 #include "marlin-icon-info.h"
 #include "pantheon-files-core.h"
 
-#define FILE_ICON_SIZE_LARGE	    64
+#define FILE_ICON_SIZE_LARGE        64
 
 typedef void GOFFileListHandle;
 
@@ -69,8 +69,8 @@
                marlin_file_conflict_dialog,
                GTK_TYPE_DIALOG);
 
-#define MARLIN_FILE_CONFLICT_DIALOG_GET_PRIVATE(object)		\
-    (G_TYPE_INSTANCE_GET_PRIVATE ((object), MARLIN_TYPE_FILE_CONFLICT_DIALOG, \
+#define MARLIN_FILE_CONFLICT_DIALOG_GET_PRIVATE(object)                         \
+    (G_TYPE_INSTANCE_GET_PRIVATE ((object), MARLIN_TYPE_FILE_CONFLICT_DIALOG,   \
                                   MarlinFileConflictDialogDetails))
 
 static void
@@ -101,7 +101,7 @@
     GOFFile *src, *dest, *dest_dir;
     time_t src_mtime, dest_mtime;
     GtkDialog *dialog;
-    gboolean source_is_dir,	dest_is_dir, should_show_type;
+    gboolean source_is_dir, dest_is_dir, should_show_type;
     MarlinFileConflictDialogDetails *details;
     char *primary_text, *message, *secondary_text;
     const gchar *message_extra;
@@ -359,7 +359,7 @@
                    gof_file_get_uri (dest));
     }
 
-    should_show_type = g_strcmp0 (src_ftype, dest_ftype);    
+    should_show_type = g_strcmp0 (src_ftype, dest_ftype);
 
     const gchar *dest_display_name = gof_file_get_display_name (dest);
     const gchar *dest_dir_display_name = gof_file_get_display_name (dest_dir);

=== modified file 'libcore/marlin-file-operations.c'
--- libcore/marlin-file-operations.c	2015-03-29 18:20:43 +0000
+++ libcore/marlin-file-operations.c	2015-05-09 10:55:27 +0000
@@ -2089,7 +2089,7 @@
             } else {
                 must_confirm_delete = TRUE;
                 to_delete_files = g_list_prepend (to_delete_files, file);
-            } 
+            }
         }
     }
 
@@ -5957,7 +5957,7 @@
 
 /** The done_callback function has a variable signature. When the file is being moved to
  * trash, it must be a MarlinDeleteCallback, otherwise it must be a MarlinCopyCallback.
- */ 
+ */
 void
 marlin_file_operations_copy_move   (GList                  *files,
                                     GArray                 *relative_item_points,

=== modified file 'libcore/marlin-file-utilities.c'
--- libcore/marlin-file-utilities.c	2014-02-17 00:47:17 +0000
+++ libcore/marlin-file-utilities.c	2015-05-09 10:55:27 +0000
@@ -55,91 +55,94 @@
 GHashTable *
 marlin_trashed_files_get_original_directories (GList *files, GList **unhandled_files)
 {
-	GHashTable *directories;
-	GOFFile *file;
+    GHashTable *directories;
+    GOFFile *file;
     GFile *original_file, *original_dir;
-	GList *l, *m;
-
-	directories = NULL;
-
-	if (unhandled_files != NULL) {
-		*unhandled_files = NULL;
-	}
-
-	for (l = files; l != NULL; l = l->next) {
-		file = GOF_FILE (l->data);
-		original_file = eel_g_file_get_trash_original_file (g_file_info_get_attribute_byte_string (file->info, G_FILE_ATTRIBUTE_TRASH_ORIG_PATH));
-		original_dir = NULL;
-		if (original_file != NULL) {
-			original_dir = g_file_get_parent (original_file);
-		}
-
-		if (original_dir != NULL) {
-			if (directories == NULL) {
-				directories = g_hash_table_new_full (g_file_hash,
-                                             (GEqualFunc) g_file_equal,
-                                             (GDestroyNotify) g_object_unref,
-                                             (GDestroyNotify) my_list_free_full);
-			}
-			m = g_hash_table_lookup (directories, original_dir);
-			if (m != NULL) {
-				g_hash_table_steal (directories, original_dir);
-			}
-			m = g_list_append (m, g_object_ref (file->location));
-			g_hash_table_insert (directories, original_dir, m);
-		} else if (unhandled_files != NULL) {
-			*unhandled_files = g_list_append (*unhandled_files, gof_file_ref (file));
-    		if (original_dir != NULL)
-	    		g_object_unref (original_dir);
-		}
-
-		if (original_file != NULL)
-		    g_object_unref (original_file);
-
-	}
-
-	return directories;
+    GList *l, *m;
+
+    directories = NULL;
+
+    if (unhandled_files != NULL) {
+        *unhandled_files = NULL;
+    }
+
+    for (l = files; l != NULL; l = l->next) {
+        file = GOF_FILE (l->data);
+        original_file = eel_g_file_get_trash_original_file (
+                            g_file_info_get_attribute_byte_string (file->info,
+                                                                   G_FILE_ATTRIBUTE_TRASH_ORIG_PATH));
+        original_dir = NULL;
+        if (original_file != NULL) {
+            original_dir = g_file_get_parent (original_file);
+        }
+
+        if (original_dir != NULL) {
+            if (directories == NULL) {
+                directories = g_hash_table_new_full (g_file_hash,
+                                                     (GEqualFunc) g_file_equal,
+                                                     (GDestroyNotify) g_object_unref,
+                                                     (GDestroyNotify) my_list_free_full);
+            }
+            m = g_hash_table_lookup (directories, original_dir);
+            if (m != NULL) {
+                g_hash_table_steal (directories, original_dir);
+            }
+            m = g_list_append (m, g_object_ref (file->location));
+            g_hash_table_insert (directories, original_dir, m);
+        } else if (unhandled_files != NULL) {
+            *unhandled_files = g_list_append (*unhandled_files, gof_file_ref (file));
+            if (original_dir != NULL)
+                g_object_unref (original_dir);
+        }
+
+        if (original_file != NULL)
+            g_object_unref (original_file);
+
+    }
+
+    return directories;
 }
 
 void
 marlin_restore_files_from_trash (GList *files, GtkWindow *parent_window)
 {
-	GOFFile *file;
-	GHashTable *original_dirs_hash;
-	GList *original_dirs, *unhandled_files;
-	GFile *original_dir;
-	GList *locations, *l;
-	char *message;
-
-	original_dirs_hash = marlin_trashed_files_get_original_directories (files, &unhandled_files);
-
-	for (l = unhandled_files; l != NULL; l = l->next) {
-		file = GOF_FILE (l->data);
-		message = g_strdup_printf (_("Could not determine original location of \"%s\" "), gof_file_get_display_name (file));
-
-		eel_show_warning_dialog (message,
+    GOFFile *file;
+    GHashTable *original_dirs_hash;
+    GList *original_dirs, *unhandled_files;
+    GFile *original_dir;
+    GList *locations, *l;
+    char *message;
+
+    original_dirs_hash = marlin_trashed_files_get_original_directories (files, &unhandled_files);
+
+    for (l = unhandled_files; l != NULL; l = l->next) {
+        file = GOF_FILE (l->data);
+        message = g_strdup_printf (_("Could not determine original location of \"%s\" "),
+                                   gof_file_get_display_name (file));
+
+        eel_show_warning_dialog (message,
                                  _("The item cannot be restored from trash"),
                                  parent_window);
-		g_free (message);
-	}
-
-	if (original_dirs_hash != NULL) {
-		original_dirs = g_hash_table_get_keys (original_dirs_hash);
-		for (l = original_dirs; l != NULL; l = l->next) {
-			original_dir = l->data;
-
-			locations = g_hash_table_lookup (original_dirs_hash, original_dir);
+        g_free (message);
+    }
+
+    if (original_dirs_hash != NULL) {
+        original_dirs = g_hash_table_get_keys (original_dirs_hash);
+        for (l = original_dirs; l != NULL; l = l->next) {
+            original_dir = l->data;
+
+            locations = g_hash_table_lookup (original_dirs_hash, original_dir);
 
             /*printf ("original dir: %s\n", g_file_get_uri (original_dir));*/
-			marlin_file_operations_move	(locations, NULL,
+            marlin_file_operations_move (locations, NULL,
                                          original_dir,
                                          parent_window,
                                          NULL, NULL);
-		}
-		g_hash_table_destroy (original_dirs_hash);
-	}
+        }
+        g_hash_table_destroy (original_dirs_hash);
+    }
 
-	gof_file_list_free (unhandled_files);
+    gof_file_list_free (unhandled_files);
 }
 
 void

=== modified file 'libcore/marlin-file-utilities.h'
--- libcore/marlin-file-utilities.h	2014-02-17 00:47:17 +0000
+++ libcore/marlin-file-utilities.h	2015-05-09 10:55:27 +0000
@@ -27,7 +27,7 @@
 #include <gtk/gtk.h>
 
 //char *  marlin_get_xdg_dir                      (const char *type);
-char	*marlin_get_accel_map_file		(void);
+char    *marlin_get_accel_map_file      (void);
 
 void    marlin_restore_files_from_trash         (GList *files, GtkWindow *parent_window);
 

=== modified file 'libcore/marlin-icons.h'
--- libcore/marlin-icons.h	2013-05-12 06:42:57 +0000
+++ libcore/marlin-icons.h	2015-05-09 10:55:27 +0000
@@ -8,7 +8,7 @@
 #define MARLIN_TRASH_URI            "trash:///"
 #define MARLIN_NETWORK_URI          "network:///"
 
-#define MARLIN_ICON_FOLDER	        "folder"
+#define MARLIN_ICON_FOLDER          "folder"
 #define MARLIN_ICON_FOLDER_REMOTE   "folder-remote"
-#define MARLIN_ICON_TRASH	        "user-trash"
-#define MARLIN_ICON_TRASH_FULL	    "user-trash-full"
+#define MARLIN_ICON_TRASH           "user-trash"
+#define MARLIN_ICON_TRASH_FULL      "user-trash-full"

=== modified file 'libcore/marlin-progress-info-manager.h'
--- libcore/marlin-progress-info-manager.h	2011-05-12 19:41:47 +0000
+++ libcore/marlin-progress-info-manager.h	2015-05-09 10:55:27 +0000
@@ -58,7 +58,7 @@
 MarlinProgressInfoManager* marlin_progress_info_manager_new (void);
 
 void marlin_progress_info_manager_add_new_info (MarlinProgressInfoManager *self,
-						  MarlinProgressInfo *info);
+                                                MarlinProgressInfo *info);
 GList *marlin_progress_info_manager_get_all_infos (MarlinProgressInfoManager *self);
 
 G_END_DECLS

=== modified file 'libcore/marlin-progress-info.c'
--- libcore/marlin-progress-info.c	2013-09-09 03:08:16 +0000
+++ libcore/marlin-progress-info.c	2015-05-09 10:55:27 +0000
@@ -86,7 +86,7 @@
     g_object_unref (info->cancellable);
 
     if (G_OBJECT_CLASS (marlin_progress_info_parent_class)->finalize) {
-	(*G_OBJECT_CLASS (marlin_progress_info_parent_class)->finalize) (object);
+        (*G_OBJECT_CLASS (marlin_progress_info_parent_class)->finalize) (object);
     }
 }
 
@@ -103,9 +103,9 @@
        could come here before the destroy, which should
        ressurect the object for a while */
     if (info->idle_source) {
-	g_source_destroy (info->idle_source);
-	g_source_unref (info->idle_source);
-	info->idle_source = NULL;
+        g_source_destroy (info->idle_source);
+        g_source_unref (info->idle_source);
+        info->idle_source = NULL;
     }
     G_UNLOCK (progress_info);
 }
@@ -118,41 +118,37 @@
     gobject_class->finalize = marlin_progress_info_finalize;
     gobject_class->dispose = marlin_progress_info_dispose;
 
-    signals[CHANGED] =
-	g_signal_new ("changed",
-		      MARLIN_TYPE_PROGRESS_INFO,
-		      G_SIGNAL_RUN_LAST,
-		      0,
-		      NULL, NULL,
-		      g_cclosure_marshal_VOID__VOID,
-		      G_TYPE_NONE, 0);
-
-    signals[PROGRESS_CHANGED] =
-	g_signal_new ("progress-changed",
-		      MARLIN_TYPE_PROGRESS_INFO,
-		      G_SIGNAL_RUN_LAST,
-		      0,
-		      NULL, NULL,
-		      g_cclosure_marshal_VOID__VOID,
-		      G_TYPE_NONE, 0);
-
-    signals[STARTED] =
-	g_signal_new ("started",
-		      MARLIN_TYPE_PROGRESS_INFO,
-		      G_SIGNAL_RUN_LAST,
-		      0,
-		      NULL, NULL,
-		      g_cclosure_marshal_VOID__VOID,
-		      G_TYPE_NONE, 0);
-
-    signals[FINISHED] =
-	g_signal_new ("finished",
-		      MARLIN_TYPE_PROGRESS_INFO,
-		      G_SIGNAL_RUN_LAST,
-		      0,
-		      NULL, NULL,
-		      g_cclosure_marshal_VOID__VOID,
-		      G_TYPE_NONE, 0);
+    signals[CHANGED] = g_signal_new ("changed",
+                                     MARLIN_TYPE_PROGRESS_INFO,
+                                     G_SIGNAL_RUN_LAST,
+                                     0,
+                                     NULL, NULL,
+                                     g_cclosure_marshal_VOID__VOID,
+                                     G_TYPE_NONE, 0);
+
+    signals[PROGRESS_CHANGED] = g_signal_new ("progress-changed",
+                                              MARLIN_TYPE_PROGRESS_INFO,
+                                              G_SIGNAL_RUN_LAST,
+                                              0,
+                                              NULL, NULL,
+                                              g_cclosure_marshal_VOID__VOID,
+                                              G_TYPE_NONE, 0);
+
+    signals[STARTED] = g_signal_new ("started",
+                                     MARLIN_TYPE_PROGRESS_INFO,
+                                     G_SIGNAL_RUN_LAST,
+                                     0,
+                                     NULL, NULL,
+                                     g_cclosure_marshal_VOID__VOID,
+                                     G_TYPE_NONE, 0);
+
+    signals[FINISHED] = g_signal_new ("finished",
+                                      MARLIN_TYPE_PROGRESS_INFO,
+                                      G_SIGNAL_RUN_LAST,
+                                      0,
+                                      NULL, NULL,
+                                      g_cclosure_marshal_VOID__VOID,
+                                      G_TYPE_NONE, 0);
 
 }
 
@@ -186,9 +182,9 @@
     G_LOCK (progress_info);
 
     if (info->status) {
-	res = g_strdup (info->status);
+        res = g_strdup (info->status);
     } else {
-	res = g_strdup (_("Preparing"));
+        res = g_strdup (_("Preparing"));
     }
 
     G_UNLOCK (progress_info);
@@ -204,9 +200,9 @@
     G_LOCK (progress_info);
 
     if (info->details) {
-	res = g_strdup (info->details);
+        res = g_strdup (info->details);
     } else {
-	res = g_strdup (_("Preparing"));
+        res = g_strdup (_("Preparing"));
     }
 
     G_UNLOCK (progress_info);
@@ -222,9 +218,9 @@
     G_LOCK (progress_info);
 
     if (info->activity_mode) {
-	res = -1.0;
+        res = -1.0;
     } else {
-	res = info->progress;
+        res = info->progress;
     }
 
     G_UNLOCK (progress_info);
@@ -235,37 +231,37 @@
 double
 marlin_progress_info_get_current (MarlinProgressInfo *info)
 {
-	double current;
-	
-	G_LOCK (progress_info);
-
-	if (info->activity_mode) {
-		current = 0.0;
-	} else {
-		current = info->current;
-	}
-	
-	G_UNLOCK (progress_info);
-	
-	return current;
+    double current;
+
+    G_LOCK (progress_info);
+
+    if (info->activity_mode) {
+        current = 0.0;
+    } else {
+        current = info->current;
+    }
+
+    G_UNLOCK (progress_info);
+
+    return current;
 }
 
 double
 marlin_progress_info_get_total (MarlinProgressInfo *info)
 {
-	double total;
-	
-	G_LOCK (progress_info);
-
-	if (info->activity_mode) {
-		total = -1.0;
-	} else {
-		total = info->total;
-	}
-	
-	G_UNLOCK (progress_info);
-	
-	return total;
+    double total;
+
+    G_LOCK (progress_info);
+
+    if (info->activity_mode) {
+        total = -1.0;
+    } else {
+        total = info->total;
+    }
+
+    G_UNLOCK (progress_info);
+
+    return total;
 }
 
 void
@@ -354,8 +350,8 @@
        Similar to what gdk_threads_add_idle does.
        */
     if (g_source_is_destroyed (source)) {
-	G_UNLOCK (progress_info);
-	return FALSE;
+        G_UNLOCK (progress_info);
+        return FALSE;
     }
 
     /* We hadn't destroyed the source, so take a ref.
@@ -382,27 +378,27 @@
     G_UNLOCK (progress_info);
 
     if (start_at_idle) {
-	g_signal_emit (info,
-		       signals[STARTED],
-		       0);
+        g_signal_emit (info,
+                       signals[STARTED],
+                       0);
     }
 
     if (changed_at_idle) {
-	g_signal_emit (info,
-		       signals[CHANGED],
-		       0);
+        g_signal_emit (info,
+                       signals[CHANGED],
+                       0);
     }
 
     if (progress_at_idle) {
-	g_signal_emit (info,
-		       signals[PROGRESS_CHANGED],
-		       0);
+        g_signal_emit (info,
+                       signals[PROGRESS_CHANGED],
+                       0);
     }
 
     if (finish_at_idle) {
-	g_signal_emit (info,
-		       signals[FINISHED],
-		       0);
+        g_signal_emit (info,
+                       signals[FINISHED],
+                       0);
     }
 
     g_object_unref (info);
@@ -415,21 +411,23 @@
 queue_idle (MarlinProgressInfo *info, gboolean now)
 {
     if (info->idle_source == NULL ||
-	(now && !info->source_is_now)) {
-	if (info->idle_source) {
-	    g_source_destroy (info->idle_source);
-	    g_source_unref (info->idle_source);
-	    info->idle_source = NULL;
-	}
-
-	info->source_is_now = now;
-	if (now) {
-	    info->idle_source = g_idle_source_new ();
-	} else {
-	    info->idle_source = g_timeout_source_new (SIGNAL_DELAY_MSEC);
-	}
-	g_source_set_callback (info->idle_source, idle_callback, info, NULL);
-	g_source_attach (info->idle_source, NULL);
+        (now && !info->source_is_now)) {
+
+        if (info->idle_source) {
+            g_source_destroy (info->idle_source);
+            g_source_unref (info->idle_source);
+            info->idle_source = NULL;
+        }
+
+        info->source_is_now = now;
+        if (now) {
+            info->idle_source = g_idle_source_new ();
+        } else {
+            info->idle_source = g_timeout_source_new (SIGNAL_DELAY_MSEC);
+        }
+
+        g_source_set_callback (info->idle_source, idle_callback, info, NULL);
+        g_source_attach (info->idle_source, NULL);
     }
 }
 
@@ -439,7 +437,7 @@
     G_LOCK (progress_info);
 
     if (!info->paused) {
-	info->paused = TRUE;
+        info->paused = TRUE;
     }
 
     G_UNLOCK (progress_info);
@@ -451,7 +449,7 @@
     G_LOCK (progress_info);
 
     if (info->paused) {
-	info->paused = FALSE;
+        info->paused = FALSE;
     }
 
     G_UNLOCK (progress_info);
@@ -463,10 +461,10 @@
     G_LOCK (progress_info);
 
     if (!info->started) {
-	info->started = TRUE;
+        info->started = TRUE;
 
-	info->start_at_idle = TRUE;
-	queue_idle (info, TRUE);
+        info->start_at_idle = TRUE;
+        queue_idle (info, TRUE);
     }
 
     G_UNLOCK (progress_info);
@@ -478,10 +476,10 @@
     G_LOCK (progress_info);
 
     if (!info->finished) {
-	info->finished = TRUE;
+        info->finished = TRUE;
 
-	info->finish_at_idle = TRUE;
-	queue_idle (info, TRUE);
+        info->finish_at_idle = TRUE;
+        queue_idle (info, TRUE);
     }
 
     G_UNLOCK (progress_info);
@@ -489,18 +487,18 @@
 
 void
 marlin_progress_info_take_status (MarlinProgressInfo *info,
-				  char *status)
+                                  char *status)
 {
     G_LOCK (progress_info);
 
     if (eel_strcmp (info->status, status) != 0) {
-	g_free (info->status);
-	info->status = status;
+        g_free (info->status);
+        info->status = status;
 
-	info->changed_at_idle = TRUE;
-	queue_idle (info, FALSE);
+        info->changed_at_idle = TRUE;
+        queue_idle (info, FALSE);
     } else {
-	g_free (status);
+        g_free (status);
     }
 
     G_UNLOCK (progress_info);
@@ -508,16 +506,16 @@
 
 void
 marlin_progress_info_set_status (MarlinProgressInfo *info,
-				 const char *status)
+                                 const char *status)
 {
     G_LOCK (progress_info);
 
     if (eel_strcmp (info->status, status) != 0) {
-	g_free (info->status);
-	info->status = g_strdup (status);
+        g_free (info->status);
+        info->status = g_strdup (status);
 
-	info->changed_at_idle = TRUE;
-	queue_idle (info, FALSE);
+        info->changed_at_idle = TRUE;
+        queue_idle (info, FALSE);
     }
 
     G_UNLOCK (progress_info);
@@ -526,18 +524,18 @@
 
 void
 marlin_progress_info_take_details (MarlinProgressInfo *info,
-				   char           *details)
+                                   char           *details)
 {
     G_LOCK (progress_info);
 
     if (eel_strcmp (info->details, details) != 0) {
-	g_free (info->details);
-	info->details = details;
+        g_free (info->details);
+        info->details = details;
 
-	info->changed_at_idle = TRUE;
-	queue_idle (info, FALSE);
+        info->changed_at_idle = TRUE;
+        queue_idle (info, FALSE);
     } else {
-	g_free (details);
+        g_free (details);
     }
 
     G_UNLOCK (progress_info);
@@ -545,16 +543,16 @@
 
 void
 marlin_progress_info_set_details (MarlinProgressInfo *info,
-				  const char           *details)
+                                  const char           *details)
 {
     G_LOCK (progress_info);
 
     if (eel_strcmp (info->details, details) != 0) {
-	g_free (info->details);
-	info->details = g_strdup (details);
+        g_free (info->details);
+        info->details = g_strdup (details);
 
-	info->changed_at_idle = TRUE;
-	queue_idle (info, FALSE);
+        info->changed_at_idle = TRUE;
+        queue_idle (info, FALSE);
     }
 
     G_UNLOCK (progress_info);
@@ -575,36 +573,36 @@
 
 void
 marlin_progress_info_set_progress (MarlinProgressInfo *info,
-				   double                current,
-				   double                total)
+                                   double                current,
+                                   double                total)
 {
     double current_percent;
 
     if (total <= 0) {
-	current_percent = 1.0;
+        current_percent = 1.0;
     } else {
-	current_percent = current / total;
-
-	if (current_percent < 0) {
-	    current_percent	= 0;
-	}
-
-	if (current_percent > 1.0) {
-	    current_percent	= 1.0;
-	}
+        current_percent = current / total;
+
+        if (current_percent < 0) {
+            current_percent = 0;
+        }
+
+        if (current_percent > 1.0) {
+            current_percent = 1.0;
+        }
     }
 
     G_LOCK (progress_info);
 
     if (info->activity_mode || /* emit on switch from activity mode */
-	fabs (current_percent - info->progress) > 0.005 /* Emit on change of 0.5 percent */
-       ) {
-	info->activity_mode = FALSE;
-	info->progress = current_percent;
-	info->current = current;
-	info->total = total;
-	info->progress_at_idle = TRUE;
-	queue_idle (info, FALSE);
+        fabs (current_percent - info->progress) > 0.005) { /* Emit on change of 0.5 percent */
+
+        info->activity_mode = FALSE;
+        info->progress = current_percent;
+        info->current = current;
+        info->total = total;
+        info->progress_at_idle = TRUE;
+        queue_idle (info, FALSE);
     }
 
     G_UNLOCK (progress_info);

=== modified file 'libcore/marlin-progress-info.h'
--- libcore/marlin-progress-info.h	2013-08-10 20:20:23 +0000
+++ libcore/marlin-progress-info.h	2015-05-09 10:55:27 +0000
@@ -69,16 +69,16 @@
 void          marlin_progress_info_pause           (MarlinProgressInfo *info);
 void          marlin_progress_info_resume          (MarlinProgressInfo *info);
 void          marlin_progress_info_set_status      (MarlinProgressInfo *info,
-						    const char         *status);
+                                                    const char         *status);
 void          marlin_progress_info_take_status     (MarlinProgressInfo *info,
-						    char               *status);
+                                                    char               *status);
 void          marlin_progress_info_set_details     (MarlinProgressInfo *info,
-						    const char         *details);
+                                                    const char         *details);
 void          marlin_progress_info_take_details    (MarlinProgressInfo *info,
-						    char               *details);
+                                                    char               *details);
 void          marlin_progress_info_set_progress    (MarlinProgressInfo *info,
-						    double             current,
-						    double             total);
+                                                    double             current,
+                                                    double             total);
 void          marlin_progress_info_pulse_progress  (MarlinProgressInfo *info);
 
 

=== modified file 'libcore/marlin-trash-monitor.h'
--- libcore/marlin-trash-monitor.h	2013-08-10 20:20:23 +0000
+++ libcore/marlin-trash-monitor.h	2015-05-09 10:55:27 +0000
@@ -49,16 +49,16 @@
 struct MarlinTrashMonitorClass {
     GObjectClass parent_class;
 
-    void (* trash_state_changed)    (MarlinTrashMonitor 	*trash_monitor,
-                                     gboolean 		 new_state);
+    void (* trash_state_changed)    (MarlinTrashMonitor     *trash_monitor,
+                                     gboolean        new_state);
 };
 
-GType	            marlin_trash_monitor_get_type                   (void);
+GType               marlin_trash_monitor_get_type                   (void);
 
 MarlinTrashMonitor  *marlin_trash_monitor_get                       (void);
-gboolean	        marlin_trash_monitor_is_empty                   (void);
+gboolean            marlin_trash_monitor_is_empty                   (void);
 GIcon               *marlin_trash_monitor_get_icon                  (void);
 
-void		        marlin_trash_monitor_add_new_trash_directories  (void);
+void                marlin_trash_monitor_add_new_trash_directories  (void);
 
 #endif

=== modified file 'libwidgets/Animations.vala'
--- libwidgets/Animations.vala	2014-06-07 13:17:21 +0000
+++ libwidgets/Animations.vala	2015-05-09 10:55:27 +0000
@@ -1,3 +1,21 @@
+/***
+    Copyright (c) 2015 Elementary Developers
+
+    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.
+
+    This program is distributed in the hope that it will be useful, but 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., 59 Temple
+    Place, Suite 330, Boston, MA  02111-1307  USA
+ ***/
+
 namespace Marlin.Animation {
 
     private static uint timeout_source_id = 0;

=== modified file 'libwidgets/BreadcrumbsElements.vala'
--- libwidgets/BreadcrumbsElements.vala	2015-02-11 15:30:27 +0000
+++ libwidgets/BreadcrumbsElements.vala	2015-05-09 10:55:27 +0000
@@ -1,22 +1,22 @@
-/*
- * Copyright (c) 2011 Lucas Baudin <[e-mail]>
- *
- * Marlin 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.
- *
- * Marlin is distributed in the hope that it will be useful,
- * but 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; see the file COPYING.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
+/***
+    Copyright (c) 2011 Lucas Baudin <[e-mail]>
+
+    Marlin 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.
+
+    Marlin is distributed in the hope that it will be useful,
+    but 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; see the file COPYING.  If not,
+    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+    Boston, MA 02111-1307, USA.
+*
+***/
 
 public class Marlin.View.Chrome.BreadcrumbsElement : Object {
 

=== modified file 'libwidgets/LocationBar.vala'
--- libwidgets/LocationBar.vala	2015-02-27 16:23:20 +0000
+++ libwidgets/LocationBar.vala	2015-05-09 10:55:27 +0000
@@ -1,22 +1,22 @@
-/*
- * Copyright (c) 2011 Lucas Baudin <[e-mail]>
- *
- * Marlin 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.
- *
- * Marlin is distributed in the hope that it will be useful,
- * but 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; see the file COPYING.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
+/***
+    Copyright (c) 2011 Lucas Baudin <[e-mail]>
+
+    Marlin 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.
+
+    Marlin is distributed in the hope that it will be useful,
+    but 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; see the file COPYING.  If not,
+    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+    Boston, MA 02111-1307, USA.
+
+***/
 
 namespace Marlin {
     public const string ROOT_FS_URI = "file://";
@@ -66,7 +66,7 @@
             grab_focus ();
         }
     }
-    
+
     protected string text_completion = "";
     protected bool multiple_completions = false;
     protected bool text_changed = false;
@@ -143,7 +143,7 @@
         y = 0;
 
         elements = new Gee.ArrayList<BreadcrumbsElement> ();
-        
+
         secondary_icon_activatable = true;
         secondary_icon_sensitive = true;
         truncate_multiline = true;
@@ -184,7 +184,7 @@
             case Gdk.Key.Up:
                 up ();
                 return true;
-                
+
             case Gdk.Key.Escape:
                 escape ();
                 return true;
@@ -199,7 +199,7 @@
         if (event.window.get_width () < 24)
             return false;
 
-        if (is_focus)    
+        if (is_focus)
             return base.button_press_event (event);
 
         foreach (BreadcrumbsElement element in elements)
@@ -226,7 +226,7 @@
                 var newpath = get_path_from_element (el);
                 activate_alternate (get_file_for_path (newpath));
             }
-            
+
             return true;
         }
 
@@ -248,7 +248,7 @@
             Source.remove ((uint) timeout);
             timeout = -1;
         }
-        
+
         if (is_focus)
             return base.button_release_event (event);
 
@@ -262,7 +262,7 @@
             } else
                 grab_focus ();
         }
-        
+
         return base.button_release_event (event);
     }
 
@@ -290,12 +290,12 @@
         text_completion = "";
         need_completion ();
     }
-    
+
     void after_realize () {
-        /* After realizing, we take a reference on the Gdk.Window of the Entry so 
+        /* After realizing, we take a reference on the Gdk.Window of the Entry so
          * we can set the cursor icon as needed. This relies on Gtk storing the
-         * owning widget as the user data on a Gdk.Window. The required window   
-         * will be the first child of the entry. 
+         * owning widget as the user data on a Gdk.Window. The required window
+         * will be the first child of the entry.
          */
         entry_window = get_window ().get_children_with_user_data (this).data;
     }
@@ -406,7 +406,7 @@
                                           int x,
                                           int y,
                                           uint timestamp);
-    
+
     protected void add_icon (IconDirectory icon) {
         if (icon.gicon != null)
             icon.icon = icon_factory.load_symbolic_icon_from_gicon (button_context, icon.gicon, 16);
@@ -415,13 +415,13 @@
 
         icons.append (icon);
     }
-    
+
     public void complete () {
         if (text_completion.length == 0)
             return;
 
         string path = text + text_completion;
-        
+
         /* If there are multiple results, tab as far as we can, otherwise do the entire result */
         if (!multiple_completions) {
             set_entry_text (path + "/");
@@ -429,26 +429,25 @@
         } else
             set_entry_text (path);
     }
-    
+
     public void reset_elements_states () {
         foreach (BreadcrumbsElement element in elements)
             element.pressed = false;
 
         queue_draw ();
     }
-    
+
     public void set_entry_text (string text) {
         ignore_change = true;
         text_completion = "";
         this.text = text;
         set_position (-1);
     }
-    
+
     public void set_entry_cursor (Gdk.Cursor? cursor) {
         entry_window.set_cursor (cursor ?? new Gdk.Cursor (Gdk.CursorType.XTERM));
+    }
 
-    }
-    
     public void set_entry_secondary_icon (bool active, bool visible) {
         if (!visible)
             secondary_icon_pixbuf = null;
@@ -517,7 +516,7 @@
     public string get_elements_path () {
         return get_path_from_element (null);
     }
-    
+
     /**
      * Gets a properly escaped GLib.File for the given path
      **/
@@ -528,7 +527,7 @@
         /* Format our path so its valid */
         if (newpath == "")
             newpath = "/";
-            
+
         if (newpath[0] == '~')
             newpath = newpath.replace("~", Environment.get_home_dir ());
 
@@ -551,7 +550,7 @@
         File file = File.new_for_commandline_arg (newpath);
         return file;
     }
-    
+
     /**
      * Select the breadcrumb to make a right click. This function check
      * where the user click, then, it loads a context menu with the others
@@ -582,7 +581,7 @@
             return true;
         }
         return false;
-    }    
+    }
 
     public virtual string? update_breadcrumbs (string newpath, string breadpath) {
         string strloc;
@@ -796,7 +795,7 @@
             button_context_active.set_path(button_context.get_path ());
             button_context_active.set_state (Gtk.StateFlags.ACTIVE);
         }
-        
+
         base.draw (cr);
         double height = get_allocated_height ();
         double width = get_allocated_width ();
@@ -842,13 +841,13 @@
                 foreach (BreadcrumbsElement element in newbreads)
                     if (element.display)
                         x_render = element.draw(cr, x_render, margin, height_marged, button_context, this);
-                        
+
             cr.restore ();
         } else {
             if (text_completion != "") {
                 int layout_width, layout_height;
                 double text_width, text_height;
-                
+
                 cr.set_source_rgba (0, 0, 0, 0.4);
                 Pango.Layout layout = create_pango_layout (text);
                 layout.get_size (out layout_width, out layout_height);

=== modified file 'libwidgets/PoofWindow.vala'
--- libwidgets/PoofWindow.vala	2014-03-24 19:46:34 +0000
+++ libwidgets/PoofWindow.vala	2015-05-09 10:55:27 +0000
@@ -1,19 +1,19 @@
-//
-//  Copyright (C) 2011-2012 Robert Dyer, Rico Tzschichholz
-//
-//  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 3 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but 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, see <http://www.gnu.org/licenses/>.
-//
+/***
+    Copyright (C) 2011-2012 Robert Dyer, Rico Tzschichholz
+
+    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 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but 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, see <http://www.gnu.org/licenses/>.
+***/
 
 namespace Marlin.Animation
 {

=== modified file 'plugins/contractor/CMakeLists.txt'
--- plugins/contractor/CMakeLists.txt	2014-08-05 22:40:12 +0000
+++ plugins/contractor/CMakeLists.txt	2015-05-09 10:55:27 +0000
@@ -1,11 +1,11 @@
 find_package(PkgConfig)
 pkg_check_modules(DEPS REQUIRED
-	gtk+-3.0
+    gtk+-3.0
     gee-0.8
     glib-2.0
     granite)
 set(CFLAGS
-	${DEPS_CFLAGS} ${DEPS_CFLAGS_OTHER}
+    ${DEPS_CFLAGS} ${DEPS_CFLAGS_OTHER}
 )
 include_directories(${CMAKE_BINARY_DIR}/libcore/)
 include_directories(${CMAKE_SOURCE_DIR}/libcore/)

=== modified file 'plugins/contractor/plugin.vala'
--- plugins/contractor/plugin.vala	2014-12-21 19:10:02 +0000
+++ plugins/contractor/plugin.vala	2015-05-09 10:55:27 +0000
@@ -1,25 +1,25 @@
-/*
- * Authors:
- *      Lucas Baudin <[e-mail]>
- *      ammonkey <[e-mail]>
- *      Victor Martinez <[e-mail]>
- *
- * Copyright (C) Lucas Baudin 2011 <[e-mail]>
- * Copyright (C) 2013 elementary
- *
- * Marlin 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 3 of the License, or
- * (at your option) any later version.
- *
- * Marlin is distributed in the hope that it will be useful, but
- * 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, see <http://www.gnu.org/licenses/>.
- */
+/***
+    Authors:
+      Lucas Baudin <[e-mail]>
+      ammonkey <[e-mail]>
+      Victor Martinez <[e-mail]>
+
+    Copyright (C) Lucas Baudin 2011 <[e-mail]>
+    Copyright (C) 2013 elementary
+
+    Marlin 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 3 of the License, or
+    (at your option) any later version.
+
+    Marlin is distributed in the hope that it will be useful, but
+    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, see <http://www.gnu.org/licenses/>.
+***/
 
 public class Marlin.Plugins.ContractMenuItem : Gtk.MenuItem {
     private Granite.Services.Contract contract;

=== modified file 'plugins/network-places/plugin.vala'
--- plugins/network-places/plugin.vala	2014-12-07 19:39:22 +0000
+++ plugins/network-places/plugin.vala	2015-05-09 10:55:27 +0000
@@ -1,20 +1,20 @@
-/*
- *
- * Marlin 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 3 of the License, or
- * (at your option) any later version.
- *
- * Marlin is distributed in the hope that it will be useful, but
- * 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, see <http://www.gnu.org/licenses/>.
- */
-
-// See src/marlin-connect-server-dialog.c
+/***
+
+     Marlin 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 3 of the License, or
+     (at your option) any later version.
+
+     Marlin is distributed in the hope that it will be useful, but
+     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, see <http://www.gnu.org/licenses/>.
+***/
+
+/* See src/marlin-connect-server-dialog.c */
 extern void marlin_connect_server_dialog_show (Gtk.Widget widget);
 
 public class Files.Plugins.NetworkPlaces : Marlin.Plugins.Base {
@@ -25,7 +25,7 @@
     public override void update_sidebar (Gtk.Widget widget) {
         var sidebar = widget as Marlin.AbstractSidebar;
         sidebar.add_extra_network_item (_("Connect to Server…"), _("Connect to a network file server"),
-                                         new ThemedIcon.with_default_fallbacks ("network-server"), 
+                                         new ThemedIcon.with_default_fallbacks ("network-server"),
                                          marlin_connect_server_dialog_show);
     }
 }

=== modified file 'plugins/pantheon-files-ctags/CMakeLists.txt'
--- plugins/pantheon-files-ctags/CMakeLists.txt	2014-08-05 22:40:12 +0000
+++ plugins/pantheon-files-ctags/CMakeLists.txt	2015-05-09 10:55:27 +0000
@@ -2,12 +2,12 @@
 
 find_package(PkgConfig)
 pkg_check_modules(DEPS REQUIRED
-	gtk+-3.0
+    gtk+-3.0
     gio-2.0
     gee-0.8
 )
 set(CFLAGS
-	${DEPS_CFLAGS} ${DEPS_CFLAGS_OTHER}
+    ${DEPS_CFLAGS} ${DEPS_CFLAGS_OTHER}
 )
 include_directories(${CMAKE_SOURCE_DIR}/libcore/)
 include_directories(${CMAKE_BINARY_DIR}/libcore/)
@@ -27,7 +27,7 @@
 )
 add_definitions(${CFLAGS})
 link_directories(${LIB_PATHS})
-add_library(pantheon-filesctags SHARED 
+add_library(pantheon-filesctags SHARED
     ${VALA_C})
 target_link_libraries(pantheon-filesctags ${DEPS_LIBRARIES} pantheon-files-core)
 add_dependencies(pantheon-filesctags pantheon-files-core)

=== modified file 'plugins/pantheon-files-ctags/plugin.vala'
--- plugins/pantheon-files-ctags/plugin.vala	2014-11-21 19:24:45 +0000
+++ plugins/pantheon-files-ctags/plugin.vala	2015-05-09 10:55:27 +0000
@@ -1,19 +1,19 @@
-/*
- * Copyright (C) ammonkey 2011 <[e-mail]>
- *
- * Marlin 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 3 of the License, or
- * (at your option) any later version.
- *
- * Marlin is distributed in the hope that it will be useful, but
- * 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, see <http://www.gnu.org/licenses/>.
- */
+/***
+    Copyright (C) ammonkey 2011 <[e-mail]>
+
+    Marlin 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 3 of the License, or
+    (at your option) any later version.
+
+    Marlin is distributed in the hope that it will be useful, but
+    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, see <http://www.gnu.org/licenses/>.
+***/
 
 [DBus (name = "org.elementary.pantheonfiles.db")]
 interface MarlinDaemon : Object {

=== modified file 'plugins/pantheon-files-trash/CMakeLists.txt'
--- plugins/pantheon-files-trash/CMakeLists.txt	2014-08-05 22:40:12 +0000
+++ plugins/pantheon-files-trash/CMakeLists.txt	2015-05-09 10:55:27 +0000
@@ -2,11 +2,11 @@
 
 find_package(PkgConfig)
 pkg_check_modules(DEPS REQUIRED
-	gtk+-3.0
+    gtk+-3.0
     gee-0.8
 )
 set(CFLAGS
-	${DEPS_CFLAGS} ${DEPS_CFLAGS_OTHER}
+    ${DEPS_CFLAGS} ${DEPS_CFLAGS_OTHER}
 )
 include_directories(${CMAKE_SOURCE_DIR}/libcore/)
 include_directories(${CMAKE_BINARY_DIR}/libcore/)
@@ -25,7 +25,7 @@
 )
 add_definitions(${CFLAGS})
 link_directories(${LIB_PATHS})
-add_library(pantheon-filestrash SHARED 
+add_library(pantheon-filestrash SHARED
     ${VALA_C})
 target_link_libraries(pantheon-filestrash ${DEPS_LIBRARIES} pantheon-files-core)
 add_dependencies(pantheon-filestrash pantheon-files-core)

=== modified file 'plugins/pantheon-files-trash/plugin.vala'
--- plugins/pantheon-files-trash/plugin.vala	2015-04-05 17:40:26 +0000
+++ plugins/pantheon-files-trash/plugin.vala	2015-05-09 10:55:27 +0000
@@ -1,19 +1,19 @@
-/*
- * Copyright (C) Lucas Baudin 2011 <[e-mail]>
- *
- * Marlin 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 3 of the License, or
- * (at your option) any later version.
- *
- * Marlin is distributed in the hope that it will be useful, but
- * 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, see <http://www.gnu.org/licenses/>.
- */
+/***
+    Copyright (C) Lucas Baudin 2011 <[e-mail]>
+
+    Marlin 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 3 of the License, or
+    (at your option) any later version.
+
+    Marlin is distributed in the hope that it will be useful, but
+    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, see <http://www.gnu.org/licenses/>.
+***/
 
 public class Marlin.Plugins.Trash : Marlin.Plugins.Base {
     private TrashMonitor trash_monitor;

=== modified file 'src/AbstractEditableLabel.vala'
--- src/AbstractEditableLabel.vala	2014-10-29 20:55:21 +0000
+++ src/AbstractEditableLabel.vala	2015-05-09 10:55:27 +0000
@@ -1,20 +1,20 @@
-/*
- Copyright (C) 2014 elementary Developers
-
- This program is free software: you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License version 3, as published
- by the Free Software Foundation.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranties of
- MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
-
- Authors : Jeremy Wootten <[e-mail]>
-*/
+/***
+    Copyright (C) 2015 elementary Developers
+
+    This program is free software: you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License version 3, as published
+    by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranties of
+    MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
+
+    Authors : Jeremy Wootten <[e-mail]>
+***/
 
 
 namespace Marlin {
@@ -34,7 +34,7 @@
             add (editable_widget);
             show_all ();
             get_real_editable ().key_press_event.connect (on_key_press_event);
-        } 
+        }
 
         public bool on_key_press_event (Gdk.EventKey event) {
             bool control_pressed = ((event.state & Gdk.ModifierType.CONTROL_MASK) != 0);
@@ -75,7 +75,7 @@
         public virtual void set_line_wrap_mode (Pango.WrapMode mode) {}
         public virtual void set_justify (Gtk.Justification jtype) {}
         public virtual void set_padding (int xpad, int ypad) {}
-        
+
         public abstract new void set_size_request (int width, int height);
         public abstract Gtk.Widget create_editable_widget ();
         public abstract string get_text ();

=== modified file 'src/Application.vala'
--- src/Application.vala	2015-01-04 19:48:50 +0000
+++ src/Application.vala	2015-05-09 10:55:27 +0000
@@ -1,23 +1,23 @@
 /***
-  Copyright (C) 1999, 2000 Red Hat, Inc.
-  Copyright (C) 2000, 2001 Eazel, Inc.
-  Copyright (C) 2013 Julián Unrrein <[e-mail]>
-
-  This program is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License version 3, as published
-  by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranties of
-  MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
-
-  Authors: Elliot Lee <[e-mail]>,
-           Darin Adler <[e-mail]>,
-           Julián Unrrein <[e-mail]>
+    Copyright (C) 1999, 2000 Red Hat, Inc.
+    Copyright (C) 2000, 2001 Eazel, Inc.
+    Copyright (C) 2013 Julián Unrrein <[e-mail]>
+
+    This program is free software: you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License version 3, as published
+    by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranties of
+    MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
+
+    Authors: Elliot Lee <[e-mail]>,
+             Darin Adler <[e-mail]>,
+             Julián Unrrein <[e-mail]>
 ***/
 
 private Marlin.Application application_singleton = null;
@@ -96,8 +96,9 @@
 
         plugins = new Marlin.PluginManager (Config.PLUGIN_DIR);
 
-        /* TODO move the volume manager here? */
-        /* TODO-gio: This should be using the UNMOUNTED feature of GFileMonitor instead */
+        /**TODO** move the volume manager here? */
+        /**TODO** gio: This should be using the UNMOUNTED feature of GFileMonitor instead */
+
         this.volume_monitor = VolumeMonitor.get ();
         this.volume_monitor.mount_removed.connect (mount_removed_callback);
 

=== modified file 'src/Bookmark.vala'
--- src/Bookmark.vala	2014-03-16 18:08:56 +0000
+++ src/Bookmark.vala	2015-05-09 10:55:27 +0000
@@ -1,21 +1,21 @@
 /***
-  Copyright (C)  1999, 2000 Eazel, Inc.
-                 2014 elementary Developers and Jeremy Wootten
-
-  This program is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License version 3, as published
-  by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranties of
-  MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
-
- Authors :    John Sullivan <[e-mail]>
-              Jeremy Wootten <[e-mail]>
+    Copyright (C)  1999, 2000 Eazel, Inc.
+                   2015 elementary Developers
+
+    This program is free software: you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License version 3, as published
+    by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranties of
+    MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
+
+    Authors : John Sullivan <[e-mail]>
+              Jeremy Wootten <[e-mail]>
 ***/
 
 namespace Marlin {

=== modified file 'src/BookmarkList.vala'
--- src/BookmarkList.vala	2015-01-01 19:31:53 +0000
+++ src/BookmarkList.vala	2015-05-09 10:55:27 +0000
@@ -1,22 +1,22 @@
 /***
-  Copyright (C)  1999, 2000 Eazel, Inc.
-                 2014 elementary Developers and Jeremy Wootten
-
-  This program is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License version 3, as published
-  by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranties of
-  MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
-
- Authors :    John Sullivan <[e-mail]>
+    Copyright (C)  1999, 2000 Eazel, Inc.
+                   2015 elementary Developers
+
+    This program is free software: you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License version 3, as published
+    by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranties of
+    MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
+
+    Authors : John Sullivan <[e-mail]>
               ammonkey <[e-mail]>
-              Jeremy Wootten <[e-mail]>
+              Jeremy Wootten <[e-mail]>
 ***/
 
 namespace Marlin {

=== modified file 'src/ConnectServerOperation.vala'
--- src/ConnectServerOperation.vala	2014-04-16 03:31:35 +0000
+++ src/ConnectServerOperation.vala	2015-05-09 10:55:27 +0000
@@ -1,21 +1,21 @@
 /***
-  Copyright (C) 2010 Cosimo Cecchi <[e-mail]>
-  Copyright (C) 2013 elementary Developers
-
-  This program is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License version 3, as published
-  by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranties of
-  MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
-
-  Authors: Cosimo Cecchi <[e-mail]>
-           Julián Unrrein <[e-mail]>
+    Copyright (C) 2010 Cosimo Cecchi <[e-mail]>
+    Copyright (C) 2015 elementary Developers
+
+    This program is free software: you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License version 3, as published
+    by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranties of
+    MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
+
+    Authors: Cosimo Cecchi <[e-mail]>
+             Julián Unrrein <[e-mail]>
 ***/
 
 public class Marlin.ConnectServer.Operation : Gtk.MountOperation {
@@ -25,8 +25,8 @@
     public Operation (Marlin.ConnectServer.Dialog dialog) {
         this.dialog = dialog;
         this.set_parent (dialog);
-        
-        // Turn the parent's modal functionality off because the mount operation needs to take over
+
+        /* Turn the parent's modal functionality off because the mount operation needs to take over */
         this.dialog.modal = false;
         this.reply.connect ( (result) => {
            this.dialog.modal = true;
@@ -57,4 +57,4 @@
                 reply (MountOperationResult.ABORTED);
         });
     }
-}
\ No newline at end of file
+}

=== modified file 'src/DndHandler.vala'
--- src/DndHandler.vala	2015-01-13 21:59:38 +0000
+++ src/DndHandler.vala	2015-05-09 10:55:27 +0000
@@ -1,25 +1,23 @@
-/*
- * DndHandler.vala
- * 
- * Copyright 2014 jeremy <jeremy@jeremy-MM061>
- * 
- * 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.
- * 
- * This program is distributed in the hope that it will be useful,
- * but 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 Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- * 
- * 
- */
+/***
+    Copyright (C) 2015 elementary Developers
+
+    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.
+
+    This program is distributed in the hope that it will be useful,
+    but 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 Street, Fifth Floor, Boston,
+    MA 02110-1301, USA.
+
+    Authors: Jeremy Wootten <[e-mail]>
+***/
 
 namespace FM {
     public class DndHandler : GLib.Object {
@@ -81,7 +79,7 @@
         private void add_action (Gtk.ApplicationWindow win) {
             var action = new GLib.SimpleAction ("choice", GLib.VariantType.STRING);
             action.activate.connect (this.on_choice);
-            
+
             win.add_action (action);
         }
 
@@ -154,7 +152,7 @@
                                             null, null, /* actual property type and format got disregarded */
                                             out data
                                            );
- 
+
             if (exists && data != null) {
                 string name = data_to_string (data);
                 if (GLib.Path.DIR_SEPARATOR.to_string () in name) {

=== modified file 'src/Enums.vala'
--- src/Enums.vala	2015-01-18 20:46:03 +0000
+++ src/Enums.vala	2015-05-09 10:55:27 +0000
@@ -1,21 +1,21 @@
 /***
- * Copyright (c) 2006-2007 Benedikt Meurer <[e-mail]>
- * Copyright (c) 2009 Jannis Pohlmann <[e-mail]>
- * Copyright (c) 2015 Elementary Developers
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but 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., 59 Temple
- * Place, Suite 330, Boston, MA  02111-1307  USA
+    Copyright (c) 2006-2007 Benedikt Meurer <[e-mail]>
+    Copyright (c) 2009 Jannis Pohlmann <[e-mail]>
+    Copyright (c) 2015 Elementary Developers
+
+    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.
+
+    This program is distributed in the hope that it will be useful, but 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., 59 Temple
+    Place, Suite 330, Boston, MA  02111-1307  USA
  ***/
 
 namespace Marlin {

=== modified file 'src/MimeActions.vala'
--- src/MimeActions.vala	2015-03-26 02:19:38 +0000
+++ src/MimeActions.vala	2015-05-09 10:55:27 +0000
@@ -1,23 +1,23 @@
 /***
-  Copyright (C) 2000 Eazel, Inc.
-  Copyright (C) 2011 ammonkey <[e-mail]>
-  Copyright (C) 2013 elementary Developers
-
-  This program is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License version 3, as published
-  by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranties of
-  MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
-
-  Authors: Maciej Stachowiak <[e-mail]>
-           ammonkey <[e-mail]>
-           Julián Unrrein <[e-mail]>
+    Copyright (C) 2000 Eazel, Inc.
+    Copyright (C) 2011 ammonkey <[e-mail]>
+    Copyright (C) 2013 elementary Developers
+
+    This program is free software: you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License version 3, as published
+    by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranties of
+    MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
+
+    Authors: Maciej Stachowiak <[e-mail]>
+             ammonkey <[e-mail]>
+             Julián Unrrein <[e-mail]>
 ***/
 
 public class Marlin.MimeActions {

=== modified file 'src/MultiLineEditableLabel.vala'
--- src/MultiLineEditableLabel.vala	2015-02-06 22:57:55 +0000
+++ src/MultiLineEditableLabel.vala	2015-05-09 10:55:27 +0000
@@ -1,20 +1,20 @@
-/*
- Copyright (C) 2014 elementary Developers
-
- This program is free software: you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License version 3, as published
- by the Free Software Foundation.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranties of
- MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
-
- Authors : Jeremy Wootten <[e-mail]>
-*/
+/***
+    Copyright (C) 2015 elementary Developers
+
+    This program is free software: you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License version 3, as published
+    by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranties of
+    MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
+
+    Authors : Jeremy Wootten <[e-mail]>
+***/
 
 namespace Marlin {
     public class MultiLineEditableLabel : AbstractEditableLabel {

=== modified file 'src/ProgressInfoWidget.vala'
--- src/ProgressInfoWidget.vala	2014-12-28 09:17:26 +0000
+++ src/ProgressInfoWidget.vala	2015-05-09 10:55:27 +0000
@@ -1,22 +1,22 @@
 /***
-  Copyright (C) 2007, 2011 Red Hat, Inc.
-  Copyright (C) 2013 elementary Developers
-
-  This program is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License version 3, as published
-  by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranties of
-  MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
-
-  Authors: Alexander Larsson <[e-mail]>
-           Cosimo Cecchi <[e-mail]>
-           Julián Unrrein <[e-mail]>
+    Copyright (C) 2007, 2011 Red Hat, Inc.
+    Copyright (C) 2013 elementary Developers
+
+    This program is free software: you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License version 3, as published
+    by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranties of
+    MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
+
+    Authors: Alexander Larsson <[e-mail]>
+             Cosimo Cecchi <[e-mail]>
+             Julián Unrrein <[e-mail]>
 ***/
 
 public class Marlin.Progress.InfoWidget : Gtk.Box {
@@ -42,7 +42,7 @@
             destroy ();
         });
     }
-    
+
     private void build_and_show_widget () {
         this.orientation = Gtk.Orientation.VERTICAL;
         this.homogeneous = false;
@@ -69,7 +69,7 @@
             this.info.cancel ();
             button.sensitive = false;
         });
-        
+
         hbox.pack_start (button, false, false, 0);
 
         pack_start (hbox, false, false, 0);

=== modified file 'src/ProgressUIHandler.vala'
--- src/ProgressUIHandler.vala	2014-12-28 09:14:11 +0000
+++ src/ProgressUIHandler.vala	2015-05-09 10:55:27 +0000
@@ -1,22 +1,22 @@
 /***
-  Copyright (C) 2007, 2011 Red Hat, Inc.
-  Copyright (C) 2013 Julián Unrrein <[e-mail]>
-
-  This program is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License version 3, as published
-  by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranties of
-  MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
-
-  Authors: Alexander Larsson <[e-mail]>
-           Cosimo Cecchi <[e-mail]>
-           Julián Unrrein <[e-mail]>
+    Copyright (C) 2007, 2011 Red Hat, Inc.
+    Copyright (C) 2013 Julián Unrrein <[e-mail]>
+
+    This program is free software: you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License version 3, as published
+    by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranties of
+    MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
+
+    Authors: Alexander Larsson <[e-mail]>
+             Cosimo Cecchi <[e-mail]>
+             Julián Unrrein <[e-mail]>
 ***/
 
 public class Marlin.Progress.UIHandler : Object {

=== modified file 'src/QuicklistHandler.vala'
--- src/QuicklistHandler.vala	2014-01-07 22:25:32 +0000
+++ src/QuicklistHandler.vala	2015-05-09 10:55:27 +0000
@@ -1,18 +1,18 @@
 /***
-  Copyright (C) 2012 Canonical
-  Copyright (C) 2013 Julián Unrrein <[e-mail]>
-
-  This program is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License version 3, as published
-  by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranties of
-  MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
+    Copyright (C) 2012 Canonical
+    Copyright (C) 2013 Julián Unrrein <[e-mail]>
+
+    This program is free software: you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License version 3, as published
+    by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranties of
+    MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
 ***/
 
 namespace Marlin {

=== modified file 'src/SingleLineEditableLabel.vala'
--- src/SingleLineEditableLabel.vala	2014-12-25 08:43:14 +0000
+++ src/SingleLineEditableLabel.vala	2015-05-09 10:55:27 +0000
@@ -1,20 +1,20 @@
-/*
- Copyright (C) 2014 elementary Developers
-
- This program is free software: you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License version 3, as published
- by the Free Software Foundation.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranties of
- MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
-
- Authors : Jeremy Wootten <[e-mail]>
-*/
+/***
+    Copyright (C) 2015 elementary Developers
+
+    This program is free software: you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License version 3, as published
+    by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranties of
+    MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
+
+    Authors : Jeremy Wootten <[e-mail]>
+***/
 
 namespace Marlin {
     public class SingleLineEditableLabel : AbstractEditableLabel {

=== modified file 'src/TextRenderer.vala'
--- src/TextRenderer.vala	2015-03-26 02:19:38 +0000
+++ src/TextRenderer.vala	2015-05-09 10:55:27 +0000
@@ -1,20 +1,20 @@
-/*
- Copyright (C) 2014 elementary Developers
-
- This program is free software: you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License version 3, as published
- by the Free Software Foundation.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranties of
- MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
-
- Authors : Jeremy Wootten <[e-mail]>
-*/
+/***
+    Copyright (C) 2015 elementary Developers
+
+    This program is free software: you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License version 3, as published
+    by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranties of
+    MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
+
+    Authors: Jeremy Wootten <[e-mail]>
+***/
 
 namespace Marlin {
     public class TextRenderer: Gtk.CellRendererText {

=== modified file 'src/View/AbstractDirectoryView.vala'
--- src/View/AbstractDirectoryView.vala	2015-04-18 12:10:52 +0000
+++ src/View/AbstractDirectoryView.vala	2015-05-09 10:55:27 +0000
@@ -1,27 +1,27 @@
-/*
- Copyright (C) 2014 elementary Developers
-
- This program is free software: you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License version 3, as published
- by the Free Software Foundation.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranties of
- MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
-
- Authors : Jeremy Wootten <[e-mail]>
+/***
+    Copyright (C) 2015 elementary Developers
+
+    This program is free software: you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License version 3, as published
+    by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranties of
+    MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
+
+    Authors : Jeremy Wootten <[e-mail]>
+***/
+
+/* Implementations of AbstractDirectoryView are
+     * IconView
+     * ListView
+     * ColumnView
 */
 
-/** Implementations of AbstractDirectoryView are
- * IconView
- * ListView
- * ColumnView
-**/
-
 namespace FM {
     public abstract class AbstractDirectoryView : Gtk.ScrolledWindow {
 
@@ -163,7 +163,8 @@
         uint thumbnail_source_id = 0;
         Marlin.Thumbnailer thumbnailer = null;
 
-        /* TODO Support for preview see bug #1380139 */
+        /**TODO** Support for preview see bug #1380139 */
+
         private string? previewer = null;
 
         /* Rename support */
@@ -193,24 +194,25 @@
         private GLib.List<GLib.AppInfo> open_with_apps;
         protected GLib.List<GOF.Directory.Async>? loaded_subdirectories = null;
 
-        /* TODO: Remove the "unowned" portion of the declaration for
-                 selected_files and on code that repeats its type.
-
-                 Selected files are originally obtained with
-                 gtk_tree_model_get(): this function increases the reference
-                 count of the file object.
-
-                 In order to prevent the obvious memory leak when inserting
-                 these owned objects into the unowned element container, the
-                 objects are unreferenced upon being inserted.
-
-                 This results in a container filled with weak references to
-                 objects with reference counts of 1.
-
-                 A scenario may occur that the cell holding the original file
-                 object is destroyed, and the container is left with pointers
-                 pointing to freed memory. Reference counting the container
-                 elements would prevent this possibility. */
+        /**TODO**:  Remove the "unowned" portion of the declaration for
+                    selected_files and on code that repeats its type.
+
+                    Selected files are originally obtained with
+                    gtk_tree_model_get(): this function increases the reference
+                    count of the file object.
+
+                    In order to prevent the obvious memory leak when inserting
+                    these owned objects into the unowned element container, the
+                    objects are unreferenced upon being inserted.
+
+                    This results in a container filled with weak references to
+                    objects with reference counts of 1.
+
+                    A scenario may occur that the cell holding the original file
+                    object is destroyed, and the container is left with pointers
+                    pointing to freed memory. Reference counting the container
+                    elements would prevent this possibility.*/
+
         protected GLib.List<unowned GOF.File> selected_files = null;
 
         private GLib.List<unowned GOF.File>? templates = null;
@@ -824,9 +826,10 @@
             unselect_all ();
             select_gof_file (file_to_rename);
 
-            /* Assume writability on remote locations
-             * TODO Reliably determine writability with various remote protocols.
-             */
+            /* Assume writability on remote locations */
+
+            /**TODO** Reliably determine writability with various remote protocols.*/
+
             if (file_to_rename.is_writable () || !slot.directory.is_local)
                 start_renaming_file (file_to_rename, false);
             else
@@ -852,8 +855,10 @@
 
             /* Allow time for the file to appear in the tree model before renaming
              * Wait longer for remote locations to allow for reload.
-             * TODO: Remove need for hard coded delay.
              */
+
+            /**TODO** Remove need for hard coded delay*/
+
             int delay = local ? 250 : 500;
             GLib.Timeout.add (delay, () => {
                 view.rename_file (file_to_rename);
@@ -920,9 +925,10 @@
                 return;
 
             if (selected_files.next != null)
-                /* TODO invoke batch renamer see bug #1014122*/
                 warning ("Cannot rename multiple files (yet) - renaming first only");
 
+            /**TODO** invoke batch renamer see bug #1014122*/
+
             var file = selected_files.first ().data;
             bool preselect_whole_name = file.is_folder ();
 
@@ -1991,7 +1997,9 @@
                                  file.is_smb_server ());
 
             action_set_enabled (common_actions, "bookmark", can_bookmark);
-            /* TODO inhibit copy for unreadable files see bug #1392465*/
+
+            /**TODO** inhibit copy for unreadable files see bug #1392465*/
+
             action_set_enabled (common_actions, "copy", !in_trash);
             action_set_enabled (common_actions, "bookmark", !more_than_one_selected);
         }
@@ -2449,7 +2457,7 @@
                         new_empty_folder ();
 
                    return true;
-                   
+
                 case Gdk.Key.A:
                     if (shift_pressed && only_control_pressed)
                         invert_selection ();

=== modified file 'src/View/AbstractTreeView.vala'
--- src/View/AbstractTreeView.vala	2015-04-18 12:10:52 +0000
+++ src/View/AbstractTreeView.vala	2015-05-09 10:55:27 +0000
@@ -1,20 +1,20 @@
-/*
- Copyright (C) 2014 elementary Developers
-
- This program is free software: you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License version 3, as published
- by the Free Software Foundation.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranties of
- MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
-
- Authors :
-*/
+/***
+    Copyright (C) 2015 elementary Developers
+
+    This program is free software: you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License version 3, as published
+    by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranties of
+    MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
+
+    Authors : Jeremy Wootten <[e-mail]>
+***/
 
 namespace FM {
     /* Implement common features of ColumnView and ListView */
@@ -72,7 +72,7 @@
             name_renderer.@set ("ellipsize-set", true);
             name_renderer.@set ("ellipsize", Pango.EllipsizeMode.END);
             name_renderer.xalign = 0.0f;
-            name_renderer.yalign = 0.5f; 
+            name_renderer.yalign = 0.5f;
         }
 
         protected void connect_tree_signals () {

=== modified file 'src/View/Browser.vala'
--- src/View/Browser.vala	2014-09-20 10:12:14 +0000
+++ src/View/Browser.vala	2015-05-09 10:55:27 +0000
@@ -1,21 +1,21 @@
-/*
- * Copyright (C) 2010 ammonkey
- *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License
- * version 3.0 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3.0 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see
- * <http://www.gnu.org/licenses/>.
- *
- * Author: ammonkey <[e-mail]>
- */
+/***
+    Copyright (C) 2010 ammonkey
+
+    This library is free software; you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License
+    version 3.0 as published by the Free Software Foundation.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License version 3.0 for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library. If not, see
+    <http://www.gnu.org/licenses/>.
+
+    Author: ammonkey <[e-mail]>
+***/
 
 namespace Marlin.View {
 

=== modified file 'src/View/Chrome/ButtonWithMenu.vala'
--- src/View/Chrome/ButtonWithMenu.vala	2014-04-25 20:20:25 +0000
+++ src/View/Chrome/ButtonWithMenu.vala	2015-05-09 10:55:27 +0000
@@ -10,7 +10,7 @@
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
     Lesser General Public License for more details.
- 
+
     You should have received a copy of the GNU Lesser General
     Public License along with this library; if not, write to the
     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
@@ -81,11 +81,11 @@
 
         public ulong toggled_sig_id;
 
-        /** 
-         * Delegate function used to populate menu 
+        /**
+         * Delegate function used to populate menu
          */
         public delegate Gtk.Menu MenuFetcher ();
-        
+
         public signal void slow_press ();
 
         public MenuFetcher fetcher {
@@ -173,15 +173,15 @@
         }
 
         private bool on_button_press_event (Gdk.EventButton ev) {
-            // If the button is kept pressed, don't make the user wait when there's no action
+            /* If the button is kept pressed, don't make the user wait when there's no action */
             int max_press_time = LONG_PRESS_TIME;
             if (ev.button == 1 || ev.button == 3)
                 active = true;
-                
+
             if (timeout == -1 && ev.button == 1) {
                 last_click_time = ev.time;
                 timeout = (int) Timeout.add(max_press_time, () => {
-                    // long click
+                    /* long click */
                     timeout = -1;
                     popup_menu (ev);
                     return false;
@@ -189,7 +189,7 @@
             }
 
             if (ev.button == 3) {
-                // right_click
+                /* right_click */
                 right_click (ev);
                 popup_menu (ev);
             }
@@ -198,9 +198,10 @@
         }
 
         private bool on_mnemonic_activate (bool group_cycling) {
-            // ToggleButton always grabs focus away from the editor,
-            // so reimplement Widget's version, which only grabs the
-            // focus if we are group cycling.
+            /* ToggleButton always grabs focus away from the editor,
+             * so reimplement Widget's version, which only grabs the
+             * focus if we are group cycling.
+             */
             if (!group_cycling) {
                 activate ();
             } else if (can_focus) {
@@ -239,7 +240,7 @@
             menu.get_allocation (out menu_allocation);
 
             if (menu.attach_widget == null || menu.attach_widget.get_window () == null) {
-                // Prevent null exception in weird cases
+                /* Prevent null exception in weird cases */
                 x = 0;
                 y = 0;
                 push_in = true;
@@ -247,7 +248,7 @@
             }
 
             menu.attach_widget.get_window ().get_origin (out x, out y);
-            
+
             Gtk.Allocation allocation;
             menu.attach_widget.get_allocation (out allocation);
 
@@ -286,8 +287,9 @@
                 int parent_window_x0 = x;
                 int parent_window_xf = parent_window_x0 + window_allocation.width;
 
-                // Now check if the menu is outside the window and un-center it
-                // if that's the case
+                /* Now check if the menu is outside the window and un-center it
+                 * if that's the case
+                 */
 
                 if (x + menu_allocation.width > parent_window_xf)
                     x = parent_window_xf - menu_allocation.width; // Move to left
@@ -306,4 +308,4 @@
             push_in = true;
         }
     }
-}
\ No newline at end of file
+}

=== modified file 'src/View/Chrome/ImgEventBox.vala'
--- src/View/Chrome/ImgEventBox.vala	2013-07-21 04:44:33 +0000
+++ src/View/Chrome/ImgEventBox.vala	2015-05-09 10:55:27 +0000
@@ -1,21 +1,21 @@
-/*
- * Copyright (C) 2011 Elementary Developers
- *
- * 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 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but 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, see <http://www.gnu.org/licenses/>.
- *
- * Author: ammonkey <[e-mail]>
- */
+/***
+    Copyright (C) 2011 Elementary Developers
+
+    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 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but 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, see <http://www.gnu.org/licenses/>.
+
+    Author: ammonkey <[e-mail]>
+***/
 
 namespace Granite.Widgets {
 
@@ -36,7 +36,6 @@
             get_allocation (out vba);
 
             if (pix != null) {
-                //cairo_set_source_pixbuf (cr, pix, 0, 0);
                 if (orientation == Gtk.Orientation.HORIZONTAL)
                     Gdk.cairo_set_source_pixbuf (cr, pix, vba.width/2 - wpix/2, 0);
                 else
@@ -51,7 +50,7 @@
             pix = _pix;
             wpix = pix.get_width ();
             hpix = pix.get_height ();
-            //message ("evbox set_from_pix %d %d", wpix, hpix);
+
             if (orientation == Gtk.Orientation.HORIZONTAL)
                 set_size_request (-1, hpix);
             else

=== modified file 'src/View/Chrome/TopMenu.vala'
--- src/View/Chrome/TopMenu.vala	2014-10-29 11:20:08 +0000
+++ src/View/Chrome/TopMenu.vala	2015-05-09 10:55:27 +0000
@@ -1,24 +1,25 @@
-//
-//  TopMenu.cs
-//
-//  Authors:
-//       mathijshenquet <[e-mail]>
-//       ammonkey <[e-mail]>
-//
-//  Copyright (c) 2010 mathijshenquet
-//
-//  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 3 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but 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, see <http://www.gnu.org/licenses/>.
+/***
+    TopMenu.cs
+
+    Authors:
+       mathijshenquet <[e-mail]>
+       ammonkey <[e-mail]>
+
+    Copyright (c) 2010 mathijshenquet
+
+    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 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but 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, see <http://www.gnu.org/licenses/>.
+***/
 
 namespace Marlin.View.Chrome
 {
@@ -74,7 +75,7 @@
                 win.add_tab (file, Marlin.ViewMode.CURRENT);
             });
 
-            
+
             location_bar.show_all ();
             view_switcher.margin_right = 20;
             pack_start (location_bar);
@@ -87,10 +88,11 @@
             var back_menu = new Gtk.Menu ();
             var n = 1;
             foreach (string path in path_list) {
-                int cn = n++; // No i'm not mad, thats just how closures work in vala (and other langs).
-                              // You see if I would just use back(n) the reference to n would be passed
-                              // in the clusure, restulting in a value of n which would always be n=1. So
-                              // by introducting a new variable I can bypass this anoyance.
+                int cn = n++; /* No i'm not mad, thats just how closures work in vala (and other langs).
+                               * You see if I would just use back(n) the reference to n would be passed
+                               * in the clusure, restulting in a value of n which would always be n=1. So
+                               * by introducting a new variable I can bypass this anoyance.
+                               */
                 var item = new Gtk.MenuItem.with_label (GLib.Uri.unescape_string (path));
                 item.activate.connect (() => {
                     back(cn);
@@ -107,7 +109,7 @@
             var forward_menu = new Gtk.Menu ();
             var n = 1;
             foreach (string path in path_list) {
-                int cn = n++; // For explanation look up
+                int cn = n++; /* For explanation look up */
                 var item = new Gtk.MenuItem.with_label (GLib.Uri.unescape_string (path));
                 item.activate.connect (() => {
                     forward (cn);

=== modified file 'src/View/Chrome/ViewSwicher.vala'
--- src/View/Chrome/ViewSwicher.vala	2014-08-13 10:40:54 +0000
+++ src/View/Chrome/ViewSwicher.vala	2015-05-09 10:55:27 +0000
@@ -1,24 +1,25 @@
-//
-//  ViewSwicher.cs
-//
-//  Authors:
-//       mathijshenquet <[e-mail]>
-//       ammonkey <[e-mail]>
-//
-//  Copyright (c) 2010 mathijshenquet
-//
-//  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 3 of the License, or
-//  (at your option) any later version.
-//
-//  This program is distributed in the hope that it will be useful,
-//  but 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, see <http://www.gnu.org/licenses/>.
+/***
+    ViewSwicher.cs
+
+    Authors:
+       mathijshenquet <[e-mail]>
+       ammonkey <[e-mail]>
+
+    Copyright (c) 2010 mathijshenquet
+
+    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 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but 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, see <http://www.gnu.org/licenses/>.
+***/
 
 namespace Marlin.View.Chrome {
 
@@ -48,7 +49,6 @@
                 }
 
                 Preferences.settings.set_enum ("default-viewmode", value);
-                //switcher.focus(target);
                 freeze_update = true;
                 switcher.set_active (active_index);
                 freeze_update = false;

=== modified file 'src/View/Chrome/XsEntry.vala'
--- src/View/Chrome/XsEntry.vala	2013-07-21 04:44:33 +0000
+++ src/View/Chrome/XsEntry.vala	2015-05-09 10:55:27 +0000
@@ -1,21 +1,20 @@
-/*
- * Copyright (C) 2011 Elementary Developers
- *
- * 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 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but 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, see <http://www.gnu.org/licenses/>.
- *
- * Author: ammonkey <[e-mail]>
- */
+/***
+    Copyright (C) 2011 Elementary Developers
+
+    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 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but 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, see <http://www.gnu.org/licenses/>.
+
+***/
 
 /* Just a workarround Gtk.Entry which got a minimum fixed prefered width.
    With XsEntry we can set the exact width we want */

=== modified file 'src/View/ColumnView.vala'
--- src/View/ColumnView.vala	2015-01-01 10:33:58 +0000
+++ src/View/ColumnView.vala	2015-05-09 10:55:27 +0000
@@ -1,20 +1,20 @@
-/*
- Copyright (C) 2014 elementary Developers
-
- This program is free software: you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License version 3, as published
- by the Free Software Foundation.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranties of
- MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
-
- Authors : Jeremy Wootten <[e-mail]>
-*/
+/***
+    Copyright (C) 2015 elementary Developers
+
+    This program is free software: you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License version 3, as published
+    by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranties of
+    MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
+
+    Authors : Jeremy Wootten <[e-mail]>
+***/
 
 
 namespace FM {

=== modified file 'src/View/DirectoryNotFound.vala'
--- src/View/DirectoryNotFound.vala	2014-08-17 12:29:52 +0000
+++ src/View/DirectoryNotFound.vala	2015-05-09 10:55:27 +0000
@@ -1,22 +1,22 @@
-/*
- * Copyright (c) 2011 Lucas Baudin <[e-mail]>
- *
- * Marlin 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.
- *
- * Marlin is distributed in the hope that it will be useful,
- * but 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; see the file COPYING.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
+/***
+    Copyright (c) 2011 Lucas Baudin <[e-mail]>
+
+    Marlin 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.
+
+    Marlin is distributed in the hope that it will be useful,
+    but 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; see the file COPYING.  If not,
+    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+    Boston, MA 02111-1307, USA.
+
+***/
 
 namespace Marlin.View
 {

=== modified file 'src/View/DiskRenderer.vala'
--- src/View/DiskRenderer.vala	2014-12-23 19:22:59 +0000
+++ src/View/DiskRenderer.vala	2015-05-09 10:55:27 +0000
@@ -1,22 +1,22 @@
-/*
- * Copyright (c) 2011 Lucas Baudin <[e-mail]>
- *
- * Marlin 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.
- *
- * Marlin is distributed in the hope that it will be useful,
- * but 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; see the file COPYING.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- */
+/***
+     Copyright (c) 2011 Lucas Baudin <[e-mail]>
+
+     Marlin 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.
+
+     Marlin is distributed in the hope that it will be useful,
+     but 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; see the file COPYING.  If not,
+     write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+
+***/
 
 public class Marlin.CellRendererDisk : Gtk.CellRendererText {
 
@@ -52,7 +52,7 @@
                                  Gdk.Rectangle background_area, Gdk.Rectangle area,
                                  Gtk.CellRendererState flags) {
         base.render (cr, widget, background_area, area, flags);
-        area.x+= offset; 
+        area.x+= offset;
         area.width-= offset;
         if (free_space > 0) {
             Gtk.StateFlags state;

=== modified file 'src/View/IconSpinnerRenderer.vala'
--- src/View/IconSpinnerRenderer.vala	2014-07-12 23:39:32 +0000
+++ src/View/IconSpinnerRenderer.vala	2015-05-09 10:55:27 +0000
@@ -1,26 +1,26 @@
-/*
- * Copyright (c) 2014 elementary Developers and Jeremy Wootten
- *
- * Marlin 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.
- *
- * Marlin is distributed in the hope that it will be useful,
- * but 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; see the file COPYING.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors : Jeremy Wootten <[e-mail]>
- *
- * Based on gtkcellrendererspinner.c and gtkcellrendererpixbuf.c from
- * GTK - the GIMP Toolkit.
- */
+/***
+    Copyright (c) 2015 elementary Developers
+
+    Marlin 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.
+
+    Marlin is distributed in the hope that it will be useful,
+    but 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; see the file COPYING.  If not,
+    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+    Boston, MA 02111-1307, USA.
+
+    Authors :  Jeremy Wootten <[e-mail]>
+
+    Based on gtkcellrendererspinner.c and gtkcellrendererpixbuf.c from
+    GTK - the GIMP Toolkit.
+***/
 
 public class Marlin.IconSpinnerRenderer : Gtk.CellRenderer {
 

=== modified file 'src/View/IconView.vala'
--- src/View/IconView.vala	2015-04-18 10:47:13 +0000
+++ src/View/IconView.vala	2015-05-09 10:55:27 +0000
@@ -1,20 +1,20 @@
-/*
- Copyright (C) 2014 elementary Developers
-
- This program is free software: you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License version 3, as published
- by the Free Software Foundation.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranties of
- MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
-
- Authors : Jeremy Wootten <[e-mail]>
-*/
+/***
+    Copyright (C) 2015 elementary Developers
+
+    This program is free software: you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License version 3, as published
+    by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranties of
+    MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
+
+    Authors : Jeremy Wootten <[e-mail]>
+***/
 
 namespace FM {
     public class IconView : AbstractDirectoryView {

=== modified file 'src/View/ListView.vala'
--- src/View/ListView.vala	2015-03-26 02:19:38 +0000
+++ src/View/ListView.vala	2015-05-09 10:55:27 +0000
@@ -1,20 +1,20 @@
-/*
- Copyright (C) 2014 elementary Developers
-
- This program is free software: you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License version 3, as published
- by the Free Software Foundation.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranties of
- MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
-
- Authors : Jeremy Wootten <[e-mail]>
-*/
+/***
+    Copyright (C) 2015 elementary Developers
+
+    This program is free software: you can redistribute it and/or modify it
+    under the terms of the GNU Lesser General Public License version 3, as published
+    by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranties of
+    MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
+
+    Authors : Jeremy Wootten <[e-mail]>
+***/
 
 namespace FM {
     public class ListView : AbstractTreeView {
@@ -53,7 +53,7 @@
                     var renderer = new Gtk.CellRendererText ();
                     var col = new Gtk.TreeViewColumn.with_attributes (column_titles [k - fnc],
                                                                       renderer,
-                                                                      "text", k);     
+                                                                      "text", k);
                     col.set_sort_column_id (k);
                     col.set_resizable (false);
                     col.set_expand (false);
@@ -207,10 +207,10 @@
         protected override bool get_next_visible_iter (ref Gtk.TreeIter iter, bool recurse = true) {
             Gtk.TreePath? path = model.get_path (iter);
             Gtk.TreeIter start = iter;
- 
+
             if (path == null)
                 return false;
- 
+