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

Proposed by Jeremy Wootten
Status: Merged
Approved by: Cody Garver
Approved revision: 1813
Merged at revision: 1816
Proposed branch: lp:~jeremywootten/pantheon-files/split-view-preparation-code-clean
Merge into: lp:~elementary-apps/pantheon-files/trunk
Diff against target: 6279 lines (+1919/-1923)
91 files modified
libcore/AbstractSidebar.vala (+17/-17)
libcore/AbstractSlot.vala (+16/-16)
libcore/CMakeLists.txt (+8/-8)
libcore/PluginManager.vala (+24/-27)
libcore/eel-accessibility.c (+208/-222)
libcore/eel-accessibility.h (+59/-59)
libcore/eel-debug.c (+17/-17)
libcore/eel-debug.h (+1/-1)
libcore/eel-fcts.c (+77/-77)
libcore/eel-gdk-pixbuf-extensions.c (+2/-2)
libcore/eel-gio-extensions.c (+4/-4)
libcore/eel-glib-extensions.c (+2/-2)
libcore/eel-gtk-extensions.c (+8/-8)
libcore/eel-gtk-extensions.h (+6/-6)
libcore/eel-pango-extensions.c (+9/-2)
libcore/eel-stock-dialogs.c (+3/-3)
libcore/eel-ui.c (+5/-5)
libcore/eel-vfs-extensions.c (+2/-2)
libcore/eel-vfs-extensions.h (+3/-3)
libcore/fm-list-model.c (+3/-3)
libcore/gof-callwhenready.vala (+20/-51)
libcore/gof-directory-async.vala (+24/-22)
libcore/gof-file.c (+69/-69)
libcore/gof-file.h (+9/-9)
libcore/gof-preferences.vala (+16/-16)
libcore/marlin-file-changes-queue.c (+1/-1)
libcore/marlin-file-conflict-dialog.c (+5/-5)
libcore/marlin-file-operations.c (+2/-2)
libcore/marlin-file-utilities.c (+74/-71)
libcore/marlin-file-utilities.h (+1/-1)
libcore/marlin-icons.h (+3/-3)
libcore/marlin-progress-info-manager.h (+1/-1)
libcore/marlin-progress-info.c (+148/-150)
libcore/marlin-progress-info.h (+6/-6)
libcore/marlin-trash-monitor.h (+5/-5)
libwidgets/Animations.vala (+18/-0)
libwidgets/BreadcrumbsElements.vala (+19/-19)
libwidgets/LocationBar.vala (+44/-45)
libwidgets/PoofWindow.vala (+16/-16)
plugins/contractor/CMakeLists.txt (+2/-2)
plugins/contractor/plugin.vala (+22/-22)
plugins/network-places/plugin.vala (+18/-18)
plugins/pantheon-files-ctags/CMakeLists.txt (+3/-3)
plugins/pantheon-files-ctags/plugin.vala (+16/-16)
plugins/pantheon-files-trash/CMakeLists.txt (+3/-3)
plugins/pantheon-files-trash/plugin.vala (+16/-16)
src/AbstractEditableLabel.vala (+19/-19)
src/Application.vala (+22/-21)
src/Bookmark.vala (+17/-17)
src/BookmarkList.vala (+17/-17)
src/ConnectServerOperation.vala (+20/-20)
src/DndHandler.vala (+22/-24)
src/Enums.vala (+17/-17)
src/MimeActions.vala (+19/-19)
src/MultiLineEditableLabel.vala (+17/-17)
src/ProgressInfoWidget.vala (+20/-20)
src/ProgressUIHandler.vala (+18/-18)
src/QuicklistHandler.vala (+14/-14)
src/SingleLineEditableLabel.vala (+17/-17)
src/TextRenderer.vala (+17/-17)
src/View/AbstractDirectoryView.vala (+56/-48)
src/View/AbstractTreeView.vala (+18/-18)
src/View/Browser.vala (+18/-18)
src/View/Chrome/ButtonWithMenu.vala (+18/-16)
src/View/Chrome/ImgEventBox.vala (+19/-20)
src/View/Chrome/TopMenu.vala (+29/-27)
src/View/Chrome/ViewSwicher.vala (+22/-22)
src/View/Chrome/XsEntry.vala (+17/-18)
src/View/ColumnView.vala (+17/-17)
src/View/DirectoryNotFound.vala (+19/-19)
src/View/DiskRenderer.vala (+20/-20)
src/View/IconSpinnerRenderer.vala (+23/-23)
src/View/IconView.vala (+17/-17)
src/View/ListView.vala (+21/-21)
src/View/LocationBar.vala (+27/-27)
src/View/Miller.vala (+21/-21)
src/View/OverlayBar.vala (+17/-17)
src/View/PropertiesWindow.vala (+44/-84)
src/View/Resources.vala (+21/-3)
src/View/SearchResults.vala (+33/-14)
src/View/Sidebar.vala (+19/-19)
src/View/Slot.vala (+17/-17)
src/View/ViewContainer.vala (+23/-23)
src/View/Window.vala (+22/-22)
src/ZeitgeistManager.vala (+17/-1)
src/main.vala (+13/-13)
src/marlin-clipboard-manager.c (+1/-1)
src/marlin-connect-server-dialog.c (+6/-6)
src/marlin-deep-count.vala (+23/-28)
src/marlin-icon-renderer.h (+9/-9)
src/marlin.vapi (+1/-1)
To merge this branch: bzr merge lp:~jeremywootten/pantheon-files/split-view-preparation-code-clean
Reviewer Review Type Date Requested Status
Cody Garver (community) Approve
Rico Tzschichholz Needs Fixing
Review via email: mp+257997@code.launchpad.net

Commit message

Code clean: tabs, trailing space, headers, comments

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Cody Garver (codygarver) wrote :

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

review: Needs Fixing
Revision history for this message
Jeremy Wootten (jeremywootten) wrote :

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.

Revision history for this message
Rico Tzschichholz (ricotz) wrote :

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

review: Needs Fixing
Revision history for this message
Daniel Fore (danrabbit) wrote :

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 ;)

Revision history for this message
Jeremy Wootten (jeremywootten) wrote :

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

Revision history for this message
Rico Tzschichholz (ricotz) wrote :

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

review: Needs Fixing
1813. By Jeremy Wootten

Fix alignment in marlin-progress-info.c

Revision history for this message
Jeremy Wootten (jeremywootten) wrote :

Alignment in marlin-progress-info fixed.

Revision history for this message
Cody Garver (codygarver) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libcore/AbstractSidebar.vala'
2--- libcore/AbstractSidebar.vala 2015-04-03 17:29:50 +0000
3+++ libcore/AbstractSidebar.vala 2015-05-09 10:55:27 +0000
4@@ -1,20 +1,20 @@
5 /***
6- Copyright (C) 2014 elementary Developers and Jeremy Wootten
7-
8- This program is free software: you can redistribute it and/or modify it
9- under the terms of the GNU Lesser General Public License version 3, as published
10- by the Free Software Foundation.
11-
12- This program is distributed in the hope that it will be useful, but
13- WITHOUT ANY WARRANTY; without even the implied warranties of
14- MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
15- PURPOSE. See the GNU General Public License for more details.
16-
17- You should have received a copy of the GNU General Public License along
18- with this program. If not, see <http://www.gnu.org/licenses/>.
19-
20- Authors : Lucas Baudin <xapantu@gmail.com>
21- Jeremy Wootten <jeremywootten@gmail.com>
22+ Copyright (C) 2015 elementary Developers
23+
24+ This program is free software: you can redistribute it and/or modify it
25+ under the terms of the GNU Lesser General Public License version 3, as published
26+ by the Free Software Foundation.
27+
28+ This program is distributed in the hope that it will be useful, but
29+ WITHOUT ANY WARRANTY; without even the implied warranties of
30+ MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
31+ PURPOSE. See the GNU General Public License for more details.
32+
33+ You should have received a copy of the GNU General Public License along
34+ with this program. If not, see <http://www.gnu.org/licenses/>.
35+
36+ Authors : Lucas Baudin <xapantu@gmail.com>
37+ Jeremy Wootten <jeremy@elementaryos.org>
38 ***/
39
40 namespace Marlin {
41@@ -76,7 +76,7 @@
42 typeof (bool), /* Show spinner */
43 typeof (uint), /* Spinner pulse */
44 typeof (uint64), /* Free space */
45- typeof (uint64), /* For disks, total size */
46+ typeof (uint64), /* For disks, total size */
47 typeof (Marlin.PluginCallbackFunc)
48 );
49
50
51=== modified file 'libcore/AbstractSlot.vala'
52--- libcore/AbstractSlot.vala 2015-04-06 10:43:26 +0000
53+++ libcore/AbstractSlot.vala 2015-05-09 10:55:27 +0000
54@@ -1,20 +1,20 @@
55 /***
56- Copyright (C) 2014 elementary Developers and Jeremy Wootten
57-
58- This program is free software: you can redistribute it and/or modify it
59- under the terms of the GNU Lesser General Public License version 3, as published
60- by the Free Software Foundation.
61-
62- This program is distributed in the hope that it will be useful, but
63- WITHOUT ANY WARRANTY; without even the implied warranties of
64- MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
65- PURPOSE. See the GNU General Public License for more details.
66-
67- You should have received a copy of the GNU General Public License along
68- with this program. If not, see <http://www.gnu.org/licenses/>.
69-
70- Authors : Lucas Baudin <xapantu@gmail.com>
71- Jeremy Wootten <jeremywootten@gmail.com>
72+ Copyright (C) 2015 elementary Developers
73+
74+ This program is free software: you can redistribute it and/or modify it
75+ under the terms of the GNU Lesser General Public License version 3, as published
76+ by the Free Software Foundation.
77+
78+ This program is distributed in the hope that it will be useful, but
79+ WITHOUT ANY WARRANTY; without even the implied warranties of
80+ MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
81+ PURPOSE. See the GNU General Public License for more details.
82+
83+ You should have received a copy of the GNU General Public License along
84+ with this program. If not, see <http://www.gnu.org/licenses/>.
85+
86+ Authors : Lucas Baudin <xapantu@gmail.com>
87+ Jeremy Wootten <jeremy@elementaryos.org>
88 ***/
89
90 namespace GOF {
91
92=== modified file 'libcore/CMakeLists.txt'
93--- libcore/CMakeLists.txt 2014-08-23 11:50:48 +0000
94+++ libcore/CMakeLists.txt 2015-05-09 10:55:27 +0000
95@@ -107,16 +107,16 @@
96
97 find_package(PkgConfig)
98 pkg_check_modules(DEPS REQUIRED
99- glib-2.0>=2.29.0
100- gthread-2.0
101- gio-2.0
102- pango>=1.1.2
103- gtk+-3.0>=3.4.0
104- gail-3.0
105+ glib-2.0>=2.29.0
106+ gthread-2.0
107+ gio-2.0
108+ pango>=1.1.2
109+ gtk+-3.0>=3.4.0
110+ gail-3.0
111 gee-0.8
112 gmodule-2.0
113- sqlite3
114- libnotify>=0.7.2)
115+ sqlite3
116+ libnotify>=0.7.2)
117 # Link all
118
119 set(CFLAGS ${DEPS_CFLAGS} ${DEPS_CFLAGS_OTHER})
120
121=== modified file 'libcore/PluginManager.vala'
122--- libcore/PluginManager.vala 2014-10-09 12:36:25 +0000
123+++ libcore/PluginManager.vala 2015-05-09 10:55:27 +0000
124@@ -1,23 +1,23 @@
125-/*
126- * Copyright (C) 2011 Lucas Baudin <xapantu@gmail.com>
127- *
128- * Author: Zeeshan Ali (Khattak) <zeeshanak@gnome.org> (from Rygel)
129- *
130- * This file is part of Marlin.
131- *
132- * Marlin is free software: you can redistribute it and/or modify it
133- * under the terms of the GNU General Public License as published by the
134- * Free Software Foundation, either version 3 of the License, or
135- * (at your option) any later version.
136- *
137- * Marlin is distributed in the hope that it will be useful, but
138- * WITHOUT ANY WARRANTY; without even the implied warranty of
139- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
140- * See the GNU General Public License for more details.
141- *
142- * You should have received a copy of the GNU General Public License along
143- * with this program. If not, see <http://www.gnu.org/licenses/>.
144- */
145+/***
146+ Copyright (C) 2011 Lucas Baudin <xapantu@gmail.com>
147+
148+ Author: Zeeshan Ali (Khattak) <zeeshanak@gnome.org> (from Rygel)
149+
150+ This file is part of Marlin.
151+
152+ Marlin is free software: you can redistribute it and/or modify it
153+ under the terms of the GNU General Public License as published by the
154+ Free Software Foundation, either version 3 of the License, or
155+ (at your option) any later version.
156+
157+ Marlin is distributed in the hope that it will be useful, but
158+ WITHOUT ANY WARRANTY; without even the implied warranty of
159+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
160+ See the GNU General Public License for more details.
161+
162+ You should have received a copy of the GNU General Public License along
163+ with this program. If not, see <http://www.gnu.org/licenses/>.
164+***/
165
166 public static Marlin.PluginManager plugins;
167
168@@ -30,7 +30,7 @@
169 bool update_queued = false;
170
171 [Deprecated (replacement = "Marlin.PluginManager.menuitem_references")]
172- public GLib.List<Gtk.Widget>? menus; // this doesn't manage GObject references properly
173+ public GLib.List<Gtk.Widget>? menus; /* this doesn't manage GObject references properly */
174
175 public Gee.List<Gtk.Widget> menuitem_references { get; private set; }
176
177@@ -48,7 +48,7 @@
178
179 load_plugins ();
180
181- // Monitor plugin dirs
182+ /* Monitor plugin dirs */
183 foreach (string path in plugin_dirs)
184 set_directory_monitor (path);
185 }
186@@ -66,7 +66,7 @@
187 try {
188 var monitor = dir.monitor_directory (FileMonitorFlags.NONE, null);
189 monitor.changed.connect (on_plugin_directory_change);
190- monitor.ref (); // keep alive
191+ monitor.ref (); /* keep alive */
192 } catch (IOError e) {
193 critical ("Could not setup monitor for '%s': %s", dir.get_path (), e.message);
194 }
195@@ -223,10 +223,7 @@
196
197 public void update_file_info (GOF.File file) {
198 foreach (var plugin in plugin_hash.values)
199- /*Idle.add (() => {*/
200- plugin.update_file_info (file);
201- /*return false;
202- });*/
203+ plugin.update_file_info (file);
204 }
205
206 public Gee.List<string> get_available_plugins () {
207
208=== modified file 'libcore/eel-accessibility.c'
209--- libcore/eel-accessibility.c 2013-09-09 03:08:16 +0000
210+++ libcore/eel-accessibility.c 2015-05-09 10:55:27 +0000
211@@ -18,9 +18,8 @@
212 write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
213 Boston, MA 02111-1307, USA.
214
215- Authors:
216- Anders Carlsson <andersca@gnu.org>
217- Michael Meeks <michael@ximian.com>
218+ Authors: Anders Carlsson <andersca@gnu.org>
219+ Michael Meeks <michael@ximian.com>
220 */
221 #include <gtk/gtk.h>
222 #include <atk/atkrelationset.h>
223@@ -29,16 +28,16 @@
224 void
225 eel_accessibility_set_up_label_widget_relation (GtkWidget *label, GtkWidget *widget)
226 {
227- AtkObject *atk_widget, *atk_label;
228-
229- atk_label = gtk_widget_get_accessible (label);
230- atk_widget = gtk_widget_get_accessible (widget);
231-
232- /* Create the label -> widget relation */
233- atk_object_add_relationship (atk_label, ATK_RELATION_LABEL_FOR, atk_widget);
234-
235- /* Create the widget -> label relation */
236- atk_object_add_relationship (atk_widget, ATK_RELATION_LABELLED_BY, atk_label);
237+ AtkObject *atk_widget, *atk_label;
238+
239+ atk_label = gtk_widget_get_accessible (label);
240+ atk_widget = gtk_widget_get_accessible (widget);
241+
242+ /* Create the label -> widget relation */
243+ atk_object_add_relationship (atk_label, ATK_RELATION_LABEL_FOR, atk_widget);
244+
245+ /* Create the widget -> label relation */
246+ atk_object_add_relationship (atk_widget, ATK_RELATION_LABELLED_BY, atk_label);
247 }
248
249 /*
250@@ -64,76 +63,72 @@
251 **/
252 GType
253 eel_accessibility_create_derived_type (const char *type_name,
254- GType existing_gobject_with_proxy,
255- EelAccessibilityClassInitFn class_init)
256+ GType existing_gobject_with_proxy,
257+ EelAccessibilityClassInitFn class_init)
258 {
259- GType type;
260- GType parent_atk_type;
261- GTypeInfo tinfo = { 0 };
262- GTypeQuery query;
263- AtkObjectFactory *factory;
264-
265- if ((type = g_type_from_name (type_name))) {
266- return type;
267- }
268-
269- factory = atk_registry_get_factory
270- (atk_get_default_registry (),
271- existing_gobject_with_proxy);
272- if (!factory) {
273- return G_TYPE_INVALID;
274- }
275-
276- parent_atk_type = atk_object_factory_get_accessible_type (factory);
277- if (!parent_atk_type) {
278- return G_TYPE_INVALID;
279- }
280-
281- /*
282- * Figure out the size of the class and instance
283- * we are deriving from
284- */
285- g_type_query (parent_atk_type, &query);
286-
287- if (class_init) {
288- tinfo.class_init = (GClassInitFunc) class_init;
289- }
290-
291- tinfo.class_size = query.class_size;
292- tinfo.instance_size = query.instance_size;
293-
294- /* Register the type */
295- type = g_type_register_static (
296- parent_atk_type, type_name, &tinfo, 0);
297-
298- return type;
299+ GType type;
300+ GType parent_atk_type;
301+ GTypeInfo tinfo = { 0 };
302+ GTypeQuery query;
303+ AtkObjectFactory *factory;
304+
305+ if ((type = g_type_from_name (type_name))) {
306+ return type;
307+ }
308+
309+ factory = atk_registry_get_factory (atk_get_default_registry (),
310+ existing_gobject_with_proxy);
311+ if (!factory) {
312+ return G_TYPE_INVALID;
313+ }
314+
315+ parent_atk_type = atk_object_factory_get_accessible_type (factory);
316+ if (!parent_atk_type) {
317+ return G_TYPE_INVALID;
318+ }
319+
320+ /*
321+ * Figure out the size of the class and instance
322+ * we are deriving from
323+ */
324+ g_type_query (parent_atk_type, &query);
325+
326+ if (class_init) {
327+ tinfo.class_init = (GClassInitFunc) class_init;
328+ }
329+
330+ tinfo.class_size = query.class_size;
331+ tinfo.instance_size = query.instance_size;
332+
333+ /* Register the type */
334+ type = g_type_register_static (parent_atk_type, type_name, &tinfo, 0);
335+
336+ return type;
337 }
338
339
340 static GQuark
341 get_quark_accessible (void)
342 {
343- static GQuark quark_accessible_object = 0;
344-
345- if (!quark_accessible_object) {
346- quark_accessible_object = g_quark_from_static_string
347- ("accessible-object");
348- }
349-
350- return quark_accessible_object;
351+ static GQuark quark_accessible_object = 0;
352+
353+ if (!quark_accessible_object) {
354+ quark_accessible_object = g_quark_from_static_string ("accessible-object");
355+ }
356+
357+ return quark_accessible_object;
358 }
359
360 static GQuark
361 get_quark_gobject (void)
362 {
363- static GQuark quark_accessible_gobject = 0;
364-
365- if (!quark_accessible_gobject) {
366- quark_accessible_gobject = g_quark_from_static_string
367- ("object-for-accessible");
368- }
369-
370- return quark_accessible_gobject;
371+ static GQuark quark_accessible_gobject = 0;
372+
373+ if (!quark_accessible_gobject) {
374+ quark_accessible_gobject = g_quark_from_static_string ("object-for-accessible");
375+ }
376+
377+ return quark_accessible_gobject;
378 }
379
380 /**
381@@ -147,7 +142,7 @@
382 AtkObject *
383 eel_accessibility_get_atk_object (gpointer object)
384 {
385- return g_object_get_qdata (object, get_quark_accessible ());
386+ return g_object_get_qdata (object, get_quark_accessible ());
387 }
388
389 /**
390@@ -162,10 +157,10 @@
391 AtkObject *
392 eel_accessibility_for_object (gpointer object)
393 {
394- if (GTK_IS_WIDGET (object))
395- return gtk_widget_get_accessible (object);
396+ if (GTK_IS_WIDGET (object))
397+ return gtk_widget_get_accessible (object);
398
399- return atk_gobject_accessible_for_object (object);
400+ return atk_gobject_accessible_for_object (object);
401 }
402
403 /**
404@@ -180,18 +175,16 @@
405 gpointer
406 eel_accessibility_get_gobject (AtkObject *object)
407 {
408- return g_object_get_qdata (G_OBJECT (object), get_quark_gobject ());
409+ return g_object_get_qdata (G_OBJECT (object), get_quark_gobject ());
410 }
411
412 static void
413 eel_accessibility_destroy (gpointer data,
414- GObject *where_the_object_was)
415+ GObject *where_the_object_was)
416 {
417- g_object_set_qdata
418- (G_OBJECT (data), get_quark_gobject (), NULL);
419- atk_object_notify_state_change
420- (ATK_OBJECT (data), ATK_STATE_DEFUNCT, TRUE);
421- g_object_unref (data);
422+ g_object_set_qdata (G_OBJECT (data), get_quark_gobject (), NULL);
423+ atk_object_notify_state_change (ATK_OBJECT (data), ATK_STATE_DEFUNCT, TRUE);
424+ g_object_unref (data);
425 }
426
427 /**
428@@ -205,211 +198,204 @@
429 **/
430 AtkObject *
431 eel_accessibility_set_atk_object_return (gpointer object,
432- AtkObject *atk_object)
433+ AtkObject *atk_object)
434 {
435- atk_object_initialize (atk_object, object);
436-
437- if (!ATK_IS_GOBJECT_ACCESSIBLE (atk_object)) {
438- g_object_set_qdata_full
439- (object, get_quark_accessible (), atk_object,
440- (GDestroyNotify)eel_accessibility_destroy);
441- g_object_set_qdata
442- (G_OBJECT (atk_object), get_quark_gobject (), object);
443- }
444-
445- return atk_object;
446+ atk_object_initialize (atk_object, object);
447+
448+ if (!ATK_IS_GOBJECT_ACCESSIBLE (atk_object)) {
449+ g_object_set_qdata_full (object, get_quark_accessible (), atk_object,
450+ (GDestroyNotify)eel_accessibility_destroy);
451+
452+ g_object_set_qdata (G_OBJECT (atk_object), get_quark_gobject (), object);
453+ }
454+
455+ return atk_object;
456 }
457
458 static GailTextUtil *
459 get_simple_text (gpointer object)
460 {
461- GObject *gobject;
462- EelAccessibleTextIface *aif;
463-
464- if (GTK_IS_ACCESSIBLE (object)) {
465- gobject = G_OBJECT (gtk_accessible_get_widget (GTK_ACCESSIBLE (object)));
466- } else {
467- gobject = eel_accessibility_get_gobject (object);
468- }
469-
470- if (!gobject) {
471- return NULL;
472- }
473-
474- aif = EEL_ACCESSIBLE_TEXT_GET_IFACE (gobject);
475- if (!aif) {
476- g_warning ("No accessible text inferface on '%s'",
477- g_type_name_from_instance ((gpointer) gobject));
478-
479- } else if (aif->get_text) {
480- return aif->get_text (gobject);
481- }
482-
483- return NULL;
484+ GObject *gobject;
485+ EelAccessibleTextIface *aif;
486+
487+ if (GTK_IS_ACCESSIBLE (object)) {
488+ gobject = G_OBJECT (gtk_accessible_get_widget (GTK_ACCESSIBLE (object)));
489+ } else {
490+ gobject = eel_accessibility_get_gobject (object);
491+ }
492+
493+ if (!gobject) {
494+ return NULL;
495+ }
496+
497+ aif = EEL_ACCESSIBLE_TEXT_GET_IFACE (gobject);
498+ if (!aif) {
499+ g_warning ("No accessible text inferface on '%s'",
500+ g_type_name_from_instance ((gpointer) gobject));
501+
502+ } else if (aif->get_text) {
503+ return aif->get_text (gobject);
504+ }
505+
506+ return NULL;
507 }
508
509 char *
510 eel_accessibility_text_get_text (AtkText *text,
511- gint start_pos,
512- gint end_pos)
513+ gint start_pos,
514+ gint end_pos)
515 {
516- GailTextUtil *util = get_simple_text (text);
517- g_return_val_if_fail (util != NULL, NULL);
518+ GailTextUtil *util = get_simple_text (text);
519+ g_return_val_if_fail (util != NULL, NULL);
520
521- return gail_text_util_get_substring (util, start_pos, end_pos);
522+ return gail_text_util_get_substring (util, start_pos, end_pos);
523 }
524
525 gunichar
526 eel_accessibility_text_get_character_at_offset (AtkText *text,
527- gint offset)
528+ gint offset)
529 {
530- char *txt, *index;
531- gint sucks1 = 0, sucks2 = -1;
532- gunichar c;
533- GailTextUtil *util = get_simple_text (text);
534- g_return_val_if_fail (util != NULL, 0);
535-
536- txt = gail_text_util_get_substring (util, sucks1, sucks2);
537-
538- index = g_utf8_offset_to_pointer (txt, offset);
539- c = g_utf8_get_char (index);
540- g_free (txt);
541-
542- return c;
543+ char *txt, *index;
544+ gint sucks1 = 0, sucks2 = -1;
545+ gunichar c;
546+ GailTextUtil *util = get_simple_text (text);
547+ g_return_val_if_fail (util != NULL, 0);
548+
549+ txt = gail_text_util_get_substring (util, sucks1, sucks2);
550+
551+ index = g_utf8_offset_to_pointer (txt, offset);
552+ c = g_utf8_get_char (index);
553+ g_free (txt);
554+
555+ return c;
556 }
557
558 char *
559-eel_accessibility_text_get_text_before_offset (AtkText *text,
560- gint offset,
561- AtkTextBoundary boundary_type,
562- gint *start_offset,
563- gint *end_offset)
564+eel_accessibility_text_get_text_before_offset (AtkText *text,
565+ gint offset,
566+ AtkTextBoundary boundary_type,
567+ gint *start_offset,
568+ gint *end_offset)
569 {
570- GailTextUtil *util = get_simple_text (text);
571- g_return_val_if_fail (util != NULL, NULL);
572+ GailTextUtil *util = get_simple_text (text);
573+ g_return_val_if_fail (util != NULL, NULL);
574
575- return gail_text_util_get_text (
576- util, NULL, GAIL_BEFORE_OFFSET,
577- boundary_type, offset, start_offset, end_offset);
578+ return gail_text_util_get_text (util, NULL, GAIL_BEFORE_OFFSET,
579+ boundary_type, offset, start_offset, end_offset);
580 }
581
582 char *
583 eel_accessibility_text_get_text_at_offset (AtkText *text,
584- gint offset,
585- AtkTextBoundary boundary_type,
586- gint *start_offset,
587- gint *end_offset)
588+ gint offset,
589+ AtkTextBoundary boundary_type,
590+ gint *start_offset,
591+ gint *end_offset)
592 {
593- GailTextUtil *util = get_simple_text (text);
594- g_return_val_if_fail (util != NULL, NULL);
595+ GailTextUtil *util = get_simple_text (text);
596+ g_return_val_if_fail (util != NULL, NULL);
597
598- return gail_text_util_get_text (
599- util, NULL, GAIL_AT_OFFSET,
600- boundary_type, offset, start_offset, end_offset);
601+ return gail_text_util_get_text (util, NULL, GAIL_AT_OFFSET,
602+ boundary_type, offset, start_offset, end_offset);
603 }
604
605 gchar*
606-eel_accessibility_text_get_text_after_offset (AtkText *text,
607- gint offset,
608- AtkTextBoundary boundary_type,
609- gint *start_offset,
610- gint *end_offset)
611+eel_accessibility_text_get_text_after_offset (AtkText *text,
612+ gint offset,
613+ AtkTextBoundary boundary_type,
614+ gint *start_offset,
615+ gint *end_offset)
616 {
617- GailTextUtil *util = get_simple_text (text);
618- g_return_val_if_fail (util != NULL, NULL);
619+ GailTextUtil *util = get_simple_text (text);
620+ g_return_val_if_fail (util != NULL, NULL);
621
622- return gail_text_util_get_text (
623- util, NULL, GAIL_AFTER_OFFSET,
624- boundary_type, offset, start_offset, end_offset);
625+ return gail_text_util_get_text (util, NULL, GAIL_AFTER_OFFSET,
626+ boundary_type, offset, start_offset, end_offset);
627 }
628
629 gint
630 eel_accessibility_text_get_character_count (AtkText *text)
631 {
632- GailTextUtil *util = get_simple_text (text);
633- g_return_val_if_fail (util != NULL, -1);
634+ GailTextUtil *util = get_simple_text (text);
635+ g_return_val_if_fail (util != NULL, -1);
636
637- return gtk_text_buffer_get_char_count (util->buffer);
638+ return gtk_text_buffer_get_char_count (util->buffer);
639 }
640
641 static void
642 eel_accessibility_simple_text_interface_init (AtkTextIface *iface)
643 {
644- iface->get_text = eel_accessibility_text_get_text;
645- iface->get_character_at_offset = eel_accessibility_text_get_character_at_offset;
646- iface->get_text_before_offset = eel_accessibility_text_get_text_before_offset;
647- iface->get_text_at_offset = eel_accessibility_text_get_text_at_offset;
648- iface->get_text_after_offset = eel_accessibility_text_get_text_after_offset;
649- iface->get_character_count = eel_accessibility_text_get_character_count;
650+ iface->get_text = eel_accessibility_text_get_text;
651+ iface->get_character_at_offset = eel_accessibility_text_get_character_at_offset;
652+ iface->get_text_before_offset = eel_accessibility_text_get_text_before_offset;
653+ iface->get_text_at_offset = eel_accessibility_text_get_text_at_offset;
654+ iface->get_text_after_offset = eel_accessibility_text_get_text_after_offset;
655+ iface->get_character_count = eel_accessibility_text_get_character_count;
656
657-/* iface->get_caret_offset = eel_accessibility_text_get_caret_offset;
658- iface->set_caret_offset = eel_accessibility_text_set_caret_offset;
659- iface->get_selection = eel_accessibility_text_get_selection;
660- iface->get_n_selections = eel_accessibility_text_get_n_selections;
661- iface->add_selection = eel_accessibility_text_add_selection;
662- iface->remove_selection = eel_accessibility_text_remove_selection;
663- iface->set_selection = eel_accessibility_text_set_selection;
664- iface->get_run_attributes = eel_accessibility_text_get_run_attributes;
665- iface->get_default_attributes = eel_accessibility_text_get_default_attributes;
666- iface->get_character_extents = eel_accessibility_text_get_character_extents;
667- iface->get_offset_at_point = eel_accessibility_text_get_offset_at_point; */
668+/* iface->get_caret_offset = eel_accessibility_text_get_caret_offset;
669+ iface->set_caret_offset = eel_accessibility_text_set_caret_offset;
670+ iface->get_selection = eel_accessibility_text_get_selection;
671+ iface->get_n_selections = eel_accessibility_text_get_n_selections;
672+ iface->add_selection = eel_accessibility_text_add_selection;
673+ iface->remove_selection = eel_accessibility_text_remove_selection;
674+ iface->set_selection = eel_accessibility_text_set_selection;
675+ iface->get_run_attributes = eel_accessibility_text_get_run_attributes;
676+ iface->get_default_attributes = eel_accessibility_text_get_default_attributes;
677+ iface->get_character_extents = eel_accessibility_text_get_character_extents;
678+ iface->get_offset_at_point = eel_accessibility_text_get_offset_at_point; */
679 }
680
681 void
682 eel_accessibility_add_simple_text (GType type)
683 {
684- const GInterfaceInfo simple_text_info = {
685- (GInterfaceInitFunc)
686- eel_accessibility_simple_text_interface_init,
687- (GInterfaceFinalizeFunc) NULL,
688- NULL
689- };
690-
691- g_return_if_fail (type != G_TYPE_INVALID);
692-
693- g_type_add_interface_static (
694- type, ATK_TYPE_TEXT, &simple_text_info);
695+ const GInterfaceInfo simple_text_info = {
696+ (GInterfaceInitFunc) eel_accessibility_simple_text_interface_init,
697+ (GInterfaceFinalizeFunc) NULL,
698+ NULL
699+ };
700+
701+ g_return_if_fail (type != G_TYPE_INVALID);
702+
703+ g_type_add_interface_static (type, ATK_TYPE_TEXT, &simple_text_info);
704 }
705
706 GType
707 eel_accessible_text_get_type (void)
708 {
709- static GType type = 0;
710-
711- if (!type) {
712- const GTypeInfo tinfo = {
713- sizeof (AtkTextIface),
714- (GBaseInitFunc) NULL,
715- (GBaseFinalizeFunc) NULL,
716- (GClassInitFunc) NULL,
717- (GClassFinalizeFunc) NULL
718- };
719-
720- type = g_type_register_static (
721- G_TYPE_INTERFACE, "EelAccessibleText", &tinfo, 0);
722- }
723-
724- return type;
725+ static GType type = 0;
726+
727+ if (!type) {
728+ const GTypeInfo tinfo = {
729+ sizeof (AtkTextIface),
730+ (GBaseInitFunc) NULL,
731+ (GBaseFinalizeFunc) NULL,
732+ (GClassInitFunc) NULL,
733+ (GClassFinalizeFunc) NULL
734+ };
735+
736+ type = g_type_register_static ( G_TYPE_INTERFACE, "EelAccessibleText", &tinfo, 0);
737+ }
738+
739+ return type;
740 }
741
742 void
743 eel_accessibility_set_name (gpointer object,
744- const char *name)
745+ const char *name)
746 {
747- AtkObject *atk_object = eel_accessibility_for_object (object);
748+ AtkObject *atk_object = eel_accessibility_for_object (object);
749
750- if (atk_object) {
751- atk_object_set_name (atk_object, name);
752- }
753+ if (atk_object) {
754+ atk_object_set_name (atk_object, name);
755+ }
756 }
757
758 void
759 eel_accessibility_set_description (gpointer object,
760- const char *description)
761+ const char *description)
762 {
763- AtkObject *atk_object = eel_accessibility_for_object (object);
764+ AtkObject *atk_object = eel_accessibility_for_object (object);
765
766- if (atk_object) {
767- atk_object_set_description (atk_object, description);
768- }
769+ if (atk_object) {
770+ atk_object_set_description (atk_object, description);
771+ }
772 }
773
774=== modified file 'libcore/eel-accessibility.h'
775--- libcore/eel-accessibility.h 2013-08-10 20:20:23 +0000
776+++ libcore/eel-accessibility.h 2015-05-09 10:55:27 +0000
777@@ -39,14 +39,14 @@
778 AtkObject *eel_accessibility_for_object (gpointer object);
779 gpointer eel_accessibility_get_gobject (AtkObject *object);
780 AtkObject *eel_accessibility_set_atk_object_return (gpointer object,
781- AtkObject *atk_object);
782+ AtkObject *atk_object);
783 GType eel_accessibility_create_derived_type (const char *type_name,
784- GType existing_gobject_with_proxy,
785- EelAccessibilityClassInitFn class_init);
786+ GType existing_gobject_with_proxy,
787+ EelAccessibilityClassInitFn class_init);
788 void eel_accessibility_set_name (gpointer object,
789- const char *name);
790+ const char *name);
791 void eel_accessibility_set_description (gpointer object,
792- const char *description);
793+ const char *description);
794
795 char* eel_accessibility_text_get_text (AtkText *text,
796 gint start_pos,
797@@ -85,68 +85,68 @@
798 typedef struct _EelAccessibleText EelAccessibleText;
799
800 typedef struct {
801- GTypeInterface parent;
802-
803- GailTextUtil *(*get_text) (GObject *text);
804- PangoLayout *(*get_layout) (GObject *text);
805+ GTypeInterface parent;
806+
807+ GailTextUtil *(*get_text) (GObject *text);
808+ PangoLayout *(*get_layout) (GObject *text);
809 } EelAccessibleTextIface;
810
811 GType eel_accessible_text_get_type (void);
812 void eel_accessibility_add_simple_text (GType type);
813
814 /* From gail - should be unneccessary when AtkObjectFactory is fixed */
815-#define EEL_ACCESSIBLE_FACTORY(type, factory_name, type_as_function, opt_create_accessible) \
816- \
817-static GType \
818-type_as_function ## _factory_get_accessible_type (void) \
819-{ \
820- return type; \
821-} \
822- \
823-static AtkObject* \
824-type_as_function ## _factory_create_accessible (GObject *obj) \
825-{ \
826- AtkObject *accessible; \
827- \
828- g_assert (G_IS_OBJECT (obj)); \
829- \
830- accessible = opt_create_accessible (obj); \
831- \
832- return accessible; \
833-} \
834- \
835-static void \
836-type_as_function ## _factory_class_init (AtkObjectFactoryClass *klass) \
837-{ \
838- klass->create_accessible = type_as_function ## _factory_create_accessible; \
839- klass->get_accessible_type = type_as_function ## _factory_get_accessible_type;\
840-} \
841- \
842-static GType \
843-type_as_function ## _factory_get_type (void) \
844-{ \
845- static GType t = 0; \
846- \
847- if (!t) \
848- { \
849- static const GTypeInfo tinfo = \
850- { \
851- sizeof (AtkObjectFactoryClass), \
852- NULL, NULL, (GClassInitFunc) type_as_function ## _factory_class_init, \
853- NULL, NULL, sizeof (AtkObjectFactory), 0, NULL, NULL \
854- }; \
855- \
856- t = g_type_register_static ( \
857- ATK_TYPE_OBJECT_FACTORY, factory_name, &tinfo, 0); \
858- } \
859- \
860- return t; \
861+#define EEL_ACCESSIBLE_FACTORY(type, factory_name, type_as_function, opt_create_accessible) \
862+ \
863+static GType \
864+type_as_function ## _factory_get_accessible_type (void) \
865+{ \
866+ return type; \
867+} \
868+ \
869+static AtkObject* \
870+type_as_function ## _factory_create_accessible (GObject *obj) \
871+{ \
872+ AtkObject *accessible; \
873+ \
874+ g_assert (G_IS_OBJECT (obj)); \
875+ \
876+ accessible = opt_create_accessible (obj); \
877+ \
878+ return accessible; \
879+} \
880+ \
881+static void \
882+type_as_function ## _factory_class_init (AtkObjectFactoryClass *klass) \
883+{ \
884+ klass->create_accessible = type_as_function ## _factory_create_accessible; \
885+ klass->get_accessible_type = type_as_function ## _factory_get_accessible_type; \
886+} \
887+ \
888+static GType \
889+type_as_function ## _factory_get_type (void) \
890+{ \
891+ static GType t = 0; \
892+ \
893+ if (!t) \
894+ { \
895+ static const GTypeInfo tinfo = \
896+ { \
897+ sizeof (AtkObjectFactoryClass), \
898+ NULL, NULL, (GClassInitFunc) type_as_function ## _factory_class_init, \
899+ NULL, NULL, sizeof (AtkObjectFactory), 0, NULL, NULL \
900+ }; \
901+ \
902+ t = g_type_register_static ( \
903+ ATK_TYPE_OBJECT_FACTORY, factory_name, &tinfo, 0); \
904+ } \
905+ \
906+ return t; \
907 }
908
909-#define EEL_OBJECT_SET_FACTORY(object_type, type_as_function) \
910- atk_registry_set_factory_type (atk_get_default_registry (), \
911- object_type, \
912- type_as_function ## _factory_get_type ())
913+#define EEL_OBJECT_SET_FACTORY(object_type, type_as_function) \
914+ atk_registry_set_factory_type (atk_get_default_registry (), \
915+ object_type, \
916+ type_as_function ## _factory_get_type ())
917
918
919 #endif /* EEL_ACCESSIBILITY_H */
920
921=== modified file 'libcore/eel-debug.c'
922--- libcore/eel-debug.c 2013-09-09 03:08:16 +0000
923+++ libcore/eel-debug.c 2015-05-09 10:55:27 +0000
924@@ -29,8 +29,8 @@
925 #include <stdio.h>
926
927 typedef struct {
928- gpointer data;
929- GFreeFunc function;
930+ gpointer data;
931+ GFreeFunc function;
932 } ShutdownFunction;
933
934 static GList *shutdown_functions;
935@@ -38,30 +38,30 @@
936 void
937 eel_debug_shut_down (void)
938 {
939- ShutdownFunction *f;
940-
941- while (shutdown_functions != NULL) {
942- f = shutdown_functions->data;
943- shutdown_functions = g_list_remove (shutdown_functions, f);
944-
945- f->function (f->data);
946- g_free (f);
947- }
948+ ShutdownFunction *f;
949+
950+ while (shutdown_functions != NULL) {
951+ f = shutdown_functions->data;
952+ shutdown_functions = g_list_remove (shutdown_functions, f);
953+
954+ f->function (f->data);
955+ g_free (f);
956+ }
957 }
958
959 void
960 eel_debug_call_at_shutdown (EelFunction function)
961 {
962- eel_debug_call_at_shutdown_with_data ((GFreeFunc) function, NULL);
963+ eel_debug_call_at_shutdown_with_data ((GFreeFunc) function, NULL);
964 }
965
966 void
967 eel_debug_call_at_shutdown_with_data (GFreeFunc function, gpointer data)
968 {
969- ShutdownFunction *f;
970+ ShutdownFunction *f;
971
972- f = g_new (ShutdownFunction, 1);
973- f->data = data;
974- f->function = function;
975- shutdown_functions = g_list_prepend (shutdown_functions, f);
976+ f = g_new (ShutdownFunction, 1);
977+ f->data = data;
978+ f->function = function;
979+ shutdown_functions = g_list_prepend (shutdown_functions, f);
980 }
981
982=== modified file 'libcore/eel-debug.h'
983--- libcore/eel-debug.h 2013-08-10 20:20:23 +0000
984+++ libcore/eel-debug.h 2015-05-09 10:55:27 +0000
985@@ -39,7 +39,7 @@
986 void eel_debug_shut_down (void);
987 void eel_debug_call_at_shutdown (EelFunction function);
988 void eel_debug_call_at_shutdown_with_data (GFreeFunc function,
989- gpointer data);
990+ gpointer data);
991
992 G_END_DECLS
993
994
995=== modified file 'libcore/eel-fcts.c'
996--- libcore/eel-fcts.c 2014-07-09 05:30:17 +0000
997+++ libcore/eel-fcts.c 2015-05-09 10:55:27 +0000
998@@ -113,17 +113,17 @@
999 GList *
1000 eel_get_user_names (void)
1001 {
1002- GList *list;
1003- struct passwd *user;
1004-
1005- list = NULL;
1006- setpwent ();
1007- while ((user = getpwent ()) != NULL) {
1008- list = g_list_prepend (list, g_strdup (user->pw_name));
1009- }
1010- endpwent ();
1011-
1012- return eel_g_str_list_alphabetize (list);
1013+ GList *list;
1014+ struct passwd *user;
1015+
1016+ list = NULL;
1017+ setpwent ();
1018+ while ((user = getpwent ()) != NULL) {
1019+ list = g_list_prepend (list, g_strdup (user->pw_name));
1020+ }
1021+ endpwent ();
1022+
1023+ return eel_g_str_list_alphabetize (list);
1024 }
1025
1026 /* Get a list of group names, filtered to only the ones
1027@@ -133,24 +133,24 @@
1028 GList *
1029 eel_get_group_names_for_user (void)
1030 {
1031- GList *list;
1032- struct group *group;
1033- int count, i;
1034- gid_t gid_list[NGROUPS_MAX + 1];
1035-
1036-
1037- list = NULL;
1038-
1039- count = getgroups (NGROUPS_MAX + 1, gid_list);
1040- for (i = 0; i < count; i++) {
1041- group = getgrgid (gid_list[i]);
1042- if (group == NULL)
1043- break;
1044-
1045- list = g_list_prepend (list, g_strdup (group->gr_name));
1046- }
1047-
1048- return eel_g_str_list_alphabetize (list);
1049+ GList *list;
1050+ struct group *group;
1051+ int count, i;
1052+ gid_t gid_list[NGROUPS_MAX + 1];
1053+
1054+
1055+ list = NULL;
1056+
1057+ count = getgroups (NGROUPS_MAX + 1, gid_list);
1058+ for (i = 0; i < count; i++) {
1059+ group = getgrgid (gid_list[i]);
1060+ if (group == NULL)
1061+ break;
1062+
1063+ list = g_list_prepend (list, g_strdup (group->gr_name));
1064+ }
1065+
1066+ return eel_g_str_list_alphabetize (list);
1067 }
1068
1069 /**
1070@@ -159,75 +159,75 @@
1071 GList *
1072 eel_get_all_group_names (void)
1073 {
1074- GList *list;
1075- struct group *group;
1076-
1077- list = NULL;
1078-
1079- setgrent ();
1080-
1081- while ((group = getgrent ()) != NULL)
1082- list = g_list_prepend (list, g_strdup (group->gr_name));
1083-
1084- endgrent ();
1085-
1086- return eel_g_str_list_alphabetize (list);
1087+ GList *list;
1088+ struct group *group;
1089+
1090+ list = NULL;
1091+
1092+ setgrent ();
1093+
1094+ while ((group = getgrent ()) != NULL)
1095+ list = g_list_prepend (list, g_strdup (group->gr_name));
1096+
1097+ endgrent ();
1098+
1099+ return eel_g_str_list_alphabetize (list);
1100 }
1101
1102 gboolean
1103 eel_get_group_id_from_group_name (const char *group_name, uid_t *gid)
1104 {
1105- struct group *group;
1106-
1107- g_assert (gid != NULL);
1108-
1109- group = getgrnam (group_name);
1110-
1111- if (group == NULL)
1112- return FALSE;
1113-
1114- *gid = group->gr_gid;
1115-
1116- return TRUE;
1117+ struct group *group;
1118+
1119+ g_assert (gid != NULL);
1120+
1121+ group = getgrnam (group_name);
1122+
1123+ if (group == NULL)
1124+ return FALSE;
1125+
1126+ *gid = group->gr_gid;
1127+
1128+ return TRUE;
1129 }
1130
1131 gboolean
1132 eel_get_user_id_from_user_name (const char *user_name, uid_t *uid)
1133 {
1134- struct passwd *password_info;
1135-
1136- g_assert (uid != NULL);
1137-
1138- password_info = getpwnam (user_name);
1139-
1140- if (password_info == NULL)
1141+ struct passwd *password_info;
1142+
1143+ g_assert (uid != NULL);
1144+
1145+ password_info = getpwnam (user_name);
1146+
1147+ if (password_info == NULL)
1148 return FALSE;
1149
1150- *uid = password_info->pw_uid;
1151+ *uid = password_info->pw_uid;
1152
1153- return TRUE;
1154+ return TRUE;
1155 }
1156
1157 gboolean
1158 eel_get_id_from_digit_string (const char *digit_string, uid_t *id)
1159 {
1160- long scanned_id;
1161- char c;
1162-
1163- g_assert (id != NULL);
1164-
1165- /* Only accept string if it has one integer with nothing
1166- * afterwards.
1167- */
1168- if (sscanf (digit_string, "%ld%c", &scanned_id, &c) != 1) {
1169- return FALSE;
1170- }
1171- *id = scanned_id;
1172- return TRUE;
1173+ long scanned_id;
1174+ char c;
1175+
1176+ g_assert (id != NULL);
1177+
1178+ /* Only accept string if it has one integer with nothing
1179+ * afterwards.
1180+ */
1181+ if (sscanf (digit_string, "%ld%c", &scanned_id, &c) != 1) {
1182+ return FALSE;
1183+ }
1184+ *id = scanned_id;
1185+ return TRUE;
1186 }
1187
1188 gchar
1189 *eel_format_size (guint64 size)
1190 {
1191 return g_format_size (size);
1192-}
1193\ No newline at end of file
1194+}
1195
1196=== modified file 'libcore/eel-gdk-pixbuf-extensions.c'
1197--- libcore/eel-gdk-pixbuf-extensions.c 2014-11-21 19:24:45 +0000
1198+++ libcore/eel-gdk-pixbuf-extensions.c 2015-05-09 10:55:27 +0000
1199@@ -86,7 +86,7 @@
1200 for (i = 0; i < height; i++) {
1201 pixdest = target_pixels + i * dst_row_stride;
1202 pixsrc = original_pixels + i * src_row_stride;
1203- for (j = 0; j < width; j++) {
1204+ for (j = 0; j < width; j++) {
1205 *pixdest++ = lighten_component (*pixsrc++);
1206 *pixdest++ = lighten_component (*pixsrc++);
1207 *pixdest++ = lighten_component (*pixsrc++);
1208@@ -194,7 +194,7 @@
1209 for (i = 0; i < height; i++) {
1210 pixdest = target_pixels + i*dst_row_stride;
1211 pixsrc = original_pixels + i*src_row_stride;
1212- for (j = 0; j < width; j++) {
1213+ for (j = 0; j < width; j++) {
1214 *pixdest++ = (*pixsrc++ * red_value) >> 8;
1215 *pixdest++ = (*pixsrc++ * green_value) >> 8;
1216 *pixdest++ = (*pixsrc++ * blue_value) >> 8;
1217
1218=== modified file 'libcore/eel-gio-extensions.c'
1219--- libcore/eel-gio-extensions.c 2013-08-10 20:20:23 +0000
1220+++ libcore/eel-gio-extensions.c 2015-05-09 10:55:27 +0000
1221@@ -74,13 +74,13 @@
1222 eel_g_file_get_trash_original_file (const gchar *string)
1223 {
1224 GFile *location = NULL;
1225- char *filename;
1226+ char *filename;
1227
1228 if (string != NULL) {
1229 /* file name is stored in URL encoding */
1230- filename = g_uri_unescape_string (string, "");
1231- location = g_file_new_for_path (filename);
1232- g_free (filename);
1233+ filename = g_uri_unescape_string (string, "");
1234+ location = g_file_new_for_path (filename);
1235+ g_free (filename);
1236 }
1237
1238 return location;
1239
1240=== modified file 'libcore/eel-glib-extensions.c'
1241--- libcore/eel-glib-extensions.c 2013-08-10 20:20:23 +0000
1242+++ libcore/eel-glib-extensions.c 2015-05-09 10:55:27 +0000
1243@@ -92,7 +92,7 @@
1244
1245 g_return_if_fail (pointer_location != NULL);
1246
1247- object_location = (gpointer *) pointer_location;
1248+ object_location = (gpointer *) pointer_location;
1249 if (*object_location == NULL) {
1250 /* The object was already destroyed and the reference
1251 * nulled out, nothing to do.
1252@@ -145,7 +145,7 @@
1253 GList *
1254 eel_g_str_list_alphabetize (GList *list)
1255 {
1256- return g_list_sort (list, (GCompareFunc) g_utf8_collate);
1257+ return g_list_sort (list, (GCompareFunc) g_utf8_collate);
1258 }
1259
1260
1261
1262=== modified file 'libcore/eel-gtk-extensions.c'
1263--- libcore/eel-gtk-extensions.c 2014-07-03 16:08:14 +0000
1264+++ libcore/eel-gtk-extensions.c 2015-05-09 10:55:27 +0000
1265@@ -138,9 +138,9 @@
1266 * @event: The event that invoked this popup menu.
1267 **/
1268 void
1269-eel_pop_up_context_menu (GtkMenu *menu,
1270- gint16 offset_x,
1271- gint16 offset_y,
1272+eel_pop_up_context_menu (GtkMenu *menu,
1273+ gint16 offset_x,
1274+ gint16 offset_y,
1275 GdkEventButton *event)
1276 {
1277 GdkPoint offset;
1278@@ -165,12 +165,12 @@
1279 button = 0;
1280 }
1281
1282- gtk_menu_popup (menu, /* menu */
1283- NULL, /* parent_menu_shell */
1284- NULL, /* parent_menu_item */
1285+ gtk_menu_popup (menu, /* menu */
1286+ NULL, /* parent_menu_shell */
1287+ NULL, /* parent_menu_item */
1288 NULL,
1289- &offset, /* data */
1290- button, /* button */
1291+ &offset, /* data */
1292+ button, /* button */
1293 event ? event->time : GDK_CURRENT_TIME); /* activate_time */
1294
1295 g_object_ref_sink (menu);
1296
1297=== modified file 'libcore/eel-gtk-extensions.h'
1298--- libcore/eel-gtk-extensions.h 2014-07-03 16:08:14 +0000
1299+++ libcore/eel-gtk-extensions.h 2015-05-09 10:55:27 +0000
1300@@ -1,6 +1,6 @@
1301 /* eel-gtk-extensions.h - interface for new functions that operate on
1302- gtk classes. Perhaps some of these should be
1303- rolled into gtk someday.
1304+ gtk classes. Perhaps some of these should be
1305+ rolled into gtk someday.
1306
1307 Copyright (C) 1999, 2000, 2001 Eazel, Inc.
1308
1309@@ -28,13 +28,13 @@
1310
1311 #include <gtk/gtk.h>
1312
1313-#define EEL_DEFAULT_POPUP_MENU_DISPLACEMENT 2
1314+#define EEL_DEFAULT_POPUP_MENU_DISPLACEMENT 2
1315
1316 GtkMenuItem *eel_gtk_menu_append_separator (GtkMenu *menu);
1317
1318-void eel_pop_up_context_menu (GtkMenu *menu,
1319- gint16 offset_x,
1320- gint16 offset_y,
1321+void eel_pop_up_context_menu (GtkMenu *menu,
1322+ gint16 offset_x,
1323+ gint16 offset_y,
1324 GdkEventButton *event);
1325 void eel_gtk_widget_set_shown (GtkWidget *widget, gboolean shown);
1326
1327
1328=== modified file 'libcore/eel-pango-extensions.c'
1329--- libcore/eel-pango-extensions.c 2013-08-10 20:20:23 +0000
1330+++ libcore/eel-pango-extensions.c 2015-05-09 10:55:27 +0000
1331@@ -73,6 +73,7 @@
1332 static PangoAttrList *attr_list = NULL;
1333 if (G_UNLIKELY (attr_list == NULL))
1334 attr_list = eel_pango_attr_list_wrap (pango_attr_scale_new (PANGO_SCALE_LARGE), NULL);
1335+
1336 return attr_list;
1337 }
1338
1339@@ -93,6 +94,7 @@
1340 static PangoAttrList *attr_list = NULL;
1341 if (G_UNLIKELY (attr_list == NULL))
1342 attr_list = eel_pango_attr_list_wrap (pango_attr_scale_new (PANGO_SCALE_SMALL), NULL);
1343+
1344 return attr_list;
1345 }
1346
1347@@ -112,7 +114,8 @@
1348 {
1349 static PangoAttrList *attr_list = NULL;
1350 if (G_UNLIKELY (attr_list == NULL))
1351- attr_list = eel_pango_attr_list_wrap (pango_attr_scale_new (PANGO_SCALE_LARGE), pango_attr_weight_new (PANGO_WEIGHT_BOLD), NULL);
1352+ attr_list = eel_pango_attr_list_wrap (pango_attr_scale_new (PANGO_SCALE_LARGE),
1353+ pango_attr_weight_new (PANGO_WEIGHT_BOLD), NULL);
1354 return attr_list;
1355 }
1356
1357@@ -133,6 +136,7 @@
1358 static PangoAttrList *attr_list = NULL;
1359 if (G_UNLIKELY (attr_list == NULL))
1360 attr_list = eel_pango_attr_list_wrap (pango_attr_weight_new (PANGO_WEIGHT_BOLD), NULL);
1361+
1362 return attr_list;
1363 }
1364
1365@@ -153,6 +157,7 @@
1366 static PangoAttrList *attr_list = NULL;
1367 if (G_UNLIKELY (attr_list == NULL))
1368 attr_list = eel_pango_attr_list_wrap (pango_attr_style_new (PANGO_STYLE_ITALIC), NULL);
1369+
1370 return attr_list;
1371 }
1372
1373@@ -172,7 +177,8 @@
1374 {
1375 static PangoAttrList *attr_list = NULL;
1376 if (G_UNLIKELY (attr_list == NULL))
1377- attr_list = eel_pango_attr_list_wrap (pango_attr_scale_new (PANGO_SCALE_SMALL), pango_attr_style_new (PANGO_STYLE_ITALIC), NULL);
1378+ attr_list = eel_pango_attr_list_wrap (pango_attr_scale_new (PANGO_SCALE_SMALL),
1379+ pango_attr_style_new (PANGO_STYLE_ITALIC), NULL);
1380 return attr_list;
1381 }
1382
1383@@ -193,6 +199,7 @@
1384 static PangoAttrList *attr_list = NULL;
1385 if (G_UNLIKELY (attr_list == NULL))
1386 attr_list = eel_pango_attr_list_wrap (pango_attr_underline_new (PANGO_UNDERLINE_SINGLE), NULL);
1387+
1388 return attr_list;
1389 }
1390
1391
1392=== modified file 'libcore/eel-stock-dialogs.c'
1393--- libcore/eel-stock-dialogs.c 2014-08-13 10:40:54 +0000
1394+++ libcore/eel-stock-dialogs.c 2015-05-09 10:55:27 +0000
1395@@ -88,9 +88,9 @@
1396 const char *secondary_text,
1397 GtkWindow *parent)
1398 {
1399- return show_ok_dialog (primary_text,
1400- secondary_text,
1401- GTK_MESSAGE_WARNING, parent);
1402+ return show_ok_dialog (primary_text,
1403+ secondary_text,
1404+ GTK_MESSAGE_WARNING, parent);
1405 }
1406
1407 //TODO merge with marlin_dialogs_show_error
1408
1409=== modified file 'libcore/eel-ui.c'
1410--- libcore/eel-ui.c 2014-08-05 22:40:12 +0000
1411+++ libcore/eel-ui.c 2015-05-09 10:55:27 +0000
1412@@ -49,11 +49,11 @@
1413 guint *merge_id,
1414 GtkActionGroup **action_group)
1415 {
1416- *merge_id = gtk_ui_manager_new_merge_id (ui_manager);
1417- *action_group = gtk_action_group_new (name);
1418- gtk_action_group_set_translation_domain (*action_group, GETTEXT_PACKAGE);
1419- gtk_ui_manager_insert_action_group (ui_manager, *action_group, 0);
1420- g_object_unref (*action_group); /* owned by ui manager */
1421+ *merge_id = gtk_ui_manager_new_merge_id (ui_manager);
1422+ *action_group = gtk_action_group_new (name);
1423+ gtk_action_group_set_translation_domain (*action_group, GETTEXT_PACKAGE);
1424+ gtk_ui_manager_insert_action_group (ui_manager, *action_group, 0);
1425+ g_object_unref (*action_group); /* owned by ui manager */
1426 }
1427
1428
1429
1430=== modified file 'libcore/eel-vfs-extensions.c'
1431--- libcore/eel-vfs-extensions.c 2013-09-09 03:08:16 +0000
1432+++ libcore/eel-vfs-extensions.c 2015-05-09 10:55:27 +0000
1433@@ -19,8 +19,8 @@
1434 * Boston, MA 02111-1307, USA.
1435 *
1436 * Authors: Darin Adler <darin@eazel.com>
1437- * Pavel Cisler <pavel@eazel.com>
1438- * Mike Fleming <mfleming@eazel.com>
1439+ * Pavel Cisler <pavel@eazel.com>
1440+ * Mike Fleming <mfleming@eazel.com>
1441 * John Sullivan <sullivan@eazel.com>
1442 */
1443
1444
1445=== modified file 'libcore/eel-vfs-extensions.h'
1446--- libcore/eel-vfs-extensions.h 2013-08-10 20:20:23 +0000
1447+++ libcore/eel-vfs-extensions.h 2015-05-09 10:55:27 +0000
1448@@ -19,8 +19,8 @@
1449 * Boston, MA 02111-1307, USA.
1450 *
1451 * Authors: Darin Adler <darin@eazel.com>
1452- * Pavel Cisler <pavel@eazel.com>
1453- * Mike Fleming <mfleming@eazel.com>
1454+ * Pavel Cisler <pavel@eazel.com>
1455+ * Mike Fleming <mfleming@eazel.com>
1456 * John Sullivan <sullivan@eazel.com>
1457 */
1458
1459@@ -31,7 +31,7 @@
1460
1461 G_BEGIN_DECLS
1462
1463-/*#define EEL_TRASH_URI "trash:"
1464+/*#define EEL_TRASH_URI "trash:"
1465 #define EEL_DESKTOP_URI "x-nautilus-desktop:"
1466 #define EEL_SEARCH_URI "x-nautilus-search:"*/
1467
1468
1469=== modified file 'libcore/fm-list-model.c'
1470--- libcore/fm-list-model.c 2014-12-07 19:39:22 +0000
1471+++ libcore/fm-list-model.c 2015-05-09 10:55:27 +0000
1472@@ -64,7 +64,7 @@
1473 struct FMListModelDetails {
1474 GSequence *files;
1475 GHashTable *directory_reverse_map; /* map from directory to GSequenceIter's */
1476- GHashTable *top_reverse_map; /* map from files in top dir to GSequenceIter's */
1477+ GHashTable *top_reverse_map; /* map from files in top dir to GSequenceIter's */
1478
1479 int stamp;
1480 gboolean has_child;
1481@@ -79,7 +79,7 @@
1482
1483 struct FileEntry {
1484 GOFFile *file;
1485- GHashTable *reverse_map; /* map from files to GSequenceIter's */
1486+ GHashTable *reverse_map; /* map from files to GSequenceIter's */
1487 GOFDirectoryAsync *subdirectory;
1488 FileEntry *parent;
1489 GSequence *files;
1490@@ -1304,7 +1304,7 @@
1491
1492 typedef struct {
1493 const gchar *name;
1494- gint value;
1495+ gint value;
1496 } ColumnsEnum;
1497
1498 static const ColumnsEnum columnsview[] = {
1499
1500=== modified file 'libcore/gof-callwhenready.vala'
1501--- libcore/gof-callwhenready.vala 2014-12-09 11:38:39 +0000
1502+++ libcore/gof-callwhenready.vala 2015-05-09 10:55:27 +0000
1503@@ -1,21 +1,21 @@
1504-/*
1505- * Copyright (C) 2011 Marlin Developers
1506- *
1507- * This program is free software: you can redistribute it and/or modify
1508- * it under the terms of the GNU General Public License as published by
1509- * the Free Software Foundation, either version 3 of the License, or
1510- * (at your option) any later version.
1511- *
1512- * This program is distributed in the hope that it will be useful,
1513- * but WITHOUT ANY WARRANTY; without even the implied warranty of
1514- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1515- * GNU General Public License for more details.
1516- *
1517- * You should have received a copy of the GNU General Public License
1518- * along with this program. If not, see <http://www.gnu.org/licenses/>.
1519- *
1520- * Author: ammonkey <am.monkeyd@gmail.com>
1521- */
1522+/***
1523+ Copyright (C) 2011 Marlin Developers
1524+
1525+ This program is free software: you can redistribute it and/or modify
1526+ it under the terms of the GNU General Public License as published by
1527+ the Free Software Foundation, either version 3 of the License, or
1528+ (at your option) any later version.
1529+
1530+ This program is distributed in the hope that it will be useful,
1531+ but WITHOUT ANY WARRANTY; without even the implied warranty of
1532+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1533+ GNU General Public License for more details.
1534+
1535+ You should have received a copy of the GNU General Public License
1536+ along with this program. If not, see <http://www.gnu.org/licenses/>.
1537+
1538+ Author: ammonkey <am.monkeyd@gmail.com>
1539+***/
1540
1541 GLib.List<GOF.CallWhenReady>? callwhenready_cache = null;
1542
1543@@ -51,7 +51,8 @@
1544 gof.update ();
1545 }
1546
1547- /* TODO move this to GOF.File */
1548+ /**TODO** move this to GOF.File */
1549+
1550 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::*";
1551
1552 private delegate void func_query_info (GOF.File gof);
1553@@ -80,35 +81,3 @@
1554 callwhenready_cache.remove (this);
1555 }
1556 }
1557-
1558-/*public class GOF.CallWhenReadyFile : Object
1559-{
1560- public delegate void call_when_ready_func (GOF.File file);
1561-
1562- private GOF.File call_when_ready_list = null;
1563-
1564-
1565- public CallWhenReadyFile (GOF.File file, call_when_ready_func? _f = null)
1566- {
1567- query_info_async (file, _f);
1568- //message ("cwr %s", gof.uri);
1569- }
1570-
1571- 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::*";
1572-
1573- private async void query_info_async (GOF.File gof, call_when_ready_func? fqi = null) {
1574- try {
1575- gof.info = yield gof.location.query_info_async (gio_default_attributes,
1576- FileQueryInfoFlags.NONE,
1577- Priority.DEFAULT);
1578- if (fqi != null)
1579- fqi (gof);
1580- } catch (Error err) {
1581- warning ("query info failed, %s %s", err.message, gof.uri);
1582- if (err is IOError.NOT_FOUND)
1583- gof.exists = false;
1584- if (err is IOError.NOT_MOUNTED)
1585- gof.is_mounted = false;
1586- }
1587- }
1588-}*/
1589
1590=== modified file 'libcore/gof-directory-async.vala'
1591--- libcore/gof-directory-async.vala 2015-04-08 08:06:09 +0000
1592+++ libcore/gof-directory-async.vala 2015-05-09 10:55:27 +0000
1593@@ -1,21 +1,21 @@
1594-/*
1595- * Copyright (C) 2011 Marlin Developers
1596- *
1597- * This program is free software: you can redistribute it and/or modify
1598- * it under the terms of the GNU General Public License as published by
1599- * the Free Software Foundation, either version 3 of the License, or
1600- * (at your option) any later version.
1601- *
1602- * This program is distributed in the hope that it will be useful,
1603- * but WITHOUT ANY WARRANTY; without even the implied warranty of
1604- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1605- * GNU General Public License for more details.
1606- *
1607- * You should have received a copy of the GNU General Public License
1608- * along with this program. If not, see <http://www.gnu.org/licenses/>.
1609- *
1610- * Author: ammonkey <am.monkeyd@gmail.com>
1611- */
1612+/***
1613+ Copyright (C) 2011 Marlin Developers
1614+
1615+ This program is free software: you can redistribute it and/or modify
1616+ it under the terms of the GNU General Public License as published by
1617+ the Free Software Foundation, either version 3 of the License, or
1618+ (at your option) any later version.
1619+
1620+ This program is distributed in the hope that it will be useful,
1621+ but WITHOUT ANY WARRANTY; without even the implied warranty of
1622+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1623+ GNU General Public License for more details.
1624+
1625+ You should have received a copy of the GNU General Public License
1626+ along with this program. If not, see <http://www.gnu.org/licenses/>.
1627+
1628+ Author: ammonkey <am.monkeyd@gmail.com>
1629+***/
1630
1631 private HashTable<GLib.File,GOF.Directory.Async> directory_cache;
1632 private Mutex dir_cache_lock;
1633@@ -124,12 +124,14 @@
1634 }
1635
1636 /* This is also called when reloading the directory so that another attempt to connect to
1637- * the network is made */
1638+ * the network is made
1639+ */
1640 private bool prepare_directory () {
1641 if (!get_file_info ()) {
1642 is_ready = true;
1643 /* local uris are deemed loadable even if they do not exist
1644- * If they do not exist an opportunity will be given to create them */
1645+ * If they do not exist an opportunity will be given to create them
1646+ */
1647 can_load = is_local;
1648 return false;
1649 }
1650@@ -405,7 +407,7 @@
1651 }
1652
1653 public async void mount_mountable () throws Error {
1654- /* TODO pass GtkWindow *parent to Gtk.MountOperation */
1655+ /**TODO** pass GtkWindow *parent to Gtk.MountOperation */
1656 var mount_op = new Gtk.MountOperation (null);
1657 yield location.mount_enclosing_volume (0, mount_op, cancellable);
1658 }
1659@@ -510,7 +512,7 @@
1660 return (!) result;
1661 }
1662
1663- /* TODO move this to GOF.File */
1664+ /**TODO** move this to GOF.File */
1665 private delegate void func_query_info (GOF.File gof);
1666
1667 private async void query_info_async (GOF.File gof, func_query_info? f = null) {
1668
1669=== modified file 'libcore/gof-file.c'
1670--- libcore/gof-file.c 2015-03-26 02:19:38 +0000
1671+++ libcore/gof-file.c 2015-05-09 10:55:27 +0000
1672@@ -64,7 +64,7 @@
1673 static guint32 effective_user_id;
1674
1675 static gpointer _g_object_ref0 (gpointer self) {
1676- return self ? g_object_ref (self) : NULL;
1677+ return self ? g_object_ref (self) : NULL;
1678 }
1679
1680 const gchar *gof_file_get_thumbnail_path (GOFFile *file);
1681@@ -803,9 +803,9 @@
1682 }
1683
1684 g_list_free_full (mounts, g_object_unref);
1685- g_object_unref (monitor);
1686+ g_object_unref (monitor);
1687
1688- return found;
1689+ return found;
1690 }
1691
1692 static GFileInfo *
1693@@ -1002,37 +1002,37 @@
1694 G_OBJECT_CLASS (klass)->finalize = gof_file_finalize;
1695
1696 signals[CHANGED] = g_signal_new ("changed",
1697- G_TYPE_FROM_CLASS (klass),
1698- G_SIGNAL_RUN_LAST,
1699- G_STRUCT_OFFSET (GOFFileClass, changed),
1700- NULL, NULL,
1701- g_cclosure_marshal_VOID__VOID,
1702- G_TYPE_NONE, 0);
1703+ G_TYPE_FROM_CLASS (klass),
1704+ G_SIGNAL_RUN_LAST,
1705+ G_STRUCT_OFFSET (GOFFileClass, changed),
1706+ NULL, NULL,
1707+ g_cclosure_marshal_VOID__VOID,
1708+ G_TYPE_NONE, 0);
1709
1710 signals[DESTROY] = g_signal_new ("destroy",
1711- G_TYPE_FROM_CLASS (klass),
1712- G_SIGNAL_RUN_LAST,
1713- G_STRUCT_OFFSET (GOFFileClass, destroy),
1714- NULL, NULL,
1715- g_cclosure_marshal_VOID__VOID,
1716- G_TYPE_NONE, 0);
1717+ G_TYPE_FROM_CLASS (klass),
1718+ G_SIGNAL_RUN_LAST,
1719+ G_STRUCT_OFFSET (GOFFileClass, destroy),
1720+ NULL, NULL,
1721+ g_cclosure_marshal_VOID__VOID,
1722+ G_TYPE_NONE, 0);
1723
1724
1725 signals[INFO_AVAILABLE] = g_signal_new ("info_available",
1726- G_TYPE_FROM_CLASS (klass),
1727- G_SIGNAL_RUN_LAST,
1728- G_STRUCT_OFFSET (GOFFileClass, info_available),
1729- NULL, NULL,
1730- g_cclosure_marshal_VOID__VOID,
1731- G_TYPE_NONE, 0);
1732+ G_TYPE_FROM_CLASS (klass),
1733+ G_SIGNAL_RUN_LAST,
1734+ G_STRUCT_OFFSET (GOFFileClass, info_available),
1735+ NULL, NULL,
1736+ g_cclosure_marshal_VOID__VOID,
1737+ G_TYPE_NONE, 0);
1738
1739 signals[ICON_CHANGED] = g_signal_new ("icon_changed",
1740- G_TYPE_FROM_CLASS (klass),
1741- G_SIGNAL_RUN_LAST,
1742- G_STRUCT_OFFSET (GOFFileClass, icon_changed),
1743- NULL, NULL,
1744- g_cclosure_marshal_VOID__VOID,
1745- G_TYPE_NONE, 0);
1746+ G_TYPE_FROM_CLASS (klass),
1747+ G_SIGNAL_RUN_LAST,
1748+ G_STRUCT_OFFSET (GOFFileClass, icon_changed),
1749+ NULL, NULL,
1750+ g_cclosure_marshal_VOID__VOID,
1751+ G_TYPE_NONE, 0);
1752
1753 /*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));
1754 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));
1755@@ -1520,7 +1520,7 @@
1756 GOFDirectoryAsync *dir = NULL;
1757
1758 g_return_val_if_fail (location != NULL && G_IS_FILE (location), NULL);
1759-
1760+
1761 if ((parent = g_file_get_parent (location)) != NULL) {
1762 dir = gof_directory_async_cache_lookup (parent);
1763 if (dir != NULL) {
1764@@ -2278,10 +2278,10 @@
1765 {
1766 /* unknown file uid */
1767 if (file->uid == -1)
1768- return FALSE;
1769+ return FALSE;
1770
1771- /* root */
1772- return geteuid() == 0;
1773+ /* root */
1774+ return geteuid() == 0;
1775 }
1776
1777 /* copied from nautilus-file.c */
1778@@ -2300,22 +2300,22 @@
1779 gboolean
1780 gof_file_can_set_group (GOFFile *file)
1781 {
1782- uid_t user_id;
1783-
1784- if (file->gid == -1)
1785- return FALSE;
1786-
1787- user_id = geteuid();
1788-
1789- /* Owner is allowed to set group (with restrictions). */
1790- if (user_id == (uid_t) file->uid)
1791- return TRUE;
1792-
1793- /* Root is also allowed to set group. */
1794- if (user_id == 0)
1795- return TRUE;
1796-
1797- return FALSE;
1798+ uid_t user_id;
1799+
1800+ if (file->gid == -1)
1801+ return FALSE;
1802+
1803+ user_id = geteuid();
1804+
1805+ /* Owner is allowed to set group (with restrictions). */
1806+ if (user_id == (uid_t) file->uid)
1807+ return TRUE;
1808+
1809+ /* Root is also allowed to set group. */
1810+ if (user_id == 0)
1811+ return TRUE;
1812+
1813+ return FALSE;
1814 }
1815
1816 /* copied from nautilus-file.c */
1817@@ -2330,26 +2330,26 @@
1818 GList *
1819 gof_file_get_settable_group_names (GOFFile *file)
1820 {
1821- uid_t user_id;
1822- GList *result = NULL;
1823-
1824- if (!gof_file_can_set_group (file))
1825- return NULL;
1826-
1827- /* Check the user. */
1828- user_id = geteuid();
1829-
1830- if (user_id == 0) {
1831- /* Root is allowed to set group to anything. */
1832- result = eel_get_all_group_names ();
1833- } else if (user_id == (uid_t) file->uid) {
1834- /* Owner is allowed to set group to any that owner is member of. */
1835- result = eel_get_group_names_for_user ();
1836- } else {
1837- g_warning ("unhandled case in %s", G_STRFUNC);
1838- }
1839-
1840- return result;
1841+ uid_t user_id;
1842+ GList *result = NULL;
1843+
1844+ if (!gof_file_can_set_group (file))
1845+ return NULL;
1846+
1847+ /* Check the user. */
1848+ user_id = geteuid();
1849+
1850+ if (user_id == 0) {
1851+ /* Root is allowed to set group to anything. */
1852+ result = eel_get_all_group_names ();
1853+ } else if (user_id == (uid_t) file->uid) {
1854+ /* Owner is allowed to set group to any that owner is member of. */
1855+ result = eel_get_group_names_for_user ();
1856+ } else {
1857+ g_warning ("unhandled case in %s", G_STRFUNC);
1858+ }
1859+
1860+ return result;
1861 }
1862
1863 /* copied from nautilus-file.c */
1864@@ -2572,9 +2572,9 @@
1865 gboolean
1866 gof_file_can_unmount (GOFFile *file)
1867 {
1868- g_return_val_if_fail (GOF_IS_FILE (file), FALSE);
1869+ g_return_val_if_fail (GOF_IS_FILE (file), FALSE);
1870
1871- return file->can_unmount || (file->mount != NULL && g_mount_can_unmount (file->mount));
1872+ return file->can_unmount || (file->mount != NULL && g_mount_can_unmount (file->mount));
1873 }
1874
1875 gboolean
1876
1877=== modified file 'libcore/gof-file.h'
1878--- libcore/gof-file.h 2015-01-09 15:42:09 +0000
1879+++ libcore/gof-file.h 2015-05-09 10:55:27 +0000
1880@@ -140,8 +140,8 @@
1881 #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"
1882
1883 typedef enum {
1884- GOF_FILE_ICON_FLAGS_NONE = 0,
1885- GOF_FILE_ICON_FLAGS_USE_THUMBNAILS = (1<<0)
1886+ GOF_FILE_ICON_FLAGS_NONE = 0,
1887+ GOF_FILE_ICON_FLAGS_USE_THUMBNAILS = (1<<0)
1888 } GOFFileIconFlags;
1889
1890 typedef void (*GOFFileOperationCallback) (GOFFile *file,
1891@@ -150,14 +150,14 @@
1892 gpointer callback_data);
1893
1894 typedef struct {
1895- GOFFile *file;
1896- GCancellable *cancellable;
1897- GOFFileOperationCallback callback;
1898- gpointer callback_data;
1899- gboolean is_rename;
1900+ GOFFile *file;
1901+ GCancellable *cancellable;
1902+ GOFFileOperationCallback callback;
1903+ gpointer callback_data;
1904+ gboolean is_rename;
1905
1906- gpointer data;
1907- GDestroyNotify free_data;
1908+ gpointer data;
1909+ GDestroyNotify free_data;
1910 } GOFFileOperation;
1911
1912
1913
1914=== modified file 'libcore/gof-preferences.vala'
1915--- libcore/gof-preferences.vala 2013-07-21 04:44:33 +0000
1916+++ libcore/gof-preferences.vala 2015-05-09 10:55:27 +0000
1917@@ -1,19 +1,19 @@
1918-/*
1919- * Copyright (C) 2011 ammonkey <am.monkeyd@gmail.com>
1920- *
1921- * This program is free software: you can redistribute it and/or modify
1922- * it under the terms of the GNU General Public License as published by
1923- * the Free Software Foundation, either version 3 of the License, or
1924- * (at your option) any later version.
1925- *
1926- * This program is distributed in the hope that it will be useful,
1927- * but WITHOUT ANY WARRANTY; without even the implied warranty of
1928- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1929- * GNU General Public License for more details.
1930- *
1931- * You should have received a copy of the GNU General Public License
1932- * along with this program. If not, see <http://www.gnu.org/licenses/>.
1933- */
1934+/***
1935+ Copyright (C) 2011 ammonkey <am.monkeyd@gmail.com>
1936+
1937+ This program is free software: you can redistribute it and/or modify
1938+ it under the terms of the GNU General Public License as published by
1939+ the Free Software Foundation, either version 3 of the License, or
1940+ (at your option) any later version.
1941+
1942+ This program is distributed in the hope that it will be useful,
1943+ but WITHOUT ANY WARRANTY; without even the implied warranty of
1944+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1945+ GNU General Public License for more details.
1946+
1947+ You should have received a copy of the GNU General Public License
1948+ along with this program. If not, see <http://www.gnu.org/licenses/>.
1949+***/
1950
1951 namespace GOF {
1952
1953
1954=== modified file 'libcore/marlin-file-changes-queue.c'
1955--- libcore/marlin-file-changes-queue.c 2014-08-25 10:19:38 +0000
1956+++ libcore/marlin-file-changes-queue.c 2015-05-09 10:55:27 +0000
1957@@ -310,5 +310,5 @@
1958 }
1959
1960 g_free (change);
1961- }
1962+ }
1963 }
1964
1965=== modified file 'libcore/marlin-file-conflict-dialog.c'
1966--- libcore/marlin-file-conflict-dialog.c 2014-08-05 22:40:12 +0000
1967+++ libcore/marlin-file-conflict-dialog.c 2015-05-09 10:55:27 +0000
1968@@ -34,7 +34,7 @@
1969 #include "marlin-icon-info.h"
1970 #include "pantheon-files-core.h"
1971
1972-#define FILE_ICON_SIZE_LARGE 64
1973+#define FILE_ICON_SIZE_LARGE 64
1974
1975 typedef void GOFFileListHandle;
1976
1977@@ -69,8 +69,8 @@
1978 marlin_file_conflict_dialog,
1979 GTK_TYPE_DIALOG);
1980
1981-#define MARLIN_FILE_CONFLICT_DIALOG_GET_PRIVATE(object) \
1982- (G_TYPE_INSTANCE_GET_PRIVATE ((object), MARLIN_TYPE_FILE_CONFLICT_DIALOG, \
1983+#define MARLIN_FILE_CONFLICT_DIALOG_GET_PRIVATE(object) \
1984+ (G_TYPE_INSTANCE_GET_PRIVATE ((object), MARLIN_TYPE_FILE_CONFLICT_DIALOG, \
1985 MarlinFileConflictDialogDetails))
1986
1987 static void
1988@@ -101,7 +101,7 @@
1989 GOFFile *src, *dest, *dest_dir;
1990 time_t src_mtime, dest_mtime;
1991 GtkDialog *dialog;
1992- gboolean source_is_dir, dest_is_dir, should_show_type;
1993+ gboolean source_is_dir, dest_is_dir, should_show_type;
1994 MarlinFileConflictDialogDetails *details;
1995 char *primary_text, *message, *secondary_text;
1996 const gchar *message_extra;
1997@@ -359,7 +359,7 @@
1998 gof_file_get_uri (dest));
1999 }
2000
2001- should_show_type = g_strcmp0 (src_ftype, dest_ftype);
2002+ should_show_type = g_strcmp0 (src_ftype, dest_ftype);
2003
2004 const gchar *dest_display_name = gof_file_get_display_name (dest);
2005 const gchar *dest_dir_display_name = gof_file_get_display_name (dest_dir);
2006
2007=== modified file 'libcore/marlin-file-operations.c'
2008--- libcore/marlin-file-operations.c 2015-03-29 18:20:43 +0000
2009+++ libcore/marlin-file-operations.c 2015-05-09 10:55:27 +0000
2010@@ -2089,7 +2089,7 @@
2011 } else {
2012 must_confirm_delete = TRUE;
2013 to_delete_files = g_list_prepend (to_delete_files, file);
2014- }
2015+ }
2016 }
2017 }
2018
2019@@ -5957,7 +5957,7 @@
2020
2021 /** The done_callback function has a variable signature. When the file is being moved to
2022 * trash, it must be a MarlinDeleteCallback, otherwise it must be a MarlinCopyCallback.
2023- */
2024+ */
2025 void
2026 marlin_file_operations_copy_move (GList *files,
2027 GArray *relative_item_points,
2028
2029=== modified file 'libcore/marlin-file-utilities.c'
2030--- libcore/marlin-file-utilities.c 2014-02-17 00:47:17 +0000
2031+++ libcore/marlin-file-utilities.c 2015-05-09 10:55:27 +0000
2032@@ -55,91 +55,94 @@
2033 GHashTable *
2034 marlin_trashed_files_get_original_directories (GList *files, GList **unhandled_files)
2035 {
2036- GHashTable *directories;
2037- GOFFile *file;
2038+ GHashTable *directories;
2039+ GOFFile *file;
2040 GFile *original_file, *original_dir;
2041- GList *l, *m;
2042-
2043- directories = NULL;
2044-
2045- if (unhandled_files != NULL) {
2046- *unhandled_files = NULL;
2047- }
2048-
2049- for (l = files; l != NULL; l = l->next) {
2050- file = GOF_FILE (l->data);
2051- original_file = eel_g_file_get_trash_original_file (g_file_info_get_attribute_byte_string (file->info, G_FILE_ATTRIBUTE_TRASH_ORIG_PATH));
2052- original_dir = NULL;
2053- if (original_file != NULL) {
2054- original_dir = g_file_get_parent (original_file);
2055- }
2056-
2057- if (original_dir != NULL) {
2058- if (directories == NULL) {
2059- directories = g_hash_table_new_full (g_file_hash,
2060- (GEqualFunc) g_file_equal,
2061- (GDestroyNotify) g_object_unref,
2062- (GDestroyNotify) my_list_free_full);
2063- }
2064- m = g_hash_table_lookup (directories, original_dir);
2065- if (m != NULL) {
2066- g_hash_table_steal (directories, original_dir);
2067- }
2068- m = g_list_append (m, g_object_ref (file->location));
2069- g_hash_table_insert (directories, original_dir, m);
2070- } else if (unhandled_files != NULL) {
2071- *unhandled_files = g_list_append (*unhandled_files, gof_file_ref (file));
2072- if (original_dir != NULL)
2073- g_object_unref (original_dir);
2074- }
2075-
2076- if (original_file != NULL)
2077- g_object_unref (original_file);
2078-
2079- }
2080-
2081- return directories;
2082+ GList *l, *m;
2083+
2084+ directories = NULL;
2085+
2086+ if (unhandled_files != NULL) {
2087+ *unhandled_files = NULL;
2088+ }
2089+
2090+ for (l = files; l != NULL; l = l->next) {
2091+ file = GOF_FILE (l->data);
2092+ original_file = eel_g_file_get_trash_original_file (
2093+ g_file_info_get_attribute_byte_string (file->info,
2094+ G_FILE_ATTRIBUTE_TRASH_ORIG_PATH));
2095+ original_dir = NULL;
2096+ if (original_file != NULL) {
2097+ original_dir = g_file_get_parent (original_file);
2098+ }
2099+
2100+ if (original_dir != NULL) {
2101+ if (directories == NULL) {
2102+ directories = g_hash_table_new_full (g_file_hash,
2103+ (GEqualFunc) g_file_equal,
2104+ (GDestroyNotify) g_object_unref,
2105+ (GDestroyNotify) my_list_free_full);
2106+ }
2107+ m = g_hash_table_lookup (directories, original_dir);
2108+ if (m != NULL) {
2109+ g_hash_table_steal (directories, original_dir);
2110+ }
2111+ m = g_list_append (m, g_object_ref (file->location));
2112+ g_hash_table_insert (directories, original_dir, m);
2113+ } else if (unhandled_files != NULL) {
2114+ *unhandled_files = g_list_append (*unhandled_files, gof_file_ref (file));
2115+ if (original_dir != NULL)
2116+ g_object_unref (original_dir);
2117+ }
2118+
2119+ if (original_file != NULL)
2120+ g_object_unref (original_file);
2121+
2122+ }
2123+
2124+ return directories;
2125 }
2126
2127 void
2128 marlin_restore_files_from_trash (GList *files, GtkWindow *parent_window)
2129 {
2130- GOFFile *file;
2131- GHashTable *original_dirs_hash;
2132- GList *original_dirs, *unhandled_files;
2133- GFile *original_dir;
2134- GList *locations, *l;
2135- char *message;
2136-
2137- original_dirs_hash = marlin_trashed_files_get_original_directories (files, &unhandled_files);
2138-
2139- for (l = unhandled_files; l != NULL; l = l->next) {
2140- file = GOF_FILE (l->data);
2141- message = g_strdup_printf (_("Could not determine original location of \"%s\" "), gof_file_get_display_name (file));
2142-
2143- eel_show_warning_dialog (message,
2144+ GOFFile *file;
2145+ GHashTable *original_dirs_hash;
2146+ GList *original_dirs, *unhandled_files;
2147+ GFile *original_dir;
2148+ GList *locations, *l;
2149+ char *message;
2150+
2151+ original_dirs_hash = marlin_trashed_files_get_original_directories (files, &unhandled_files);
2152+
2153+ for (l = unhandled_files; l != NULL; l = l->next) {
2154+ file = GOF_FILE (l->data);
2155+ message = g_strdup_printf (_("Could not determine original location of \"%s\" "),
2156+ gof_file_get_display_name (file));
2157+
2158+ eel_show_warning_dialog (message,
2159 _("The item cannot be restored from trash"),
2160 parent_window);
2161- g_free (message);
2162- }
2163-
2164- if (original_dirs_hash != NULL) {
2165- original_dirs = g_hash_table_get_keys (original_dirs_hash);
2166- for (l = original_dirs; l != NULL; l = l->next) {
2167- original_dir = l->data;
2168-
2169- locations = g_hash_table_lookup (original_dirs_hash, original_dir);
2170+ g_free (message);
2171+ }
2172+
2173+ if (original_dirs_hash != NULL) {
2174+ original_dirs = g_hash_table_get_keys (original_dirs_hash);
2175+ for (l = original_dirs; l != NULL; l = l->next) {
2176+ original_dir = l->data;
2177+
2178+ locations = g_hash_table_lookup (original_dirs_hash, original_dir);
2179
2180 /*printf ("original dir: %s\n", g_file_get_uri (original_dir));*/
2181- marlin_file_operations_move (locations, NULL,
2182+ marlin_file_operations_move (locations, NULL,
2183 original_dir,
2184 parent_window,
2185 NULL, NULL);
2186- }
2187- g_hash_table_destroy (original_dirs_hash);
2188- }
2189+ }
2190+ g_hash_table_destroy (original_dirs_hash);
2191+ }
2192
2193- gof_file_list_free (unhandled_files);
2194+ gof_file_list_free (unhandled_files);
2195 }
2196
2197 void
2198
2199=== modified file 'libcore/marlin-file-utilities.h'
2200--- libcore/marlin-file-utilities.h 2014-02-17 00:47:17 +0000
2201+++ libcore/marlin-file-utilities.h 2015-05-09 10:55:27 +0000
2202@@ -27,7 +27,7 @@
2203 #include <gtk/gtk.h>
2204
2205 //char * marlin_get_xdg_dir (const char *type);
2206-char *marlin_get_accel_map_file (void);
2207+char *marlin_get_accel_map_file (void);
2208
2209 void marlin_restore_files_from_trash (GList *files, GtkWindow *parent_window);
2210
2211
2212=== modified file 'libcore/marlin-icons.h'
2213--- libcore/marlin-icons.h 2013-05-12 06:42:57 +0000
2214+++ libcore/marlin-icons.h 2015-05-09 10:55:27 +0000
2215@@ -8,7 +8,7 @@
2216 #define MARLIN_TRASH_URI "trash:///"
2217 #define MARLIN_NETWORK_URI "network:///"
2218
2219-#define MARLIN_ICON_FOLDER "folder"
2220+#define MARLIN_ICON_FOLDER "folder"
2221 #define MARLIN_ICON_FOLDER_REMOTE "folder-remote"
2222-#define MARLIN_ICON_TRASH "user-trash"
2223-#define MARLIN_ICON_TRASH_FULL "user-trash-full"
2224+#define MARLIN_ICON_TRASH "user-trash"
2225+#define MARLIN_ICON_TRASH_FULL "user-trash-full"
2226
2227=== modified file 'libcore/marlin-progress-info-manager.h'
2228--- libcore/marlin-progress-info-manager.h 2011-05-12 19:41:47 +0000
2229+++ libcore/marlin-progress-info-manager.h 2015-05-09 10:55:27 +0000
2230@@ -58,7 +58,7 @@
2231 MarlinProgressInfoManager* marlin_progress_info_manager_new (void);
2232
2233 void marlin_progress_info_manager_add_new_info (MarlinProgressInfoManager *self,
2234- MarlinProgressInfo *info);
2235+ MarlinProgressInfo *info);
2236 GList *marlin_progress_info_manager_get_all_infos (MarlinProgressInfoManager *self);
2237
2238 G_END_DECLS
2239
2240=== modified file 'libcore/marlin-progress-info.c'
2241--- libcore/marlin-progress-info.c 2013-09-09 03:08:16 +0000
2242+++ libcore/marlin-progress-info.c 2015-05-09 10:55:27 +0000
2243@@ -86,7 +86,7 @@
2244 g_object_unref (info->cancellable);
2245
2246 if (G_OBJECT_CLASS (marlin_progress_info_parent_class)->finalize) {
2247- (*G_OBJECT_CLASS (marlin_progress_info_parent_class)->finalize) (object);
2248+ (*G_OBJECT_CLASS (marlin_progress_info_parent_class)->finalize) (object);
2249 }
2250 }
2251
2252@@ -103,9 +103,9 @@
2253 could come here before the destroy, which should
2254 ressurect the object for a while */
2255 if (info->idle_source) {
2256- g_source_destroy (info->idle_source);
2257- g_source_unref (info->idle_source);
2258- info->idle_source = NULL;
2259+ g_source_destroy (info->idle_source);
2260+ g_source_unref (info->idle_source);
2261+ info->idle_source = NULL;
2262 }
2263 G_UNLOCK (progress_info);
2264 }
2265@@ -118,41 +118,37 @@
2266 gobject_class->finalize = marlin_progress_info_finalize;
2267 gobject_class->dispose = marlin_progress_info_dispose;
2268
2269- signals[CHANGED] =
2270- g_signal_new ("changed",
2271- MARLIN_TYPE_PROGRESS_INFO,
2272- G_SIGNAL_RUN_LAST,
2273- 0,
2274- NULL, NULL,
2275- g_cclosure_marshal_VOID__VOID,
2276- G_TYPE_NONE, 0);
2277-
2278- signals[PROGRESS_CHANGED] =
2279- g_signal_new ("progress-changed",
2280- MARLIN_TYPE_PROGRESS_INFO,
2281- G_SIGNAL_RUN_LAST,
2282- 0,
2283- NULL, NULL,
2284- g_cclosure_marshal_VOID__VOID,
2285- G_TYPE_NONE, 0);
2286-
2287- signals[STARTED] =
2288- g_signal_new ("started",
2289- MARLIN_TYPE_PROGRESS_INFO,
2290- G_SIGNAL_RUN_LAST,
2291- 0,
2292- NULL, NULL,
2293- g_cclosure_marshal_VOID__VOID,
2294- G_TYPE_NONE, 0);
2295-
2296- signals[FINISHED] =
2297- g_signal_new ("finished",
2298- MARLIN_TYPE_PROGRESS_INFO,
2299- G_SIGNAL_RUN_LAST,
2300- 0,
2301- NULL, NULL,
2302- g_cclosure_marshal_VOID__VOID,
2303- G_TYPE_NONE, 0);
2304+ signals[CHANGED] = g_signal_new ("changed",
2305+ MARLIN_TYPE_PROGRESS_INFO,
2306+ G_SIGNAL_RUN_LAST,
2307+ 0,
2308+ NULL, NULL,
2309+ g_cclosure_marshal_VOID__VOID,
2310+ G_TYPE_NONE, 0);
2311+
2312+ signals[PROGRESS_CHANGED] = g_signal_new ("progress-changed",
2313+ MARLIN_TYPE_PROGRESS_INFO,
2314+ G_SIGNAL_RUN_LAST,
2315+ 0,
2316+ NULL, NULL,
2317+ g_cclosure_marshal_VOID__VOID,
2318+ G_TYPE_NONE, 0);
2319+
2320+ signals[STARTED] = g_signal_new ("started",
2321+ MARLIN_TYPE_PROGRESS_INFO,
2322+ G_SIGNAL_RUN_LAST,
2323+ 0,
2324+ NULL, NULL,
2325+ g_cclosure_marshal_VOID__VOID,
2326+ G_TYPE_NONE, 0);
2327+
2328+ signals[FINISHED] = g_signal_new ("finished",
2329+ MARLIN_TYPE_PROGRESS_INFO,
2330+ G_SIGNAL_RUN_LAST,
2331+ 0,
2332+ NULL, NULL,
2333+ g_cclosure_marshal_VOID__VOID,
2334+ G_TYPE_NONE, 0);
2335
2336 }
2337
2338@@ -186,9 +182,9 @@
2339 G_LOCK (progress_info);
2340
2341 if (info->status) {
2342- res = g_strdup (info->status);
2343+ res = g_strdup (info->status);
2344 } else {
2345- res = g_strdup (_("Preparing"));
2346+ res = g_strdup (_("Preparing"));
2347 }
2348
2349 G_UNLOCK (progress_info);
2350@@ -204,9 +200,9 @@
2351 G_LOCK (progress_info);
2352
2353 if (info->details) {
2354- res = g_strdup (info->details);
2355+ res = g_strdup (info->details);
2356 } else {
2357- res = g_strdup (_("Preparing"));
2358+ res = g_strdup (_("Preparing"));
2359 }
2360
2361 G_UNLOCK (progress_info);
2362@@ -222,9 +218,9 @@
2363 G_LOCK (progress_info);
2364
2365 if (info->activity_mode) {
2366- res = -1.0;
2367+ res = -1.0;
2368 } else {
2369- res = info->progress;
2370+ res = info->progress;
2371 }
2372
2373 G_UNLOCK (progress_info);
2374@@ -235,37 +231,37 @@
2375 double
2376 marlin_progress_info_get_current (MarlinProgressInfo *info)
2377 {
2378- double current;
2379-
2380- G_LOCK (progress_info);
2381-
2382- if (info->activity_mode) {
2383- current = 0.0;
2384- } else {
2385- current = info->current;
2386- }
2387-
2388- G_UNLOCK (progress_info);
2389-
2390- return current;
2391+ double current;
2392+
2393+ G_LOCK (progress_info);
2394+
2395+ if (info->activity_mode) {
2396+ current = 0.0;
2397+ } else {
2398+ current = info->current;
2399+ }
2400+
2401+ G_UNLOCK (progress_info);
2402+
2403+ return current;
2404 }
2405
2406 double
2407 marlin_progress_info_get_total (MarlinProgressInfo *info)
2408 {
2409- double total;
2410-
2411- G_LOCK (progress_info);
2412-
2413- if (info->activity_mode) {
2414- total = -1.0;
2415- } else {
2416- total = info->total;
2417- }
2418-
2419- G_UNLOCK (progress_info);
2420-
2421- return total;
2422+ double total;
2423+
2424+ G_LOCK (progress_info);
2425+
2426+ if (info->activity_mode) {
2427+ total = -1.0;
2428+ } else {
2429+ total = info->total;
2430+ }
2431+
2432+ G_UNLOCK (progress_info);
2433+
2434+ return total;
2435 }
2436
2437 void
2438@@ -354,8 +350,8 @@
2439 Similar to what gdk_threads_add_idle does.
2440 */
2441 if (g_source_is_destroyed (source)) {
2442- G_UNLOCK (progress_info);
2443- return FALSE;
2444+ G_UNLOCK (progress_info);
2445+ return FALSE;
2446 }
2447
2448 /* We hadn't destroyed the source, so take a ref.
2449@@ -382,27 +378,27 @@
2450 G_UNLOCK (progress_info);
2451
2452 if (start_at_idle) {
2453- g_signal_emit (info,
2454- signals[STARTED],
2455- 0);
2456+ g_signal_emit (info,
2457+ signals[STARTED],
2458+ 0);
2459 }
2460
2461 if (changed_at_idle) {
2462- g_signal_emit (info,
2463- signals[CHANGED],
2464- 0);
2465+ g_signal_emit (info,
2466+ signals[CHANGED],
2467+ 0);
2468 }
2469
2470 if (progress_at_idle) {
2471- g_signal_emit (info,
2472- signals[PROGRESS_CHANGED],
2473- 0);
2474+ g_signal_emit (info,
2475+ signals[PROGRESS_CHANGED],
2476+ 0);
2477 }
2478
2479 if (finish_at_idle) {
2480- g_signal_emit (info,
2481- signals[FINISHED],
2482- 0);
2483+ g_signal_emit (info,
2484+ signals[FINISHED],
2485+ 0);
2486 }
2487
2488 g_object_unref (info);
2489@@ -415,21 +411,23 @@
2490 queue_idle (MarlinProgressInfo *info, gboolean now)
2491 {
2492 if (info->idle_source == NULL ||
2493- (now && !info->source_is_now)) {
2494- if (info->idle_source) {
2495- g_source_destroy (info->idle_source);
2496- g_source_unref (info->idle_source);
2497- info->idle_source = NULL;
2498- }
2499-
2500- info->source_is_now = now;
2501- if (now) {
2502- info->idle_source = g_idle_source_new ();
2503- } else {
2504- info->idle_source = g_timeout_source_new (SIGNAL_DELAY_MSEC);
2505- }
2506- g_source_set_callback (info->idle_source, idle_callback, info, NULL);
2507- g_source_attach (info->idle_source, NULL);
2508+ (now && !info->source_is_now)) {
2509+
2510+ if (info->idle_source) {
2511+ g_source_destroy (info->idle_source);
2512+ g_source_unref (info->idle_source);
2513+ info->idle_source = NULL;
2514+ }
2515+
2516+ info->source_is_now = now;
2517+ if (now) {
2518+ info->idle_source = g_idle_source_new ();
2519+ } else {
2520+ info->idle_source = g_timeout_source_new (SIGNAL_DELAY_MSEC);
2521+ }
2522+
2523+ g_source_set_callback (info->idle_source, idle_callback, info, NULL);
2524+ g_source_attach (info->idle_source, NULL);
2525 }
2526 }
2527
2528@@ -439,7 +437,7 @@
2529 G_LOCK (progress_info);
2530
2531 if (!info->paused) {
2532- info->paused = TRUE;
2533+ info->paused = TRUE;
2534 }
2535
2536 G_UNLOCK (progress_info);
2537@@ -451,7 +449,7 @@
2538 G_LOCK (progress_info);
2539
2540 if (info->paused) {
2541- info->paused = FALSE;
2542+ info->paused = FALSE;
2543 }
2544
2545 G_UNLOCK (progress_info);
2546@@ -463,10 +461,10 @@
2547 G_LOCK (progress_info);
2548
2549 if (!info->started) {
2550- info->started = TRUE;
2551+ info->started = TRUE;
2552
2553- info->start_at_idle = TRUE;
2554- queue_idle (info, TRUE);
2555+ info->start_at_idle = TRUE;
2556+ queue_idle (info, TRUE);
2557 }
2558
2559 G_UNLOCK (progress_info);
2560@@ -478,10 +476,10 @@
2561 G_LOCK (progress_info);
2562
2563 if (!info->finished) {
2564- info->finished = TRUE;
2565+ info->finished = TRUE;
2566
2567- info->finish_at_idle = TRUE;
2568- queue_idle (info, TRUE);
2569+ info->finish_at_idle = TRUE;
2570+ queue_idle (info, TRUE);
2571 }
2572
2573 G_UNLOCK (progress_info);
2574@@ -489,18 +487,18 @@
2575
2576 void
2577 marlin_progress_info_take_status (MarlinProgressInfo *info,
2578- char *status)
2579+ char *status)
2580 {
2581 G_LOCK (progress_info);
2582
2583 if (eel_strcmp (info->status, status) != 0) {
2584- g_free (info->status);
2585- info->status = status;
2586+ g_free (info->status);
2587+ info->status = status;
2588
2589- info->changed_at_idle = TRUE;
2590- queue_idle (info, FALSE);
2591+ info->changed_at_idle = TRUE;
2592+ queue_idle (info, FALSE);
2593 } else {
2594- g_free (status);
2595+ g_free (status);
2596 }
2597
2598 G_UNLOCK (progress_info);
2599@@ -508,16 +506,16 @@
2600
2601 void
2602 marlin_progress_info_set_status (MarlinProgressInfo *info,
2603- const char *status)
2604+ const char *status)
2605 {
2606 G_LOCK (progress_info);
2607
2608 if (eel_strcmp (info->status, status) != 0) {
2609- g_free (info->status);
2610- info->status = g_strdup (status);
2611+ g_free (info->status);
2612+ info->status = g_strdup (status);
2613
2614- info->changed_at_idle = TRUE;
2615- queue_idle (info, FALSE);
2616+ info->changed_at_idle = TRUE;
2617+ queue_idle (info, FALSE);
2618 }
2619
2620 G_UNLOCK (progress_info);
2621@@ -526,18 +524,18 @@
2622
2623 void
2624 marlin_progress_info_take_details (MarlinProgressInfo *info,
2625- char *details)
2626+ char *details)
2627 {
2628 G_LOCK (progress_info);
2629
2630 if (eel_strcmp (info->details, details) != 0) {
2631- g_free (info->details);
2632- info->details = details;
2633+ g_free (info->details);
2634+ info->details = details;
2635
2636- info->changed_at_idle = TRUE;
2637- queue_idle (info, FALSE);
2638+ info->changed_at_idle = TRUE;
2639+ queue_idle (info, FALSE);
2640 } else {
2641- g_free (details);
2642+ g_free (details);
2643 }
2644
2645 G_UNLOCK (progress_info);
2646@@ -545,16 +543,16 @@
2647
2648 void
2649 marlin_progress_info_set_details (MarlinProgressInfo *info,
2650- const char *details)
2651+ const char *details)
2652 {
2653 G_LOCK (progress_info);
2654
2655 if (eel_strcmp (info->details, details) != 0) {
2656- g_free (info->details);
2657- info->details = g_strdup (details);
2658+ g_free (info->details);
2659+ info->details = g_strdup (details);
2660
2661- info->changed_at_idle = TRUE;
2662- queue_idle (info, FALSE);
2663+ info->changed_at_idle = TRUE;
2664+ queue_idle (info, FALSE);
2665 }
2666
2667 G_UNLOCK (progress_info);
2668@@ -575,36 +573,36 @@
2669
2670 void
2671 marlin_progress_info_set_progress (MarlinProgressInfo *info,
2672- double current,
2673- double total)
2674+ double current,
2675+ double total)
2676 {
2677 double current_percent;
2678
2679 if (total <= 0) {
2680- current_percent = 1.0;
2681+ current_percent = 1.0;
2682 } else {
2683- current_percent = current / total;
2684-
2685- if (current_percent < 0) {
2686- current_percent = 0;
2687- }
2688-
2689- if (current_percent > 1.0) {
2690- current_percent = 1.0;
2691- }
2692+ current_percent = current / total;
2693+
2694+ if (current_percent < 0) {
2695+ current_percent = 0;
2696+ }
2697+
2698+ if (current_percent > 1.0) {
2699+ current_percent = 1.0;
2700+ }
2701 }
2702
2703 G_LOCK (progress_info);
2704
2705 if (info->activity_mode || /* emit on switch from activity mode */
2706- fabs (current_percent - info->progress) > 0.005 /* Emit on change of 0.5 percent */
2707- ) {
2708- info->activity_mode = FALSE;
2709- info->progress = current_percent;
2710- info->current = current;
2711- info->total = total;
2712- info->progress_at_idle = TRUE;
2713- queue_idle (info, FALSE);
2714+ fabs (current_percent - info->progress) > 0.005) { /* Emit on change of 0.5 percent */
2715+
2716+ info->activity_mode = FALSE;
2717+ info->progress = current_percent;
2718+ info->current = current;
2719+ info->total = total;
2720+ info->progress_at_idle = TRUE;
2721+ queue_idle (info, FALSE);
2722 }
2723
2724 G_UNLOCK (progress_info);
2725
2726=== modified file 'libcore/marlin-progress-info.h'
2727--- libcore/marlin-progress-info.h 2013-08-10 20:20:23 +0000
2728+++ libcore/marlin-progress-info.h 2015-05-09 10:55:27 +0000
2729@@ -69,16 +69,16 @@
2730 void marlin_progress_info_pause (MarlinProgressInfo *info);
2731 void marlin_progress_info_resume (MarlinProgressInfo *info);
2732 void marlin_progress_info_set_status (MarlinProgressInfo *info,
2733- const char *status);
2734+ const char *status);
2735 void marlin_progress_info_take_status (MarlinProgressInfo *info,
2736- char *status);
2737+ char *status);
2738 void marlin_progress_info_set_details (MarlinProgressInfo *info,
2739- const char *details);
2740+ const char *details);
2741 void marlin_progress_info_take_details (MarlinProgressInfo *info,
2742- char *details);
2743+ char *details);
2744 void marlin_progress_info_set_progress (MarlinProgressInfo *info,
2745- double current,
2746- double total);
2747+ double current,
2748+ double total);
2749 void marlin_progress_info_pulse_progress (MarlinProgressInfo *info);
2750
2751
2752
2753=== modified file 'libcore/marlin-trash-monitor.h'
2754--- libcore/marlin-trash-monitor.h 2013-08-10 20:20:23 +0000
2755+++ libcore/marlin-trash-monitor.h 2015-05-09 10:55:27 +0000
2756@@ -49,16 +49,16 @@
2757 struct MarlinTrashMonitorClass {
2758 GObjectClass parent_class;
2759
2760- void (* trash_state_changed) (MarlinTrashMonitor *trash_monitor,
2761- gboolean new_state);
2762+ void (* trash_state_changed) (MarlinTrashMonitor *trash_monitor,
2763+ gboolean new_state);
2764 };
2765
2766-GType marlin_trash_monitor_get_type (void);
2767+GType marlin_trash_monitor_get_type (void);
2768
2769 MarlinTrashMonitor *marlin_trash_monitor_get (void);
2770-gboolean marlin_trash_monitor_is_empty (void);
2771+gboolean marlin_trash_monitor_is_empty (void);
2772 GIcon *marlin_trash_monitor_get_icon (void);
2773
2774-void marlin_trash_monitor_add_new_trash_directories (void);
2775+void marlin_trash_monitor_add_new_trash_directories (void);
2776
2777 #endif
2778
2779=== modified file 'libwidgets/Animations.vala'
2780--- libwidgets/Animations.vala 2014-06-07 13:17:21 +0000
2781+++ libwidgets/Animations.vala 2015-05-09 10:55:27 +0000
2782@@ -1,3 +1,21 @@
2783+/***
2784+ Copyright (c) 2015 Elementary Developers
2785+
2786+ This program is free software; you can redistribute it and/or modify it
2787+ under the terms of the GNU General Public License as published by the Free
2788+ Software Foundation; either version 2 of the License, or (at your option)
2789+ any later version.
2790+
2791+ This program is distributed in the hope that it will be useful, but WITHOUT
2792+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
2793+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
2794+ more details.
2795+
2796+ You should have received a copy of the GNU General Public License along with
2797+ this program; if not, write to the Free Software Foundation, Inc., 59 Temple
2798+ Place, Suite 330, Boston, MA 02111-1307 USA
2799+ ***/
2800+
2801 namespace Marlin.Animation {
2802
2803 private static uint timeout_source_id = 0;
2804
2805=== modified file 'libwidgets/BreadcrumbsElements.vala'
2806--- libwidgets/BreadcrumbsElements.vala 2015-02-11 15:30:27 +0000
2807+++ libwidgets/BreadcrumbsElements.vala 2015-05-09 10:55:27 +0000
2808@@ -1,22 +1,22 @@
2809-/*
2810- * Copyright (c) 2011 Lucas Baudin <xapantu@gmail.com>
2811- *
2812- * Marlin is free software; you can redistribute it and/or
2813- * modify it under the terms of the GNU General Public License as
2814- * published by the Free Software Foundation; either version 2 of the
2815- * License, or (at your option) any later version.
2816- *
2817- * Marlin is distributed in the hope that it will be useful,
2818- * but WITHOUT ANY WARRANTY; without even the implied warranty of
2819- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
2820- * General Public License for more details.
2821- *
2822- * You should have received a copy of the GNU General Public
2823- * License along with this program; see the file COPYING. If not,
2824- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
2825- * Boston, MA 02111-1307, USA.
2826- *
2827- */
2828+/***
2829+ Copyright (c) 2011 Lucas Baudin <xapantu@gmail.com>
2830+
2831+ Marlin is free software; you can redistribute it and/or
2832+ modify it under the terms of the GNU General Public License as
2833+ published by the Free Software Foundation; either version 2 of the
2834+ License, or (at your option) any later version.
2835+
2836+ Marlin is distributed in the hope that it will be useful,
2837+ but WITHOUT ANY WARRANTY; without even the implied warranty of
2838+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
2839+ General Public License for more details.
2840+
2841+ You should have received a copy of the GNU General Public
2842+ License along with this program; see the file COPYING. If not,
2843+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
2844+ Boston, MA 02111-1307, USA.
2845+*
2846+***/
2847
2848 public class Marlin.View.Chrome.BreadcrumbsElement : Object {
2849
2850
2851=== modified file 'libwidgets/LocationBar.vala'
2852--- libwidgets/LocationBar.vala 2015-02-27 16:23:20 +0000
2853+++ libwidgets/LocationBar.vala 2015-05-09 10:55:27 +0000
2854@@ -1,22 +1,22 @@
2855-/*
2856- * Copyright (c) 2011 Lucas Baudin <xapantu@gmail.com>
2857- *
2858- * Marlin is free software; you can redistribute it and/or
2859- * modify it under the terms of the GNU General Public License as
2860- * published by the Free Software Foundation; either version 2 of the
2861- * License, or (at your option) any later version.
2862- *
2863- * Marlin is distributed in the hope that it will be useful,
2864- * but WITHOUT ANY WARRANTY; without even the implied warranty of
2865- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
2866- * General Public License for more details.
2867- *
2868- * You should have received a copy of the GNU General Public
2869- * License along with this program; see the file COPYING. If not,
2870- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
2871- * Boston, MA 02111-1307, USA.
2872- *
2873- */
2874+/***
2875+ Copyright (c) 2011 Lucas Baudin <xapantu@gmail.com>
2876+
2877+ Marlin is free software; you can redistribute it and/or
2878+ modify it under the terms of the GNU General Public License as
2879+ published by the Free Software Foundation; either version 2 of the
2880+ License, or (at your option) any later version.
2881+
2882+ Marlin is distributed in the hope that it will be useful,
2883+ but WITHOUT ANY WARRANTY; without even the implied warranty of
2884+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
2885+ General Public License for more details.
2886+
2887+ You should have received a copy of the GNU General Public
2888+ License along with this program; see the file COPYING. If not,
2889+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
2890+ Boston, MA 02111-1307, USA.
2891+
2892+***/
2893
2894 namespace Marlin {
2895 public const string ROOT_FS_URI = "file://";
2896@@ -66,7 +66,7 @@
2897 grab_focus ();
2898 }
2899 }
2900-
2901+
2902 protected string text_completion = "";
2903 protected bool multiple_completions = false;
2904 protected bool text_changed = false;
2905@@ -143,7 +143,7 @@
2906 y = 0;
2907
2908 elements = new Gee.ArrayList<BreadcrumbsElement> ();
2909-
2910+
2911 secondary_icon_activatable = true;
2912 secondary_icon_sensitive = true;
2913 truncate_multiline = true;
2914@@ -184,7 +184,7 @@
2915 case Gdk.Key.Up:
2916 up ();
2917 return true;
2918-
2919+
2920 case Gdk.Key.Escape:
2921 escape ();
2922 return true;
2923@@ -199,7 +199,7 @@
2924 if (event.window.get_width () < 24)
2925 return false;
2926
2927- if (is_focus)
2928+ if (is_focus)
2929 return base.button_press_event (event);
2930
2931 foreach (BreadcrumbsElement element in elements)
2932@@ -226,7 +226,7 @@
2933 var newpath = get_path_from_element (el);
2934 activate_alternate (get_file_for_path (newpath));
2935 }
2936-
2937+
2938 return true;
2939 }
2940
2941@@ -248,7 +248,7 @@
2942 Source.remove ((uint) timeout);
2943 timeout = -1;
2944 }
2945-
2946+
2947 if (is_focus)
2948 return base.button_release_event (event);
2949
2950@@ -262,7 +262,7 @@
2951 } else
2952 grab_focus ();
2953 }
2954-
2955+
2956 return base.button_release_event (event);
2957 }
2958
2959@@ -290,12 +290,12 @@
2960 text_completion = "";
2961 need_completion ();
2962 }
2963-
2964+
2965 void after_realize () {
2966- /* After realizing, we take a reference on the Gdk.Window of the Entry so
2967+ /* After realizing, we take a reference on the Gdk.Window of the Entry so
2968 * we can set the cursor icon as needed. This relies on Gtk storing the
2969- * owning widget as the user data on a Gdk.Window. The required window
2970- * will be the first child of the entry.
2971+ * owning widget as the user data on a Gdk.Window. The required window
2972+ * will be the first child of the entry.
2973 */
2974 entry_window = get_window ().get_children_with_user_data (this).data;
2975 }
2976@@ -406,7 +406,7 @@
2977 int x,
2978 int y,
2979 uint timestamp);
2980-
2981+
2982 protected void add_icon (IconDirectory icon) {
2983 if (icon.gicon != null)
2984 icon.icon = icon_factory.load_symbolic_icon_from_gicon (button_context, icon.gicon, 16);
2985@@ -415,13 +415,13 @@
2986
2987 icons.append (icon);
2988 }
2989-
2990+
2991 public void complete () {
2992 if (text_completion.length == 0)
2993 return;
2994
2995 string path = text + text_completion;
2996-
2997+
2998 /* If there are multiple results, tab as far as we can, otherwise do the entire result */
2999 if (!multiple_completions) {
3000 set_entry_text (path + "/");
3001@@ -429,26 +429,25 @@
3002 } else
3003 set_entry_text (path);
3004 }
3005-
3006+
3007 public void reset_elements_states () {
3008 foreach (BreadcrumbsElement element in elements)
3009 element.pressed = false;
3010
3011 queue_draw ();
3012 }
3013-
3014+
3015 public void set_entry_text (string text) {
3016 ignore_change = true;
3017 text_completion = "";
3018 this.text = text;
3019 set_position (-1);
3020 }
3021-
3022+
3023 public void set_entry_cursor (Gdk.Cursor? cursor) {
3024 entry_window.set_cursor (cursor ?? new Gdk.Cursor (Gdk.CursorType.XTERM));
3025+ }
3026
3027- }
3028-
3029 public void set_entry_secondary_icon (bool active, bool visible) {
3030 if (!visible)
3031 secondary_icon_pixbuf = null;
3032@@ -517,7 +516,7 @@
3033 public string get_elements_path () {
3034 return get_path_from_element (null);
3035 }
3036-
3037+
3038 /**
3039 * Gets a properly escaped GLib.File for the given path
3040 **/
3041@@ -528,7 +527,7 @@
3042 /* Format our path so its valid */
3043 if (newpath == "")
3044 newpath = "/";
3045-
3046+
3047 if (newpath[0] == '~')
3048 newpath = newpath.replace("~", Environment.get_home_dir ());
3049
3050@@ -551,7 +550,7 @@
3051 File file = File.new_for_commandline_arg (newpath);
3052 return file;
3053 }
3054-
3055+
3056 /**
3057 * Select the breadcrumb to make a right click. This function check
3058 * where the user click, then, it loads a context menu with the others
3059@@ -582,7 +581,7 @@
3060 return true;
3061 }
3062 return false;
3063- }
3064+ }
3065
3066 public virtual string? update_breadcrumbs (string newpath, string breadpath) {
3067 string strloc;
3068@@ -796,7 +795,7 @@
3069 button_context_active.set_path(button_context.get_path ());
3070 button_context_active.set_state (Gtk.StateFlags.ACTIVE);
3071 }
3072-
3073+
3074 base.draw (cr);
3075 double height = get_allocated_height ();
3076 double width = get_allocated_width ();
3077@@ -842,13 +841,13 @@
3078 foreach (BreadcrumbsElement element in newbreads)
3079 if (element.display)
3080 x_render = element.draw(cr, x_render, margin, height_marged, button_context, this);
3081-
3082+
3083 cr.restore ();
3084 } else {
3085 if (text_completion != "") {
3086 int layout_width, layout_height;
3087 double text_width, text_height;
3088-
3089+
3090 cr.set_source_rgba (0, 0, 0, 0.4);
3091 Pango.Layout layout = create_pango_layout (text);
3092 layout.get_size (out layout_width, out layout_height);
3093
3094=== modified file 'libwidgets/PoofWindow.vala'
3095--- libwidgets/PoofWindow.vala 2014-03-24 19:46:34 +0000
3096+++ libwidgets/PoofWindow.vala 2015-05-09 10:55:27 +0000
3097@@ -1,19 +1,19 @@
3098-//
3099-// Copyright (C) 2011-2012 Robert Dyer, Rico Tzschichholz
3100-//
3101-// This program is free software: you can redistribute it and/or modify
3102-// it under the terms of the GNU General Public License as published by
3103-// the Free Software Foundation, either version 3 of the License, or
3104-// (at your option) any later version.
3105-//
3106-// This program is distributed in the hope that it will be useful,
3107-// but WITHOUT ANY WARRANTY; without even the implied warranty of
3108-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3109-// GNU General Public License for more details.
3110-//
3111-// You should have received a copy of the GNU General Public License
3112-// along with this program. If not, see <http://www.gnu.org/licenses/>.
3113-//
3114+/***
3115+ Copyright (C) 2011-2012 Robert Dyer, Rico Tzschichholz
3116+
3117+ This program is free software: you can redistribute it and/or modify
3118+ it under the terms of the GNU General Public License as published by
3119+ the Free Software Foundation, either version 3 of the License, or
3120+ (at your option) any later version.
3121+
3122+ This program is distributed in the hope that it will be useful,
3123+ but WITHOUT ANY WARRANTY; without even the implied warranty of
3124+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3125+ GNU General Public License for more details.
3126+
3127+ You should have received a copy of the GNU General Public License
3128+ along with this program. If not, see <http://www.gnu.org/licenses/>.
3129+***/
3130
3131 namespace Marlin.Animation
3132 {
3133
3134=== modified file 'plugins/contractor/CMakeLists.txt'
3135--- plugins/contractor/CMakeLists.txt 2014-08-05 22:40:12 +0000
3136+++ plugins/contractor/CMakeLists.txt 2015-05-09 10:55:27 +0000
3137@@ -1,11 +1,11 @@
3138 find_package(PkgConfig)
3139 pkg_check_modules(DEPS REQUIRED
3140- gtk+-3.0
3141+ gtk+-3.0
3142 gee-0.8
3143 glib-2.0
3144 granite)
3145 set(CFLAGS
3146- ${DEPS_CFLAGS} ${DEPS_CFLAGS_OTHER}
3147+ ${DEPS_CFLAGS} ${DEPS_CFLAGS_OTHER}
3148 )
3149 include_directories(${CMAKE_BINARY_DIR}/libcore/)
3150 include_directories(${CMAKE_SOURCE_DIR}/libcore/)
3151
3152=== modified file 'plugins/contractor/plugin.vala'
3153--- plugins/contractor/plugin.vala 2014-12-21 19:10:02 +0000
3154+++ plugins/contractor/plugin.vala 2015-05-09 10:55:27 +0000
3155@@ -1,25 +1,25 @@
3156-/*
3157- * Authors:
3158- * Lucas Baudin <xapantu@gmail.com>
3159- * ammonkey <am.monkeyd@gmail.com>
3160- * Victor Martinez <victoreduardm@gmail.com>
3161- *
3162- * Copyright (C) Lucas Baudin 2011 <xapantu@gmail.com>
3163- * Copyright (C) 2013 elementary
3164- *
3165- * Marlin is free software: you can redistribute it and/or modify it
3166- * under the terms of the GNU General Public License as published by the
3167- * Free Software Foundation, either version 3 of the License, or
3168- * (at your option) any later version.
3169- *
3170- * Marlin is distributed in the hope that it will be useful, but
3171- * WITHOUT ANY WARRANTY; without even the implied warranty of
3172- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
3173- * See the GNU General Public License for more details.
3174- *
3175- * You should have received a copy of the GNU General Public License along
3176- * with this program. If not, see <http://www.gnu.org/licenses/>.
3177- */
3178+/***
3179+ Authors:
3180+ Lucas Baudin <xapantu@gmail.com>
3181+ ammonkey <am.monkeyd@gmail.com>
3182+ Victor Martinez <victoreduardm@gmail.com>
3183+
3184+ Copyright (C) Lucas Baudin 2011 <xapantu@gmail.com>
3185+ Copyright (C) 2013 elementary
3186+
3187+ Marlin is free software: you can redistribute it and/or modify it
3188+ under the terms of the GNU General Public License as published by the
3189+ Free Software Foundation, either version 3 of the License, or
3190+ (at your option) any later version.
3191+
3192+ Marlin is distributed in the hope that it will be useful, but
3193+ WITHOUT ANY WARRANTY; without even the implied warranty of
3194+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
3195+ See the GNU General Public License for more details.
3196+
3197+ You should have received a copy of the GNU General Public License along
3198+ with this program. If not, see <http://www.gnu.org/licenses/>.
3199+***/
3200
3201 public class Marlin.Plugins.ContractMenuItem : Gtk.MenuItem {
3202 private Granite.Services.Contract contract;
3203
3204=== modified file 'plugins/network-places/plugin.vala'
3205--- plugins/network-places/plugin.vala 2014-12-07 19:39:22 +0000
3206+++ plugins/network-places/plugin.vala 2015-05-09 10:55:27 +0000
3207@@ -1,20 +1,20 @@
3208-/*
3209- *
3210- * Marlin is free software: you can redistribute it and/or modify it
3211- * under the terms of the GNU General Public License as published by the
3212- * Free Software Foundation, either version 3 of the License, or
3213- * (at your option) any later version.
3214- *
3215- * Marlin is distributed in the hope that it will be useful, but
3216- * WITHOUT ANY WARRANTY; without even the implied warranty of
3217- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
3218- * See the GNU General Public License for more details.
3219- *
3220- * You should have received a copy of the GNU General Public License along
3221- * with this program. If not, see <http://www.gnu.org/licenses/>.
3222- */
3223-
3224-// See src/marlin-connect-server-dialog.c
3225+/***
3226+
3227+ Marlin is free software: you can redistribute it and/or modify it
3228+ under the terms of the GNU General Public License as published by the
3229+ Free Software Foundation, either version 3 of the License, or
3230+ (at your option) any later version.
3231+
3232+ Marlin is distributed in the hope that it will be useful, but
3233+ WITHOUT ANY WARRANTY; without even the implied warranty of
3234+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
3235+ See the GNU General Public License for more details.
3236+
3237+ You should have received a copy of the GNU General Public License along
3238+ with this program. If not, see <http://www.gnu.org/licenses/>.
3239+***/
3240+
3241+/* See src/marlin-connect-server-dialog.c */
3242 extern void marlin_connect_server_dialog_show (Gtk.Widget widget);
3243
3244 public class Files.Plugins.NetworkPlaces : Marlin.Plugins.Base {
3245@@ -25,7 +25,7 @@
3246 public override void update_sidebar (Gtk.Widget widget) {
3247 var sidebar = widget as Marlin.AbstractSidebar;
3248 sidebar.add_extra_network_item (_("Connect to Server…"), _("Connect to a network file server"),
3249- new ThemedIcon.with_default_fallbacks ("network-server"),
3250+ new ThemedIcon.with_default_fallbacks ("network-server"),
3251 marlin_connect_server_dialog_show);
3252 }
3253 }
3254
3255=== modified file 'plugins/pantheon-files-ctags/CMakeLists.txt'
3256--- plugins/pantheon-files-ctags/CMakeLists.txt 2014-08-05 22:40:12 +0000
3257+++ plugins/pantheon-files-ctags/CMakeLists.txt 2015-05-09 10:55:27 +0000
3258@@ -2,12 +2,12 @@
3259
3260 find_package(PkgConfig)
3261 pkg_check_modules(DEPS REQUIRED
3262- gtk+-3.0
3263+ gtk+-3.0
3264 gio-2.0
3265 gee-0.8
3266 )
3267 set(CFLAGS
3268- ${DEPS_CFLAGS} ${DEPS_CFLAGS_OTHER}
3269+ ${DEPS_CFLAGS} ${DEPS_CFLAGS_OTHER}
3270 )
3271 include_directories(${CMAKE_SOURCE_DIR}/libcore/)
3272 include_directories(${CMAKE_BINARY_DIR}/libcore/)
3273@@ -27,7 +27,7 @@
3274 )
3275 add_definitions(${CFLAGS})
3276 link_directories(${LIB_PATHS})
3277-add_library(pantheon-filesctags SHARED
3278+add_library(pantheon-filesctags SHARED
3279 ${VALA_C})
3280 target_link_libraries(pantheon-filesctags ${DEPS_LIBRARIES} pantheon-files-core)
3281 add_dependencies(pantheon-filesctags pantheon-files-core)
3282
3283=== modified file 'plugins/pantheon-files-ctags/plugin.vala'
3284--- plugins/pantheon-files-ctags/plugin.vala 2014-11-21 19:24:45 +0000
3285+++ plugins/pantheon-files-ctags/plugin.vala 2015-05-09 10:55:27 +0000
3286@@ -1,19 +1,19 @@
3287-/*
3288- * Copyright (C) ammonkey 2011 <am.monkeyd@gmail.com>
3289- *
3290- * Marlin is free software: you can redistribute it and/or modify it
3291- * under the terms of the GNU General Public License as published by the
3292- * Free Software Foundation, either version 3 of the License, or
3293- * (at your option) any later version.
3294- *
3295- * Marlin is distributed in the hope that it will be useful, but
3296- * WITHOUT ANY WARRANTY; without even the implied warranty of
3297- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
3298- * See the GNU General Public License for more details.
3299- *
3300- * You should have received a copy of the GNU General Public License along
3301- * with this program. If not, see <http://www.gnu.org/licenses/>.
3302- */
3303+/***
3304+ Copyright (C) ammonkey 2011 <am.monkeyd@gmail.com>
3305+
3306+ Marlin is free software: you can redistribute it and/or modify it
3307+ under the terms of the GNU General Public License as published by the
3308+ Free Software Foundation, either version 3 of the License, or
3309+ (at your option) any later version.
3310+
3311+ Marlin is distributed in the hope that it will be useful, but
3312+ WITHOUT ANY WARRANTY; without even the implied warranty of
3313+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
3314+ See the GNU General Public License for more details.
3315+
3316+ You should have received a copy of the GNU General Public License along
3317+ with this program. If not, see <http://www.gnu.org/licenses/>.
3318+***/
3319
3320 [DBus (name = "org.elementary.pantheonfiles.db")]
3321 interface MarlinDaemon : Object {
3322
3323=== modified file 'plugins/pantheon-files-trash/CMakeLists.txt'
3324--- plugins/pantheon-files-trash/CMakeLists.txt 2014-08-05 22:40:12 +0000
3325+++ plugins/pantheon-files-trash/CMakeLists.txt 2015-05-09 10:55:27 +0000
3326@@ -2,11 +2,11 @@
3327
3328 find_package(PkgConfig)
3329 pkg_check_modules(DEPS REQUIRED
3330- gtk+-3.0
3331+ gtk+-3.0
3332 gee-0.8
3333 )
3334 set(CFLAGS
3335- ${DEPS_CFLAGS} ${DEPS_CFLAGS_OTHER}
3336+ ${DEPS_CFLAGS} ${DEPS_CFLAGS_OTHER}
3337 )
3338 include_directories(${CMAKE_SOURCE_DIR}/libcore/)
3339 include_directories(${CMAKE_BINARY_DIR}/libcore/)
3340@@ -25,7 +25,7 @@
3341 )
3342 add_definitions(${CFLAGS})
3343 link_directories(${LIB_PATHS})
3344-add_library(pantheon-filestrash SHARED
3345+add_library(pantheon-filestrash SHARED
3346 ${VALA_C})
3347 target_link_libraries(pantheon-filestrash ${DEPS_LIBRARIES} pantheon-files-core)
3348 add_dependencies(pantheon-filestrash pantheon-files-core)
3349
3350=== modified file 'plugins/pantheon-files-trash/plugin.vala'
3351--- plugins/pantheon-files-trash/plugin.vala 2015-04-05 17:40:26 +0000
3352+++ plugins/pantheon-files-trash/plugin.vala 2015-05-09 10:55:27 +0000
3353@@ -1,19 +1,19 @@
3354-/*
3355- * Copyright (C) Lucas Baudin 2011 <xapantu@gmail.com>
3356- *
3357- * Marlin is free software: you can redistribute it and/or modify it
3358- * under the terms of the GNU General Public License as published by the
3359- * Free Software Foundation, either version 3 of the License, or
3360- * (at your option) any later version.
3361- *
3362- * Marlin is distributed in the hope that it will be useful, but
3363- * WITHOUT ANY WARRANTY; without even the implied warranty of
3364- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
3365- * See the GNU General Public License for more details.
3366- *
3367- * You should have received a copy of the GNU General Public License along
3368- * with this program. If not, see <http://www.gnu.org/licenses/>.
3369- */
3370+/***
3371+ Copyright (C) Lucas Baudin 2011 <xapantu@gmail.com>
3372+
3373+ Marlin is free software: you can redistribute it and/or modify it
3374+ under the terms of the GNU General Public License as published by the
3375+ Free Software Foundation, either version 3 of the License, or
3376+ (at your option) any later version.
3377+
3378+ Marlin is distributed in the hope that it will be useful, but
3379+ WITHOUT ANY WARRANTY; without even the implied warranty of
3380+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
3381+ See the GNU General Public License for more details.
3382+
3383+ You should have received a copy of the GNU General Public License along
3384+ with this program. If not, see <http://www.gnu.org/licenses/>.
3385+***/
3386
3387 public class Marlin.Plugins.Trash : Marlin.Plugins.Base {
3388 private TrashMonitor trash_monitor;
3389
3390=== modified file 'src/AbstractEditableLabel.vala'
3391--- src/AbstractEditableLabel.vala 2014-10-29 20:55:21 +0000
3392+++ src/AbstractEditableLabel.vala 2015-05-09 10:55:27 +0000
3393@@ -1,20 +1,20 @@
3394-/*
3395- Copyright (C) 2014 elementary Developers
3396-
3397- This program is free software: you can redistribute it and/or modify it
3398- under the terms of the GNU Lesser General Public License version 3, as published
3399- by the Free Software Foundation.
3400-
3401- This program is distributed in the hope that it will be useful, but
3402- WITHOUT ANY WARRANTY; without even the implied warranties of
3403- MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
3404- PURPOSE. See the GNU General Public License for more details.
3405-
3406- You should have received a copy of the GNU General Public License along
3407- with this program. If not, see <http://www.gnu.org/licenses/>.
3408-
3409- Authors : Jeremy Wootten <jeremy@elementary.org>
3410-*/
3411+/***
3412+ Copyright (C) 2015 elementary Developers
3413+
3414+ This program is free software: you can redistribute it and/or modify it
3415+ under the terms of the GNU Lesser General Public License version 3, as published
3416+ by the Free Software Foundation.
3417+
3418+ This program is distributed in the hope that it will be useful, but
3419+ WITHOUT ANY WARRANTY; without even the implied warranties of
3420+ MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
3421+ PURPOSE. See the GNU General Public License for more details.
3422+
3423+ You should have received a copy of the GNU General Public License along
3424+ with this program. If not, see <http://www.gnu.org/licenses/>.
3425+
3426+ Authors : Jeremy Wootten <jeremy@elementaryos.org>
3427+***/
3428
3429
3430 namespace Marlin {
3431@@ -34,7 +34,7 @@
3432 add (editable_widget);
3433 show_all ();
3434 get_real_editable ().key_press_event.connect (on_key_press_event);
3435- }
3436+ }
3437
3438 public bool on_key_press_event (Gdk.EventKey event) {
3439 bool control_pressed = ((event.state & Gdk.ModifierType.CONTROL_MASK) != 0);
3440@@ -75,7 +75,7 @@
3441 public virtual void set_line_wrap_mode (Pango.WrapMode mode) {}
3442 public virtual void set_justify (Gtk.Justification jtype) {}
3443 public virtual void set_padding (int xpad, int ypad) {}
3444-
3445+
3446 public abstract new void set_size_request (int width, int height);
3447 public abstract Gtk.Widget create_editable_widget ();
3448 public abstract string get_text ();
3449
3450=== modified file 'src/Application.vala'
3451--- src/Application.vala 2015-01-04 19:48:50 +0000
3452+++ src/Application.vala 2015-05-09 10:55:27 +0000
3453@@ -1,23 +1,23 @@
3454 /***
3455- Copyright (C) 1999, 2000 Red Hat, Inc.
3456- Copyright (C) 2000, 2001 Eazel, Inc.
3457- Copyright (C) 2013 Julián Unrrein <junrrein@gmail.com>
3458-
3459- This program is free software: you can redistribute it and/or modify it
3460- under the terms of the GNU Lesser General Public License version 3, as published
3461- by the Free Software Foundation.
3462-
3463- This program is distributed in the hope that it will be useful, but
3464- WITHOUT ANY WARRANTY; without even the implied warranties of
3465- MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
3466- PURPOSE. See the GNU General Public License for more details.
3467-
3468- You should have received a copy of the GNU General Public License along
3469- with this program. If not, see <http://www.gnu.org/licenses/>.
3470-
3471- Authors: Elliot Lee <sopwith@redhat.com>,
3472- Darin Adler <darin@bentspoon.com>,
3473- Julián Unrrein <junrrein@gmail.com>
3474+ Copyright (C) 1999, 2000 Red Hat, Inc.
3475+ Copyright (C) 2000, 2001 Eazel, Inc.
3476+ Copyright (C) 2013 Julián Unrrein <junrrein@gmail.com>
3477+
3478+ This program is free software: you can redistribute it and/or modify it
3479+ under the terms of the GNU Lesser General Public License version 3, as published
3480+ by the Free Software Foundation.
3481+
3482+ This program is distributed in the hope that it will be useful, but
3483+ WITHOUT ANY WARRANTY; without even the implied warranties of
3484+ MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
3485+ PURPOSE. See the GNU General Public License for more details.
3486+
3487+ You should have received a copy of the GNU General Public License along
3488+ with this program. If not, see <http://www.gnu.org/licenses/>.
3489+
3490+ Authors: Elliot Lee <sopwith@redhat.com>,
3491+ Darin Adler <darin@bentspoon.com>,
3492+ Julián Unrrein <junrrein@gmail.com>
3493 ***/
3494
3495 private Marlin.Application application_singleton = null;
3496@@ -96,8 +96,9 @@
3497
3498 plugins = new Marlin.PluginManager (Config.PLUGIN_DIR);
3499
3500- /* TODO move the volume manager here? */
3501- /* TODO-gio: This should be using the UNMOUNTED feature of GFileMonitor instead */
3502+ /**TODO** move the volume manager here? */
3503+ /**TODO** gio: This should be using the UNMOUNTED feature of GFileMonitor instead */
3504+
3505 this.volume_monitor = VolumeMonitor.get ();
3506 this.volume_monitor.mount_removed.connect (mount_removed_callback);
3507
3508
3509=== modified file 'src/Bookmark.vala'
3510--- src/Bookmark.vala 2014-03-16 18:08:56 +0000
3511+++ src/Bookmark.vala 2015-05-09 10:55:27 +0000
3512@@ -1,21 +1,21 @@
3513 /***
3514- Copyright (C) 1999, 2000 Eazel, Inc.
3515- 2014 elementary Developers and Jeremy Wootten
3516-
3517- This program is free software: you can redistribute it and/or modify it
3518- under the terms of the GNU Lesser General Public License version 3, as published
3519- by the Free Software Foundation.
3520-
3521- This program is distributed in the hope that it will be useful, but
3522- WITHOUT ANY WARRANTY; without even the implied warranties of
3523- MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
3524- PURPOSE. See the GNU General Public License for more details.
3525-
3526- You should have received a copy of the GNU General Public License along
3527- with this program. If not, see <http://www.gnu.org/licenses/>.
3528-
3529- Authors : John Sullivan <sullivan@eazel.com>
3530- Jeremy Wootten <jeremywootten@gmail.com>
3531+ Copyright (C) 1999, 2000 Eazel, Inc.
3532+ 2015 elementary Developers
3533+
3534+ This program is free software: you can redistribute it and/or modify it
3535+ under the terms of the GNU Lesser General Public License version 3, as published
3536+ by the Free Software Foundation.
3537+
3538+ This program is distributed in the hope that it will be useful, but
3539+ WITHOUT ANY WARRANTY; without even the implied warranties of
3540+ MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
3541+ PURPOSE. See the GNU General Public License for more details.
3542+
3543+ You should have received a copy of the GNU General Public License along
3544+ with this program. If not, see <http://www.gnu.org/licenses/>.
3545+
3546+ Authors : John Sullivan <sullivan@eazel.com>
3547+ Jeremy Wootten <jeremy@elementaryos.org>
3548 ***/
3549
3550 namespace Marlin {
3551
3552=== modified file 'src/BookmarkList.vala'
3553--- src/BookmarkList.vala 2015-01-01 19:31:53 +0000
3554+++ src/BookmarkList.vala 2015-05-09 10:55:27 +0000
3555@@ -1,22 +1,22 @@
3556 /***
3557- Copyright (C) 1999, 2000 Eazel, Inc.
3558- 2014 elementary Developers and Jeremy Wootten
3559-
3560- This program is free software: you can redistribute it and/or modify it
3561- under the terms of the GNU Lesser General Public License version 3, as published
3562- by the Free Software Foundation.
3563-
3564- This program is distributed in the hope that it will be useful, but
3565- WITHOUT ANY WARRANTY; without even the implied warranties of
3566- MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
3567- PURPOSE. See the GNU General Public License for more details.
3568-
3569- You should have received a copy of the GNU General Public License along
3570- with this program. If not, see <http://www.gnu.org/licenses/>.
3571-
3572- Authors : John Sullivan <sullivan@eazel.com>
3573+ Copyright (C) 1999, 2000 Eazel, Inc.
3574+ 2015 elementary Developers
3575+
3576+ This program is free software: you can redistribute it and/or modify it
3577+ under the terms of the GNU Lesser General Public License version 3, as published
3578+ by the Free Software Foundation.
3579+
3580+ This program is distributed in the hope that it will be useful, but
3581+ WITHOUT ANY WARRANTY; without even the implied warranties of
3582+ MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
3583+ PURPOSE. See the GNU General Public License for more details.
3584+
3585+ You should have received a copy of the GNU General Public License along
3586+ with this program. If not, see <http://www.gnu.org/licenses/>.
3587+
3588+ Authors : John Sullivan <sullivan@eazel.com>
3589 ammonkey <am.monkeyd@gmail.com>
3590- Jeremy Wootten <jeremywootten@gmail.com>
3591+ Jeremy Wootten <jeremy@elementaryos.org>
3592 ***/
3593
3594 namespace Marlin {
3595
3596=== modified file 'src/ConnectServerOperation.vala'
3597--- src/ConnectServerOperation.vala 2014-04-16 03:31:35 +0000
3598+++ src/ConnectServerOperation.vala 2015-05-09 10:55:27 +0000
3599@@ -1,21 +1,21 @@
3600 /***
3601- Copyright (C) 2010 Cosimo Cecchi <cosimoc@gnome.org>
3602- Copyright (C) 2013 elementary Developers
3603-
3604- This program is free software: you can redistribute it and/or modify it
3605- under the terms of the GNU Lesser General Public License version 3, as published
3606- by the Free Software Foundation.
3607-
3608- This program is distributed in the hope that it will be useful, but
3609- WITHOUT ANY WARRANTY; without even the implied warranties of
3610- MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
3611- PURPOSE. See the GNU General Public License for more details.
3612-
3613- You should have received a copy of the GNU General Public License along
3614- with this program. If not, see <http://www.gnu.org/licenses/>.
3615-
3616- Authors: Cosimo Cecchi <cosimoc@gnome.org>
3617- Julián Unrrein <junrrein@gmail.com>
3618+ Copyright (C) 2010 Cosimo Cecchi <cosimoc@gnome.org>
3619+ Copyright (C) 2015 elementary Developers
3620+
3621+ This program is free software: you can redistribute it and/or modify it
3622+ under the terms of the GNU Lesser General Public License version 3, as published
3623+ by the Free Software Foundation.
3624+
3625+ This program is distributed in the hope that it will be useful, but
3626+ WITHOUT ANY WARRANTY; without even the implied warranties of
3627+ MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
3628+ PURPOSE. See the GNU General Public License for more details.
3629+
3630+ You should have received a copy of the GNU General Public License along
3631+ with this program. If not, see <http://www.gnu.org/licenses/>.
3632+
3633+ Authors: Cosimo Cecchi <cosimoc@gnome.org>
3634+ Julián Unrrein <junrrein@gmail.com>
3635 ***/
3636
3637 public class Marlin.ConnectServer.Operation : Gtk.MountOperation {
3638@@ -25,8 +25,8 @@
3639 public Operation (Marlin.ConnectServer.Dialog dialog) {
3640 this.dialog = dialog;
3641 this.set_parent (dialog);
3642-
3643- // Turn the parent's modal functionality off because the mount operation needs to take over
3644+
3645+ /* Turn the parent's modal functionality off because the mount operation needs to take over */
3646 this.dialog.modal = false;
3647 this.reply.connect ( (result) => {
3648 this.dialog.modal = true;
3649@@ -57,4 +57,4 @@
3650 reply (MountOperationResult.ABORTED);
3651 });
3652 }
3653-}
3654\ No newline at end of file
3655+}
3656
3657=== modified file 'src/DndHandler.vala'
3658--- src/DndHandler.vala 2015-01-13 21:59:38 +0000
3659+++ src/DndHandler.vala 2015-05-09 10:55:27 +0000
3660@@ -1,25 +1,23 @@
3661-/*
3662- * DndHandler.vala
3663- *
3664- * Copyright 2014 jeremy <jeremy@jeremy-MM061>
3665- *
3666- * This program is free software; you can redistribute it and/or modify
3667- * it under the terms of the GNU General Public License as published by
3668- * the Free Software Foundation; either version 2 of the License, or
3669- * (at your option) any later version.
3670- *
3671- * This program is distributed in the hope that it will be useful,
3672- * but WITHOUT ANY WARRANTY; without even the implied warranty of
3673- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3674- * GNU General Public License for more details.
3675- *
3676- * You should have received a copy of the GNU General Public License
3677- * along with this program; if not, write to the Free Software
3678- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
3679- * MA 02110-1301, USA.
3680- *
3681- *
3682- */
3683+/***
3684+ Copyright (C) 2015 elementary Developers
3685+
3686+ This program is free software; you can redistribute it and/or modify
3687+ it under the terms of the GNU General Public License as published by
3688+ the Free Software Foundation; either version 2 of the License, or
3689+ (at your option) any later version.
3690+
3691+ This program is distributed in the hope that it will be useful,
3692+ but WITHOUT ANY WARRANTY; without even the implied warranty of
3693+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3694+ GNU General Public License for more details.
3695+
3696+ You should have received a copy of the GNU General Public License
3697+ along with this program; if not, write to the Free Software
3698+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
3699+ MA 02110-1301, USA.
3700+
3701+ Authors: Jeremy Wootten <jeremy@elementaryos.org>
3702+***/
3703
3704 namespace FM {
3705 public class DndHandler : GLib.Object {
3706@@ -81,7 +79,7 @@
3707 private void add_action (Gtk.ApplicationWindow win) {
3708 var action = new GLib.SimpleAction ("choice", GLib.VariantType.STRING);
3709 action.activate.connect (this.on_choice);
3710-
3711+
3712 win.add_action (action);
3713 }
3714
3715@@ -154,7 +152,7 @@
3716 null, null, /* actual property type and format got disregarded */
3717 out data
3718 );
3719-
3720+
3721 if (exists && data != null) {
3722 string name = data_to_string (data);
3723 if (GLib.Path.DIR_SEPARATOR.to_string () in name) {
3724
3725=== modified file 'src/Enums.vala'
3726--- src/Enums.vala 2015-01-18 20:46:03 +0000
3727+++ src/Enums.vala 2015-05-09 10:55:27 +0000
3728@@ -1,21 +1,21 @@
3729 /***
3730- * Copyright (c) 2006-2007 Benedikt Meurer <benny@xfce.org>
3731- * Copyright (c) 2009 Jannis Pohlmann <jannis@xfce.org>
3732- * Copyright (c) 2015 Elementary Developers
3733- *
3734- * This program is free software; you can redistribute it and/or modify it
3735- * under the terms of the GNU General Public License as published by the Free
3736- * Software Foundation; either version 2 of the License, or (at your option)
3737- * any later version.
3738- *
3739- * This program is distributed in the hope that it will be useful, but WITHOUT
3740- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
3741- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
3742- * more details.
3743- *
3744- * You should have received a copy of the GNU General Public License along with
3745- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
3746- * Place, Suite 330, Boston, MA 02111-1307 USA
3747+ Copyright (c) 2006-2007 Benedikt Meurer <benny@xfce.org>
3748+ Copyright (c) 2009 Jannis Pohlmann <jannis@xfce.org>
3749+ Copyright (c) 2015 Elementary Developers
3750+
3751+ This program is free software; you can redistribute it and/or modify it
3752+ under the terms of the GNU General Public License as published by the Free
3753+ Software Foundation; either version 2 of the License, or (at your option)
3754+ any later version.
3755+
3756+ This program is distributed in the hope that it will be useful, but WITHOUT
3757+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
3758+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
3759+ more details.
3760+
3761+ You should have received a copy of the GNU General Public License along with
3762+ this program; if not, write to the Free Software Foundation, Inc., 59 Temple
3763+ Place, Suite 330, Boston, MA 02111-1307 USA
3764 ***/
3765
3766 namespace Marlin {
3767
3768=== modified file 'src/MimeActions.vala'
3769--- src/MimeActions.vala 2015-03-26 02:19:38 +0000
3770+++ src/MimeActions.vala 2015-05-09 10:55:27 +0000
3771@@ -1,23 +1,23 @@
3772 /***
3773- Copyright (C) 2000 Eazel, Inc.
3774- Copyright (C) 2011 ammonkey <am.monkeyd@gmail.com>
3775- Copyright (C) 2013 elementary Developers
3776-
3777- This program is free software: you can redistribute it and/or modify it
3778- under the terms of the GNU Lesser General Public License version 3, as published
3779- by the Free Software Foundation.
3780-
3781- This program is distributed in the hope that it will be useful, but
3782- WITHOUT ANY WARRANTY; without even the implied warranties of
3783- MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
3784- PURPOSE. See the GNU General Public License for more details.
3785-
3786- You should have received a copy of the GNU General Public License along
3787- with this program. If not, see <http://www.gnu.org/licenses/>.
3788-
3789- Authors: Maciej Stachowiak <mjs@eazel.com>
3790- ammonkey <am.monkeyd@gmail.com>
3791- Julián Unrrein <junrrein@gmail.com>
3792+ Copyright (C) 2000 Eazel, Inc.
3793+ Copyright (C) 2011 ammonkey <am.monkeyd@gmail.com>
3794+ Copyright (C) 2013 elementary Developers
3795+
3796+ This program is free software: you can redistribute it and/or modify it
3797+ under the terms of the GNU Lesser General Public License version 3, as published
3798+ by the Free Software Foundation.
3799+
3800+ This program is distributed in the hope that it will be useful, but
3801+ WITHOUT ANY WARRANTY; without even the implied warranties of
3802+ MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
3803+ PURPOSE. See the GNU General Public License for more details.
3804+
3805+ You should have received a copy of the GNU General Public License along
3806+ with this program. If not, see <http://www.gnu.org/licenses/>.
3807+
3808+ Authors: Maciej Stachowiak <mjs@eazel.com>
3809+ ammonkey <am.monkeyd@gmail.com>
3810+ Julián Unrrein <junrrein@gmail.com>
3811 ***/
3812
3813 public class Marlin.MimeActions {
3814
3815=== modified file 'src/MultiLineEditableLabel.vala'
3816--- src/MultiLineEditableLabel.vala 2015-02-06 22:57:55 +0000
3817+++ src/MultiLineEditableLabel.vala 2015-05-09 10:55:27 +0000
3818@@ -1,20 +1,20 @@
3819-/*
3820- Copyright (C) 2014 elementary Developers
3821-
3822- This program is free software: you can redistribute it and/or modify it
3823- under the terms of the GNU Lesser General Public License version 3, as published
3824- by the Free Software Foundation.
3825-
3826- This program is distributed in the hope that it will be useful, but
3827- WITHOUT ANY WARRANTY; without even the implied warranties of
3828- MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
3829- PURPOSE. See the GNU General Public License for more details.
3830-
3831- You should have received a copy of the GNU General Public License along
3832- with this program. If not, see <http://www.gnu.org/licenses/>.
3833-
3834- Authors : Jeremy Wootten <jeremy@elementary.org>
3835-*/
3836+/***
3837+ Copyright (C) 2015 elementary Developers
3838+
3839+ This program is free software: you can redistribute it and/or modify it
3840+ under the terms of the GNU Lesser General Public License version 3, as published
3841+ by the Free Software Foundation.
3842+
3843+ This program is distributed in the hope that it will be useful, but
3844+ WITHOUT ANY WARRANTY; without even the implied warranties of
3845+ MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
3846+ PURPOSE. See the GNU General Public License for more details.
3847+
3848+ You should have received a copy of the GNU General Public License along
3849+ with this program. If not, see <http://www.gnu.org/licenses/>.
3850+
3851+ Authors : Jeremy Wootten <jeremy@elementaryos.org>
3852+***/
3853
3854 namespace Marlin {
3855 public class MultiLineEditableLabel : AbstractEditableLabel {
3856
3857=== modified file 'src/ProgressInfoWidget.vala'
3858--- src/ProgressInfoWidget.vala 2014-12-28 09:17:26 +0000
3859+++ src/ProgressInfoWidget.vala 2015-05-09 10:55:27 +0000
3860@@ -1,22 +1,22 @@
3861 /***
3862- Copyright (C) 2007, 2011 Red Hat, Inc.
3863- Copyright (C) 2013 elementary Developers
3864-
3865- This program is free software: you can redistribute it and/or modify it
3866- under the terms of the GNU Lesser General Public License version 3, as published
3867- by the Free Software Foundation.
3868-
3869- This program is distributed in the hope that it will be useful, but
3870- WITHOUT ANY WARRANTY; without even the implied warranties of
3871- MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
3872- PURPOSE. See the GNU General Public License for more details.
3873-
3874- You should have received a copy of the GNU General Public License along
3875- with this program. If not, see <http://www.gnu.org/licenses/>.
3876-
3877- Authors: Alexander Larsson <alexl@redhat.com>
3878- Cosimo Cecchi <cosimoc@redhat.com>
3879- Julián Unrrein <junrrein@gmail.com>
3880+ Copyright (C) 2007, 2011 Red Hat, Inc.
3881+ Copyright (C) 2013 elementary Developers
3882+
3883+ This program is free software: you can redistribute it and/or modify it
3884+ under the terms of the GNU Lesser General Public License version 3, as published
3885+ by the Free Software Foundation.
3886+
3887+ This program is distributed in the hope that it will be useful, but
3888+ WITHOUT ANY WARRANTY; without even the implied warranties of
3889+ MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
3890+ PURPOSE. See the GNU General Public License for more details.
3891+
3892+ You should have received a copy of the GNU General Public License along
3893+ with this program. If not, see <http://www.gnu.org/licenses/>.
3894+
3895+ Authors: Alexander Larsson <alexl@redhat.com>
3896+ Cosimo Cecchi <cosimoc@redhat.com>
3897+ Julián Unrrein <junrrein@gmail.com>
3898 ***/
3899
3900 public class Marlin.Progress.InfoWidget : Gtk.Box {
3901@@ -42,7 +42,7 @@
3902 destroy ();
3903 });
3904 }
3905-
3906+
3907 private void build_and_show_widget () {
3908 this.orientation = Gtk.Orientation.VERTICAL;
3909 this.homogeneous = false;
3910@@ -69,7 +69,7 @@
3911 this.info.cancel ();
3912 button.sensitive = false;
3913 });
3914-
3915+
3916 hbox.pack_start (button, false, false, 0);
3917
3918 pack_start (hbox, false, false, 0);
3919
3920=== modified file 'src/ProgressUIHandler.vala'
3921--- src/ProgressUIHandler.vala 2014-12-28 09:14:11 +0000
3922+++ src/ProgressUIHandler.vala 2015-05-09 10:55:27 +0000
3923@@ -1,22 +1,22 @@
3924 /***
3925- Copyright (C) 2007, 2011 Red Hat, Inc.
3926- Copyright (C) 2013 Julián Unrrein <junrrein@gmail.com>
3927-
3928- This program is free software: you can redistribute it and/or modify it
3929- under the terms of the GNU Lesser General Public License version 3, as published
3930- by the Free Software Foundation.
3931-
3932- This program is distributed in the hope that it will be useful, but
3933- WITHOUT ANY WARRANTY; without even the implied warranties of
3934- MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
3935- PURPOSE. See the GNU General Public License for more details.
3936-
3937- You should have received a copy of the GNU General Public License along
3938- with this program. If not, see <http://www.gnu.org/licenses/>.
3939-
3940- Authors: Alexander Larsson <alexl@redhat.com>
3941- Cosimo Cecchi <cosimoc@redhat.com>
3942- Julián Unrrein <junrrein@gmail.com>
3943+ Copyright (C) 2007, 2011 Red Hat, Inc.
3944+ Copyright (C) 2013 Julián Unrrein <junrrein@gmail.com>
3945+
3946+ This program is free software: you can redistribute it and/or modify it
3947+ under the terms of the GNU Lesser General Public License version 3, as published
3948+ by the Free Software Foundation.
3949+
3950+ This program is distributed in the hope that it will be useful, but
3951+ WITHOUT ANY WARRANTY; without even the implied warranties of
3952+ MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
3953+ PURPOSE. See the GNU General Public License for more details.
3954+
3955+ You should have received a copy of the GNU General Public License along
3956+ with this program. If not, see <http://www.gnu.org/licenses/>.
3957+
3958+ Authors: Alexander Larsson <alexl@redhat.com>
3959+ Cosimo Cecchi <cosimoc@redhat.com>
3960+ Julián Unrrein <junrrein@gmail.com>
3961 ***/
3962
3963 public class Marlin.Progress.UIHandler : Object {
3964
3965=== modified file 'src/QuicklistHandler.vala'
3966--- src/QuicklistHandler.vala 2014-01-07 22:25:32 +0000
3967+++ src/QuicklistHandler.vala 2015-05-09 10:55:27 +0000
3968@@ -1,18 +1,18 @@
3969 /***
3970- Copyright (C) 2012 Canonical
3971- Copyright (C) 2013 Julián Unrrein <junrrein@gmail.com>
3972-
3973- This program is free software: you can redistribute it and/or modify it
3974- under the terms of the GNU Lesser General Public License version 3, as published
3975- by the Free Software Foundation.
3976-
3977- This program is distributed in the hope that it will be useful, but
3978- WITHOUT ANY WARRANTY; without even the implied warranties of
3979- MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
3980- PURPOSE. See the GNU General Public License for more details.
3981-
3982- You should have received a copy of the GNU General Public License along
3983- with this program. If not, see <http://www.gnu.org/licenses/>.
3984+ Copyright (C) 2012 Canonical
3985+ Copyright (C) 2013 Julián Unrrein <junrrein@gmail.com>
3986+
3987+ This program is free software: you can redistribute it and/or modify it
3988+ under the terms of the GNU Lesser General Public License version 3, as published
3989+ by the Free Software Foundation.
3990+
3991+ This program is distributed in the hope that it will be useful, but
3992+ WITHOUT ANY WARRANTY; without even the implied warranties of
3993+ MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
3994+ PURPOSE. See the GNU General Public License for more details.
3995+
3996+ You should have received a copy of the GNU General Public License along
3997+ with this program. If not, see <http://www.gnu.org/licenses/>.
3998 ***/
3999
4000 namespace Marlin {
4001
4002=== modified file 'src/SingleLineEditableLabel.vala'
4003--- src/SingleLineEditableLabel.vala 2014-12-25 08:43:14 +0000
4004+++ src/SingleLineEditableLabel.vala 2015-05-09 10:55:27 +0000
4005@@ -1,20 +1,20 @@
4006-/*
4007- Copyright (C) 2014 elementary Developers
4008-
4009- This program is free software: you can redistribute it and/or modify it
4010- under the terms of the GNU Lesser General Public License version 3, as published
4011- by the Free Software Foundation.
4012-
4013- This program is distributed in the hope that it will be useful, but
4014- WITHOUT ANY WARRANTY; without even the implied warranties of
4015- MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
4016- PURPOSE. See the GNU General Public License for more details.
4017-
4018- You should have received a copy of the GNU General Public License along
4019- with this program. If not, see <http://www.gnu.org/licenses/>.
4020-
4021- Authors : Jeremy Wootten <jeremy@elementary.org>
4022-*/
4023+/***
4024+ Copyright (C) 2015 elementary Developers
4025+
4026+ This program is free software: you can redistribute it and/or modify it
4027+ under the terms of the GNU Lesser General Public License version 3, as published
4028+ by the Free Software Foundation.
4029+
4030+ This program is distributed in the hope that it will be useful, but
4031+ WITHOUT ANY WARRANTY; without even the implied warranties of
4032+ MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
4033+ PURPOSE. See the GNU General Public License for more details.
4034+
4035+ You should have received a copy of the GNU General Public License along
4036+ with this program. If not, see <http://www.gnu.org/licenses/>.
4037+
4038+ Authors : Jeremy Wootten <jeremy@elementaryos.org>
4039+***/
4040
4041 namespace Marlin {
4042 public class SingleLineEditableLabel : AbstractEditableLabel {
4043
4044=== modified file 'src/TextRenderer.vala'
4045--- src/TextRenderer.vala 2015-03-26 02:19:38 +0000
4046+++ src/TextRenderer.vala 2015-05-09 10:55:27 +0000
4047@@ -1,20 +1,20 @@
4048-/*
4049- Copyright (C) 2014 elementary Developers
4050-
4051- This program is free software: you can redistribute it and/or modify it
4052- under the terms of the GNU Lesser General Public License version 3, as published
4053- by the Free Software Foundation.
4054-
4055- This program is distributed in the hope that it will be useful, but
4056- WITHOUT ANY WARRANTY; without even the implied warranties of
4057- MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
4058- PURPOSE. See the GNU General Public License for more details.
4059-
4060- You should have received a copy of the GNU General Public License along
4061- with this program. If not, see <http://www.gnu.org/licenses/>.
4062-
4063- Authors : Jeremy Wootten <jeremy@elementary.org>
4064-*/
4065+/***
4066+ Copyright (C) 2015 elementary Developers
4067+
4068+ This program is free software: you can redistribute it and/or modify it
4069+ under the terms of the GNU Lesser General Public License version 3, as published
4070+ by the Free Software Foundation.
4071+
4072+ This program is distributed in the hope that it will be useful, but
4073+ WITHOUT ANY WARRANTY; without even the implied warranties of
4074+ MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
4075+ PURPOSE. See the GNU General Public License for more details.
4076+
4077+ You should have received a copy of the GNU General Public License along
4078+ with this program. If not, see <http://www.gnu.org/licenses/>.
4079+
4080+ Authors: Jeremy Wootten <jeremy@elementaryos.org>
4081+***/
4082
4083 namespace Marlin {
4084 public class TextRenderer: Gtk.CellRendererText {
4085
4086=== modified file 'src/View/AbstractDirectoryView.vala'
4087--- src/View/AbstractDirectoryView.vala 2015-04-18 12:10:52 +0000
4088+++ src/View/AbstractDirectoryView.vala 2015-05-09 10:55:27 +0000
4089@@ -1,27 +1,27 @@
4090-/*
4091- Copyright (C) 2014 elementary Developers
4092-
4093- This program is free software: you can redistribute it and/or modify it
4094- under the terms of the GNU Lesser General Public License version 3, as published
4095- by the Free Software Foundation.
4096-
4097- This program is distributed in the hope that it will be useful, but
4098- WITHOUT ANY WARRANTY; without even the implied warranties of
4099- MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
4100- PURPOSE. See the GNU General Public License for more details.
4101-
4102- You should have received a copy of the GNU General Public License along
4103- with this program. If not, see <http://www.gnu.org/licenses/>.
4104-
4105- Authors : Jeremy Wootten <jeremy@elementary.org>
4106+/***
4107+ Copyright (C) 2015 elementary Developers
4108+
4109+ This program is free software: you can redistribute it and/or modify it
4110+ under the terms of the GNU Lesser General Public License version 3, as published
4111+ by the Free Software Foundation.
4112+
4113+ This program is distributed in the hope that it will be useful, but
4114+ WITHOUT ANY WARRANTY; without even the implied warranties of
4115+ MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
4116+ PURPOSE. See the GNU General Public License for more details.
4117+
4118+ You should have received a copy of the GNU General Public License along
4119+ with this program. If not, see <http://www.gnu.org/licenses/>.
4120+
4121+ Authors : Jeremy Wootten <jeremy@elementaryos.org>
4122+***/
4123+
4124+/* Implementations of AbstractDirectoryView are
4125+ * IconView
4126+ * ListView
4127+ * ColumnView
4128 */
4129
4130-/** Implementations of AbstractDirectoryView are
4131- * IconView
4132- * ListView
4133- * ColumnView
4134-**/
4135-
4136 namespace FM {
4137 public abstract class AbstractDirectoryView : Gtk.ScrolledWindow {
4138
4139@@ -163,7 +163,8 @@
4140 uint thumbnail_source_id = 0;
4141 Marlin.Thumbnailer thumbnailer = null;
4142
4143- /* TODO Support for preview see bug #1380139 */
4144+ /**TODO** Support for preview see bug #1380139 */
4145+
4146 private string? previewer = null;
4147
4148 /* Rename support */
4149@@ -193,24 +194,25 @@
4150 private GLib.List<GLib.AppInfo> open_with_apps;
4151 protected GLib.List<GOF.Directory.Async>? loaded_subdirectories = null;
4152
4153- /* TODO: Remove the "unowned" portion of the declaration for
4154- selected_files and on code that repeats its type.
4155-
4156- Selected files are originally obtained with
4157- gtk_tree_model_get(): this function increases the reference
4158- count of the file object.
4159-
4160- In order to prevent the obvious memory leak when inserting
4161- these owned objects into the unowned element container, the
4162- objects are unreferenced upon being inserted.
4163-
4164- This results in a container filled with weak references to
4165- objects with reference counts of 1.
4166-
4167- A scenario may occur that the cell holding the original file
4168- object is destroyed, and the container is left with pointers
4169- pointing to freed memory. Reference counting the container
4170- elements would prevent this possibility. */
4171+ /**TODO**: Remove the "unowned" portion of the declaration for
4172+ selected_files and on code that repeats its type.
4173+
4174+ Selected files are originally obtained with
4175+ gtk_tree_model_get(): this function increases the reference
4176+ count of the file object.
4177+
4178+ In order to prevent the obvious memory leak when inserting
4179+ these owned objects into the unowned element container, the
4180+ objects are unreferenced upon being inserted.
4181+
4182+ This results in a container filled with weak references to
4183+ objects with reference counts of 1.
4184+
4185+ A scenario may occur that the cell holding the original file
4186+ object is destroyed, and the container is left with pointers
4187+ pointing to freed memory. Reference counting the container
4188+ elements would prevent this possibility.*/
4189+
4190 protected GLib.List<unowned GOF.File> selected_files = null;
4191
4192 private GLib.List<unowned GOF.File>? templates = null;
4193@@ -824,9 +826,10 @@
4194 unselect_all ();
4195 select_gof_file (file_to_rename);
4196
4197- /* Assume writability on remote locations
4198- * TODO Reliably determine writability with various remote protocols.
4199- */
4200+ /* Assume writability on remote locations */
4201+
4202+ /**TODO** Reliably determine writability with various remote protocols.*/
4203+
4204 if (file_to_rename.is_writable () || !slot.directory.is_local)
4205 start_renaming_file (file_to_rename, false);
4206 else
4207@@ -852,8 +855,10 @@
4208
4209 /* Allow time for the file to appear in the tree model before renaming
4210 * Wait longer for remote locations to allow for reload.
4211- * TODO: Remove need for hard coded delay.
4212 */
4213+
4214+ /**TODO** Remove need for hard coded delay*/
4215+
4216 int delay = local ? 250 : 500;
4217 GLib.Timeout.add (delay, () => {
4218 view.rename_file (file_to_rename);
4219@@ -920,9 +925,10 @@
4220 return;
4221
4222 if (selected_files.next != null)
4223- /* TODO invoke batch renamer see bug #1014122*/
4224 warning ("Cannot rename multiple files (yet) - renaming first only");
4225
4226+ /**TODO** invoke batch renamer see bug #1014122*/
4227+
4228 var file = selected_files.first ().data;
4229 bool preselect_whole_name = file.is_folder ();
4230
4231@@ -1991,7 +1997,9 @@
4232 file.is_smb_server ());
4233
4234 action_set_enabled (common_actions, "bookmark", can_bookmark);
4235- /* TODO inhibit copy for unreadable files see bug #1392465*/
4236+
4237+ /**TODO** inhibit copy for unreadable files see bug #1392465*/
4238+
4239 action_set_enabled (common_actions, "copy", !in_trash);
4240 action_set_enabled (common_actions, "bookmark", !more_than_one_selected);
4241 }
4242@@ -2449,7 +2457,7 @@
4243 new_empty_folder ();
4244
4245 return true;
4246-
4247+
4248 case Gdk.Key.A:
4249 if (shift_pressed && only_control_pressed)
4250 invert_selection ();
4251
4252=== modified file 'src/View/AbstractTreeView.vala'
4253--- src/View/AbstractTreeView.vala 2015-04-18 12:10:52 +0000
4254+++ src/View/AbstractTreeView.vala 2015-05-09 10:55:27 +0000
4255@@ -1,20 +1,20 @@
4256-/*
4257- Copyright (C) 2014 elementary Developers
4258-
4259- This program is free software: you can redistribute it and/or modify it
4260- under the terms of the GNU Lesser General Public License version 3, as published
4261- by the Free Software Foundation.
4262-
4263- This program is distributed in the hope that it will be useful, but
4264- WITHOUT ANY WARRANTY; without even the implied warranties of
4265- MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
4266- PURPOSE. See the GNU General Public License for more details.
4267-
4268- You should have received a copy of the GNU General Public License along
4269- with this program. If not, see <http://www.gnu.org/licenses/>.
4270-
4271- Authors :
4272-*/
4273+/***
4274+ Copyright (C) 2015 elementary Developers
4275+
4276+ This program is free software: you can redistribute it and/or modify it
4277+ under the terms of the GNU Lesser General Public License version 3, as published
4278+ by the Free Software Foundation.
4279+
4280+ This program is distributed in the hope that it will be useful, but
4281+ WITHOUT ANY WARRANTY; without even the implied warranties of
4282+ MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
4283+ PURPOSE. See the GNU General Public License for more details.
4284+
4285+ You should have received a copy of the GNU General Public License along
4286+ with this program. If not, see <http://www.gnu.org/licenses/>.
4287+
4288+ Authors : Jeremy Wootten <jeremy@elementaryos.org>
4289+***/
4290
4291 namespace FM {
4292 /* Implement common features of ColumnView and ListView */
4293@@ -72,7 +72,7 @@
4294 name_renderer.@set ("ellipsize-set", true);
4295 name_renderer.@set ("ellipsize", Pango.EllipsizeMode.END);
4296 name_renderer.xalign = 0.0f;
4297- name_renderer.yalign = 0.5f;
4298+ name_renderer.yalign = 0.5f;
4299 }
4300
4301 protected void connect_tree_signals () {
4302
4303=== modified file 'src/View/Browser.vala'
4304--- src/View/Browser.vala 2014-09-20 10:12:14 +0000
4305+++ src/View/Browser.vala 2015-05-09 10:55:27 +0000
4306@@ -1,21 +1,21 @@
4307-/*
4308- * Copyright (C) 2010 ammonkey
4309- *
4310- * This library is free software; you can redistribute it and/or modify
4311- * it under the terms of the GNU Lesser General Public License
4312- * version 3.0 as published by the Free Software Foundation.
4313- *
4314- * This library is distributed in the hope that it will be useful,
4315- * but WITHOUT ANY WARRANTY; without even the implied warranty of
4316- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4317- * GNU Lesser General Public License version 3.0 for more details.
4318- *
4319- * You should have received a copy of the GNU Lesser General Public
4320- * License along with this library. If not, see
4321- * <http://www.gnu.org/licenses/>.
4322- *
4323- * Author: ammonkey <am.monkeyd@gmail.com>
4324- */
4325+/***
4326+ Copyright (C) 2010 ammonkey
4327+
4328+ This library is free software; you can redistribute it and/or modify
4329+ it under the terms of the GNU Lesser General Public License
4330+ version 3.0 as published by the Free Software Foundation.
4331+
4332+ This library is distributed in the hope that it will be useful,
4333+ but WITHOUT ANY WARRANTY; without even the implied warranty of
4334+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4335+ GNU Lesser General Public License version 3.0 for more details.
4336+
4337+ You should have received a copy of the GNU Lesser General Public
4338+ License along with this library. If not, see
4339+ <http://www.gnu.org/licenses/>.
4340+
4341+ Author: ammonkey <am.monkeyd@gmail.com>
4342+***/
4343
4344 namespace Marlin.View {
4345
4346
4347=== modified file 'src/View/Chrome/ButtonWithMenu.vala'
4348--- src/View/Chrome/ButtonWithMenu.vala 2014-04-25 20:20:25 +0000
4349+++ src/View/Chrome/ButtonWithMenu.vala 2015-05-09 10:55:27 +0000
4350@@ -10,7 +10,7 @@
4351 but WITHOUT ANY WARRANTY; without even the implied warranty of
4352 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
4353 Lesser General Public License for more details.
4354-
4355+
4356 You should have received a copy of the GNU Lesser General
4357 Public License along with this library; if not, write to the
4358 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
4359@@ -81,11 +81,11 @@
4360
4361 public ulong toggled_sig_id;
4362
4363- /**
4364- * Delegate function used to populate menu
4365+ /**
4366+ * Delegate function used to populate menu
4367 */
4368 public delegate Gtk.Menu MenuFetcher ();
4369-
4370+
4371 public signal void slow_press ();
4372
4373 public MenuFetcher fetcher {
4374@@ -173,15 +173,15 @@
4375 }
4376
4377 private bool on_button_press_event (Gdk.EventButton ev) {
4378- // If the button is kept pressed, don't make the user wait when there's no action
4379+ /* If the button is kept pressed, don't make the user wait when there's no action */
4380 int max_press_time = LONG_PRESS_TIME;
4381 if (ev.button == 1 || ev.button == 3)
4382 active = true;
4383-
4384+
4385 if (timeout == -1 && ev.button == 1) {
4386 last_click_time = ev.time;
4387 timeout = (int) Timeout.add(max_press_time, () => {
4388- // long click
4389+ /* long click */
4390 timeout = -1;
4391 popup_menu (ev);
4392 return false;
4393@@ -189,7 +189,7 @@
4394 }
4395
4396 if (ev.button == 3) {
4397- // right_click
4398+ /* right_click */
4399 right_click (ev);
4400 popup_menu (ev);
4401 }
4402@@ -198,9 +198,10 @@
4403 }
4404
4405 private bool on_mnemonic_activate (bool group_cycling) {
4406- // ToggleButton always grabs focus away from the editor,
4407- // so reimplement Widget's version, which only grabs the
4408- // focus if we are group cycling.
4409+ /* ToggleButton always grabs focus away from the editor,
4410+ * so reimplement Widget's version, which only grabs the
4411+ * focus if we are group cycling.
4412+ */
4413 if (!group_cycling) {
4414 activate ();
4415 } else if (can_focus) {
4416@@ -239,7 +240,7 @@
4417 menu.get_allocation (out menu_allocation);
4418
4419 if (menu.attach_widget == null || menu.attach_widget.get_window () == null) {
4420- // Prevent null exception in weird cases
4421+ /* Prevent null exception in weird cases */
4422 x = 0;
4423 y = 0;
4424 push_in = true;
4425@@ -247,7 +248,7 @@
4426 }
4427
4428 menu.attach_widget.get_window ().get_origin (out x, out y);
4429-
4430+
4431 Gtk.Allocation allocation;
4432 menu.attach_widget.get_allocation (out allocation);
4433
4434@@ -286,8 +287,9 @@
4435 int parent_window_x0 = x;
4436 int parent_window_xf = parent_window_x0 + window_allocation.width;
4437
4438- // Now check if the menu is outside the window and un-center it
4439- // if that's the case
4440+ /* Now check if the menu is outside the window and un-center it
4441+ * if that's the case
4442+ */
4443
4444 if (x + menu_allocation.width > parent_window_xf)
4445 x = parent_window_xf - menu_allocation.width; // Move to left
4446@@ -306,4 +308,4 @@
4447 push_in = true;
4448 }
4449 }
4450-}
4451\ No newline at end of file
4452+}
4453
4454=== modified file 'src/View/Chrome/ImgEventBox.vala'
4455--- src/View/Chrome/ImgEventBox.vala 2013-07-21 04:44:33 +0000
4456+++ src/View/Chrome/ImgEventBox.vala 2015-05-09 10:55:27 +0000
4457@@ -1,21 +1,21 @@
4458-/*
4459- * Copyright (C) 2011 Elementary Developers
4460- *
4461- * This program is free software: you can redistribute it and/or modify
4462- * it under the terms of the GNU General Public License as published by
4463- * the Free Software Foundation, either version 3 of the License, or
4464- * (at your option) any later version.
4465- *
4466- * This program is distributed in the hope that it will be useful,
4467- * but WITHOUT ANY WARRANTY; without even the implied warranty of
4468- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4469- * GNU General Public License for more details.
4470- *
4471- * You should have received a copy of the GNU General Public License
4472- * along with this program. If not, see <http://www.gnu.org/licenses/>.
4473- *
4474- * Author: ammonkey <am.monkeyd@gmail.com>
4475- */
4476+/***
4477+ Copyright (C) 2011 Elementary Developers
4478+
4479+ This program is free software: you can redistribute it and/or modify
4480+ it under the terms of the GNU General Public License as published by
4481+ the Free Software Foundation, either version 3 of the License, or
4482+ (at your option) any later version.
4483+
4484+ This program is distributed in the hope that it will be useful,
4485+ but WITHOUT ANY WARRANTY; without even the implied warranty of
4486+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4487+ GNU General Public License for more details.
4488+
4489+ You should have received a copy of the GNU General Public License
4490+ along with this program. If not, see <http://www.gnu.org/licenses/>.
4491+
4492+ Author: ammonkey <am.monkeyd@gmail.com>
4493+***/
4494
4495 namespace Granite.Widgets {
4496
4497@@ -36,7 +36,6 @@
4498 get_allocation (out vba);
4499
4500 if (pix != null) {
4501- //cairo_set_source_pixbuf (cr, pix, 0, 0);
4502 if (orientation == Gtk.Orientation.HORIZONTAL)
4503 Gdk.cairo_set_source_pixbuf (cr, pix, vba.width/2 - wpix/2, 0);
4504 else
4505@@ -51,7 +50,7 @@
4506 pix = _pix;
4507 wpix = pix.get_width ();
4508 hpix = pix.get_height ();
4509- //message ("evbox set_from_pix %d %d", wpix, hpix);
4510+
4511 if (orientation == Gtk.Orientation.HORIZONTAL)
4512 set_size_request (-1, hpix);
4513 else
4514
4515=== modified file 'src/View/Chrome/TopMenu.vala'
4516--- src/View/Chrome/TopMenu.vala 2014-10-29 11:20:08 +0000
4517+++ src/View/Chrome/TopMenu.vala 2015-05-09 10:55:27 +0000
4518@@ -1,24 +1,25 @@
4519-//
4520-// TopMenu.cs
4521-//
4522-// Authors:
4523-// mathijshenquet <mathijs.henquet@gmail.com>
4524-// ammonkey <am.monkeyd@gmail.com>
4525-//
4526-// Copyright (c) 2010 mathijshenquet
4527-//
4528-// This program is free software: you can redistribute it and/or modify
4529-// it under the terms of the GNU General Public License as published by
4530-// the Free Software Foundation, either version 3 of the License, or
4531-// (at your option) any later version.
4532-//
4533-// This program is distributed in the hope that it will be useful,
4534-// but WITHOUT ANY WARRANTY; without even the implied warranty of
4535-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4536-// GNU General Public License for more details.
4537-//
4538-// You should have received a copy of the GNU General Public License
4539-// along with this program. If not, see <http://www.gnu.org/licenses/>.
4540+/***
4541+ TopMenu.cs
4542+
4543+ Authors:
4544+ mathijshenquet <mathijs.henquet@gmail.com>
4545+ ammonkey <am.monkeyd@gmail.com>
4546+
4547+ Copyright (c) 2010 mathijshenquet
4548+
4549+ This program is free software: you can redistribute it and/or modify
4550+ it under the terms of the GNU General Public License as published by
4551+ the Free Software Foundation, either version 3 of the License, or
4552+ (at your option) any later version.
4553+
4554+ This program is distributed in the hope that it will be useful,
4555+ but WITHOUT ANY WARRANTY; without even the implied warranty of
4556+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4557+ GNU General Public License for more details.
4558+
4559+ You should have received a copy of the GNU General Public License
4560+ along with this program. If not, see <http://www.gnu.org/licenses/>.
4561+***/
4562
4563 namespace Marlin.View.Chrome
4564 {
4565@@ -74,7 +75,7 @@
4566 win.add_tab (file, Marlin.ViewMode.CURRENT);
4567 });
4568
4569-
4570+
4571 location_bar.show_all ();
4572 view_switcher.margin_right = 20;
4573 pack_start (location_bar);
4574@@ -87,10 +88,11 @@
4575 var back_menu = new Gtk.Menu ();
4576 var n = 1;
4577 foreach (string path in path_list) {
4578- int cn = n++; // No i'm not mad, thats just how closures work in vala (and other langs).
4579- // You see if I would just use back(n) the reference to n would be passed
4580- // in the clusure, restulting in a value of n which would always be n=1. So
4581- // by introducting a new variable I can bypass this anoyance.
4582+ int cn = n++; /* No i'm not mad, thats just how closures work in vala (and other langs).
4583+ * You see if I would just use back(n) the reference to n would be passed
4584+ * in the clusure, restulting in a value of n which would always be n=1. So
4585+ * by introducting a new variable I can bypass this anoyance.
4586+ */
4587 var item = new Gtk.MenuItem.with_label (GLib.Uri.unescape_string (path));
4588 item.activate.connect (() => {
4589 back(cn);
4590@@ -107,7 +109,7 @@
4591 var forward_menu = new Gtk.Menu ();
4592 var n = 1;
4593 foreach (string path in path_list) {
4594- int cn = n++; // For explanation look up
4595+ int cn = n++; /* For explanation look up */
4596 var item = new Gtk.MenuItem.with_label (GLib.Uri.unescape_string (path));
4597 item.activate.connect (() => {
4598 forward (cn);
4599
4600=== modified file 'src/View/Chrome/ViewSwicher.vala'
4601--- src/View/Chrome/ViewSwicher.vala 2014-08-13 10:40:54 +0000
4602+++ src/View/Chrome/ViewSwicher.vala 2015-05-09 10:55:27 +0000
4603@@ -1,24 +1,25 @@
4604-//
4605-// ViewSwicher.cs
4606-//
4607-// Authors:
4608-// mathijshenquet <mathijs.henquet@gmail.com>
4609-// ammonkey <am.monkeyd@gmail.com>
4610-//
4611-// Copyright (c) 2010 mathijshenquet
4612-//
4613-// This program is free software: you can redistribute it and/or modify
4614-// it under the terms of the GNU General Public License as published by
4615-// the Free Software Foundation, either version 3 of the License, or
4616-// (at your option) any later version.
4617-//
4618-// This program is distributed in the hope that it will be useful,
4619-// but WITHOUT ANY WARRANTY; without even the implied warranty of
4620-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4621-// GNU General Public License for more details.
4622-//
4623-// You should have received a copy of the GNU General Public License
4624-// along with this program. If not, see <http://www.gnu.org/licenses/>.
4625+/***
4626+ ViewSwicher.cs
4627+
4628+ Authors:
4629+ mathijshenquet <mathijs.henquet@gmail.com>
4630+ ammonkey <am.monkeyd@gmail.com>
4631+
4632+ Copyright (c) 2010 mathijshenquet
4633+
4634+ This program is free software: you can redistribute it and/or modify
4635+ it under the terms of the GNU General Public License as published by
4636+ the Free Software Foundation, either version 3 of the License, or
4637+ (at your option) any later version.
4638+
4639+ This program is distributed in the hope that it will be useful,
4640+ but WITHOUT ANY WARRANTY; without even the implied warranty of
4641+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4642+ GNU General Public License for more details.
4643+
4644+ You should have received a copy of the GNU General Public License
4645+ along with this program. If not, see <http://www.gnu.org/licenses/>.
4646+***/
4647
4648 namespace Marlin.View.Chrome {
4649
4650@@ -48,7 +49,6 @@
4651 }
4652
4653 Preferences.settings.set_enum ("default-viewmode", value);
4654- //switcher.focus(target);
4655 freeze_update = true;
4656 switcher.set_active (active_index);
4657 freeze_update = false;
4658
4659=== modified file 'src/View/Chrome/XsEntry.vala'
4660--- src/View/Chrome/XsEntry.vala 2013-07-21 04:44:33 +0000
4661+++ src/View/Chrome/XsEntry.vala 2015-05-09 10:55:27 +0000
4662@@ -1,21 +1,20 @@
4663-/*
4664- * Copyright (C) 2011 Elementary Developers
4665- *
4666- * This program is free software: you can redistribute it and/or modify
4667- * it under the terms of the GNU General Public License as published by
4668- * the Free Software Foundation, either version 3 of the License, or
4669- * (at your option) any later version.
4670- *
4671- * This program is distributed in the hope that it will be useful,
4672- * but WITHOUT ANY WARRANTY; without even the implied warranty of
4673- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4674- * GNU General Public License for more details.
4675- *
4676- * You should have received a copy of the GNU General Public License
4677- * along with this program. If not, see <http://www.gnu.org/licenses/>.
4678- *
4679- * Author: ammonkey <am.monkeyd@gmail.com>
4680- */
4681+/***
4682+ Copyright (C) 2011 Elementary Developers
4683+
4684+ This program is free software: you can redistribute it and/or modify
4685+ it under the terms of the GNU General Public License as published by
4686+ the Free Software Foundation, either version 3 of the License, or
4687+ (at your option) any later version.
4688+
4689+ This program is distributed in the hope that it will be useful,
4690+ but WITHOUT ANY WARRANTY; without even the implied warranty of
4691+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4692+ GNU General Public License for more details.
4693+
4694+ You should have received a copy of the GNU General Public License
4695+ along with this program. If not, see <http://www.gnu.org/licenses/>.
4696+
4697+***/
4698
4699 /* Just a workarround Gtk.Entry which got a minimum fixed prefered width.
4700 With XsEntry we can set the exact width we want */
4701
4702=== modified file 'src/View/ColumnView.vala'
4703--- src/View/ColumnView.vala 2015-01-01 10:33:58 +0000
4704+++ src/View/ColumnView.vala 2015-05-09 10:55:27 +0000
4705@@ -1,20 +1,20 @@
4706-/*
4707- Copyright (C) 2014 elementary Developers
4708-
4709- This program is free software: you can redistribute it and/or modify it
4710- under the terms of the GNU Lesser General Public License version 3, as published
4711- by the Free Software Foundation.
4712-
4713- This program is distributed in the hope that it will be useful, but
4714- WITHOUT ANY WARRANTY; without even the implied warranties of
4715- MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
4716- PURPOSE. See the GNU General Public License for more details.
4717-
4718- You should have received a copy of the GNU General Public License along
4719- with this program. If not, see <http://www.gnu.org/licenses/>.
4720-
4721- Authors : Jeremy Wootten <jeremy@elementary.org>
4722-*/
4723+/***
4724+ Copyright (C) 2015 elementary Developers
4725+
4726+ This program is free software: you can redistribute it and/or modify it
4727+ under the terms of the GNU Lesser General Public License version 3, as published
4728+ by the Free Software Foundation.
4729+
4730+ This program is distributed in the hope that it will be useful, but
4731+ WITHOUT ANY WARRANTY; without even the implied warranties of
4732+ MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
4733+ PURPOSE. See the GNU General Public License for more details.
4734+
4735+ You should have received a copy of the GNU General Public License along
4736+ with this program. If not, see <http://www.gnu.org/licenses/>.
4737+
4738+ Authors : Jeremy Wootten <jeremy@elementaryos.org>
4739+***/
4740
4741
4742 namespace FM {
4743
4744=== modified file 'src/View/DirectoryNotFound.vala'
4745--- src/View/DirectoryNotFound.vala 2014-08-17 12:29:52 +0000
4746+++ src/View/DirectoryNotFound.vala 2015-05-09 10:55:27 +0000
4747@@ -1,22 +1,22 @@
4748-/*
4749- * Copyright (c) 2011 Lucas Baudin <xapantu@gmail.com>
4750- *
4751- * Marlin is free software; you can redistribute it and/or
4752- * modify it under the terms of the GNU General Public License as
4753- * published by the Free Software Foundation; either version 2 of the
4754- * License, or (at your option) any later version.
4755- *
4756- * Marlin is distributed in the hope that it will be useful,
4757- * but WITHOUT ANY WARRANTY; without even the implied warranty of
4758- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
4759- * General Public License for more details.
4760- *
4761- * You should have received a copy of the GNU General Public
4762- * License along with this program; see the file COPYING. If not,
4763- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
4764- * Boston, MA 02111-1307, USA.
4765- *
4766- */
4767+/***
4768+ Copyright (c) 2011 Lucas Baudin <xapantu@gmail.com>
4769+
4770+ Marlin is free software; you can redistribute it and/or
4771+ modify it under the terms of the GNU General Public License as
4772+ published by the Free Software Foundation; either version 2 of the
4773+ License, or (at your option) any later version.
4774+
4775+ Marlin is distributed in the hope that it will be useful,
4776+ but WITHOUT ANY WARRANTY; without even the implied warranty of
4777+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
4778+ General Public License for more details.
4779+
4780+ You should have received a copy of the GNU General Public
4781+ License along with this program; see the file COPYING. If not,
4782+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
4783+ Boston, MA 02111-1307, USA.
4784+
4785+***/
4786
4787 namespace Marlin.View
4788 {
4789
4790=== modified file 'src/View/DiskRenderer.vala'
4791--- src/View/DiskRenderer.vala 2014-12-23 19:22:59 +0000
4792+++ src/View/DiskRenderer.vala 2015-05-09 10:55:27 +0000
4793@@ -1,22 +1,22 @@
4794-/*
4795- * Copyright (c) 2011 Lucas Baudin <xapantu@gmail.com>
4796- *
4797- * Marlin is free software; you can redistribute it and/or
4798- * modify it under the terms of the GNU General Public License as
4799- * published by the Free Software Foundation; either version 2 of the
4800- * License, or (at your option) any later version.
4801- *
4802- * Marlin is distributed in the hope that it will be useful,
4803- * but WITHOUT ANY WARRANTY; without even the implied warranty of
4804- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
4805- * General Public License for more details.
4806- *
4807- * You should have received a copy of the GNU General Public
4808- * License along with this program; see the file COPYING. If not,
4809- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
4810- * Boston, MA 02111-1307, USA.
4811- *
4812- */
4813+/***
4814+ Copyright (c) 2011 Lucas Baudin <xapantu@gmail.com>
4815+
4816+ Marlin is free software; you can redistribute it and/or
4817+ modify it under the terms of the GNU General Public License as
4818+ published by the Free Software Foundation; either version 2 of the
4819+ License, or (at your option) any later version.
4820+
4821+ Marlin is distributed in the hope that it will be useful,
4822+ but WITHOUT ANY WARRANTY; without even the implied warranty of
4823+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
4824+ General Public License for more details.
4825+
4826+ You should have received a copy of the GNU General Public
4827+ License along with this program; see the file COPYING. If not,
4828+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
4829+ Boston, MA 02111-1307, USA.
4830+
4831+***/
4832
4833 public class Marlin.CellRendererDisk : Gtk.CellRendererText {
4834
4835@@ -52,7 +52,7 @@
4836 Gdk.Rectangle background_area, Gdk.Rectangle area,
4837 Gtk.CellRendererState flags) {
4838 base.render (cr, widget, background_area, area, flags);
4839- area.x+= offset;
4840+ area.x+= offset;
4841 area.width-= offset;
4842 if (free_space > 0) {
4843 Gtk.StateFlags state;
4844
4845=== modified file 'src/View/IconSpinnerRenderer.vala'
4846--- src/View/IconSpinnerRenderer.vala 2014-07-12 23:39:32 +0000
4847+++ src/View/IconSpinnerRenderer.vala 2015-05-09 10:55:27 +0000
4848@@ -1,26 +1,26 @@
4849-/*
4850- * Copyright (c) 2014 elementary Developers and Jeremy Wootten
4851- *
4852- * Marlin is free software; you can redistribute it and/or
4853- * modify it under the terms of the GNU General Public License as
4854- * published by the Free Software Foundation; either version 2 of the
4855- * License, or (at your option) any later version.
4856- *
4857- * Marlin is distributed in the hope that it will be useful,
4858- * but WITHOUT ANY WARRANTY; without even the implied warranty of
4859- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
4860- * General Public License for more details.
4861- *
4862- * You should have received a copy of the GNU General Public
4863- * License along with this program; see the file COPYING. If not,
4864- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
4865- * Boston, MA 02111-1307, USA.
4866- *
4867- * Authors : Jeremy Wootten <jeremywootten@gmail.com>
4868- *
4869- * Based on gtkcellrendererspinner.c and gtkcellrendererpixbuf.c from
4870- * GTK - the GIMP Toolkit.
4871- */
4872+/***
4873+ Copyright (c) 2015 elementary Developers
4874+
4875+ Marlin is free software; you can redistribute it and/or
4876+ modify it under the terms of the GNU General Public License as
4877+ published by the Free Software Foundation; either version 2 of the
4878+ License, or (at your option) any later version.
4879+
4880+ Marlin is distributed in the hope that it will be useful,
4881+ but WITHOUT ANY WARRANTY; without even the implied warranty of
4882+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
4883+ General Public License for more details.
4884+
4885+ You should have received a copy of the GNU General Public
4886+ License along with this program; see the file COPYING. If not,
4887+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
4888+ Boston, MA 02111-1307, USA.
4889+
4890+ Authors : Jeremy Wootten <jeremy@elementaryos.org>
4891+
4892+ Based on gtkcellrendererspinner.c and gtkcellrendererpixbuf.c from
4893+ GTK - the GIMP Toolkit.
4894+***/
4895
4896 public class Marlin.IconSpinnerRenderer : Gtk.CellRenderer {
4897
4898
4899=== modified file 'src/View/IconView.vala'
4900--- src/View/IconView.vala 2015-04-18 10:47:13 +0000
4901+++ src/View/IconView.vala 2015-05-09 10:55:27 +0000
4902@@ -1,20 +1,20 @@
4903-/*
4904- Copyright (C) 2014 elementary Developers
4905-
4906- This program is free software: you can redistribute it and/or modify it
4907- under the terms of the GNU Lesser General Public License version 3, as published
4908- by the Free Software Foundation.
4909-
4910- This program is distributed in the hope that it will be useful, but
4911- WITHOUT ANY WARRANTY; without even the implied warranties of
4912- MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
4913- PURPOSE. See the GNU General Public License for more details.
4914-
4915- You should have received a copy of the GNU General Public License along
4916- with this program. If not, see <http://www.gnu.org/licenses/>.
4917-
4918- Authors : Jeremy Wootten <jeremy@elementary.org>
4919-*/
4920+/***
4921+ Copyright (C) 2015 elementary Developers
4922+
4923+ This program is free software: you can redistribute it and/or modify it
4924+ under the terms of the GNU Lesser General Public License version 3, as published
4925+ by the Free Software Foundation.
4926+
4927+ This program is distributed in the hope that it will be useful, but
4928+ WITHOUT ANY WARRANTY; without even the implied warranties of
4929+ MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
4930+ PURPOSE. See the GNU General Public License for more details.
4931+
4932+ You should have received a copy of the GNU General Public License along
4933+ with this program. If not, see <http://www.gnu.org/licenses/>.
4934+
4935+ Authors : Jeremy Wootten <jeremy@elementaryos.org>
4936+***/
4937
4938 namespace FM {
4939 public class IconView : AbstractDirectoryView {
4940
4941=== modified file 'src/View/ListView.vala'
4942--- src/View/ListView.vala 2015-03-26 02:19:38 +0000
4943+++ src/View/ListView.vala 2015-05-09 10:55:27 +0000
4944@@ -1,20 +1,20 @@
4945-/*
4946- Copyright (C) 2014 elementary Developers
4947-
4948- This program is free software: you can redistribute it and/or modify it
4949- under the terms of the GNU Lesser General Public License version 3, as published
4950- by the Free Software Foundation.
4951-
4952- This program is distributed in the hope that it will be useful, but
4953- WITHOUT ANY WARRANTY; without even the implied warranties of
4954- MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
4955- PURPOSE. See the GNU General Public License for more details.
4956-
4957- You should have received a copy of the GNU General Public License along
4958- with this program. If not, see <http://www.gnu.org/licenses/>.
4959-
4960- Authors : Jeremy Wootten <jeremy@elementary.org>
4961-*/
4962+/***
4963+ Copyright (C) 2015 elementary Developers
4964+
4965+ This program is free software: you can redistribute it and/or modify it
4966+ under the terms of the GNU Lesser General Public License version 3, as published
4967+ by the Free Software Foundation.
4968+
4969+ This program is distributed in the hope that it will be useful, but
4970+ WITHOUT ANY WARRANTY; without even the implied warranties of
4971+ MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
4972+ PURPOSE. See the GNU General Public License for more details.
4973+
4974+ You should have received a copy of the GNU General Public License along
4975+ with this program. If not, see <http://www.gnu.org/licenses/>.
4976+
4977+ Authors : Jeremy Wootten <jeremy@elementaryos.org>
4978+***/
4979
4980 namespace FM {
4981 public class ListView : AbstractTreeView {
4982@@ -53,7 +53,7 @@
4983 var renderer = new Gtk.CellRendererText ();
4984 var col = new Gtk.TreeViewColumn.with_attributes (column_titles [k - fnc],
4985 renderer,
4986- "text", k);
4987+ "text", k);
4988 col.set_sort_column_id (k);
4989 col.set_resizable (false);
4990 col.set_expand (false);
4991@@ -207,10 +207,10 @@
4992 protected override bool get_next_visible_iter (ref Gtk.TreeIter iter, bool recurse = true) {
4993 Gtk.TreePath? path = model.get_path (iter);
4994 Gtk.TreeIter start = iter;
4995-
4996+
4997 if (path == null)
4998 return false;
4999-
5000+
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes: