[Xfce4-commits] [xfce/thunar] 01/01: Strip trailing whitespace
noreply at xfce.org
noreply at xfce.org
Sun Nov 5 02:37:10 CET 2017
This is an automated email from the git hooks/post-receive script.
a n d r e p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository xfce/thunar.
commit 3de231d2dec33ca48b73391386d442231baace3e
Author: Andre Miranda <andreldm at xfce.org>
Date: Sat Nov 4 22:36:28 2017 -0300
Strip trailing whitespace
---
AUTHORS | 2 +-
COPYING.LIB | 2 +-
autogen.sh | 10 +-
configure.ac.in | 12 +--
docs/reference/thunarx/thunarx-docs.xml | 2 +-
examples/tex-open-terminal/tex-open-terminal.c | 2 +-
plugins/thunar-apr/thunar-apr-image-page.c | 4 +-
plugins/thunar-sbr/README | 2 +-
plugins/thunar-sbr/thunar-sbr-case-renamer.h | 2 +-
plugins/thunar-sbr/thunar-sbr-date-renamer.c | 2 +-
plugins/thunar-sbr/thunar-sbr-number-renamer.c | 2 +-
plugins/thunar-sbr/thunar-sbr-remove-renamer.c | 6 +-
plugins/thunar-sbr/thunar-sbr-remove-renamer.h | 4 +-
plugins/thunar-sbr/thunar-sbr-replace-renamer.c | 2 +-
plugins/thunar-sendto-email/main.c | 8 +-
plugins/thunar-tpa/thunar-tpa-bindings.xml | 6 +-
plugins/thunar-uca/thunar-uca-editor.h | 2 +-
plugins/thunar-uca/thunar-uca-model.c | 4 +-
thunar/thunar-application.c | 96 ++++++++---------
thunar/thunar-application.h | 10 +-
thunar/thunar-chooser-button.c | 34 +++----
thunar/thunar-chooser-dialog.c | 6 +-
thunar/thunar-chooser-model.c | 24 ++---
thunar/thunar-clipboard-manager.c | 12 +--
thunar/thunar-column-model.c | 4 +-
thunar/thunar-create-dialog.c | 12 +--
thunar/thunar-dbus-service-infos.xml | 8 +-
thunar/thunar-dbus-service.c | 20 ++--
thunar/thunar-deep-count-job.h | 18 ++--
thunar/thunar-device.c | 2 +-
thunar/thunar-dialogs.c | 11 +-
thunar/thunar-dnd.c | 10 +-
thunar/thunar-enum-types.c | 8 +-
thunar/thunar-exec.c | 10 +-
thunar/thunar-exec.h | 10 +-
thunar/thunar-file-monitor.c | 2 +-
thunar/thunar-file.c | 130 ++++++++++++------------
thunar/thunar-file.h | 8 +-
thunar/thunar-gdk-extensions.c | 2 +-
thunar/thunar-icon-factory.c | 18 ++--
thunar/thunar-image.c | 18 ++--
thunar/thunar-image.h | 10 +-
thunar/thunar-io-jobs-util.c | 2 +-
thunar/thunar-io-jobs.c | 90 ++++++++--------
thunar/thunar-io-scan-directory.c | 14 +--
thunar/thunar-job.c | 44 ++++----
thunar/thunar-location-button.c | 4 +-
thunar/thunar-location-buttons.c | 6 +-
thunar/thunar-location-entry.c | 22 ++--
thunar/thunar-misc-jobs.c | 2 +-
thunar/thunar-navigator.c | 2 +-
thunar/thunar-path-entry.c | 26 ++---
thunar/thunar-path-entry.h | 10 +-
thunar/thunar-progress-dialog.c | 30 +++---
thunar/thunar-progress-dialog.h | 10 +-
thunar/thunar-progress-view.c | 2 +-
thunar/thunar-properties-dialog.h | 4 +-
thunar/thunar-renamer-dialog.c | 8 +-
thunar/thunar-renamer-model.c | 6 +-
thunar/thunar-renamer-pair.c | 2 +-
thunar/thunar-sendto-model.c | 6 +-
thunar/thunar-shortcuts-icon-renderer.c | 2 +-
thunar/thunar-simple-job.c | 2 +-
thunar/thunar-simple-job.h | 2 +-
thunar/thunar-size-label.c | 4 +-
thunar/thunar-standard-view-ui.xml | 2 +-
thunar/thunar-statusbar.c | 10 +-
thunar/thunar-templates-action.c | 36 +++----
thunar/thunar-thumbnail-cache.h | 10 +-
thunar/thunar-thumbnailer.h | 10 +-
thunar/thunar-transfer-job.h | 18 ++--
thunar/thunar-trash-action.c | 4 +-
thunar/thunar-tree-view.c | 8 +-
thunar/thunar-util.c | 26 ++---
thunar/thunar-util.h | 10 +-
thunarx/thunarx-file-info.c | 12 +--
thunarx/thunarx-file-info.h | 2 +-
thunarx/thunarx-menu-provider.c | 2 +-
thunarx/thunarx-provider-plugin.c | 8 +-
thunarx/thunarx-renamer.c | 4 +-
80 files changed, 509 insertions(+), 510 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index 1b064ce..fa41d7c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -4,7 +4,7 @@ Jeffs Franks <jcfranks at xfce.org>
Nick Schermer <nick at xfce.org>
Harald Judt <hjudt at xfce.org>
-The stock_folder-copy and stock_folder-move icons where taken from
+The stock_folder-copy and stock_folder-move icons where taken from
gnome-icon-theme 2.18.0 whose authors are Lapo Calamandrei <calamandrei at gmail.com>,
Rodney Dawes <dobey at novell.com>, Luca Ferretti <elle.uca at libero.it>,
Tuomas Kuosmanen <tigert at gimp.org>, Andreas Nilsson <nisses.mail at home.se>
diff --git a/COPYING.LIB b/COPYING.LIB
index 191a97f..da1428f 100644
--- a/COPYING.LIB
+++ b/COPYING.LIB
@@ -133,7 +133,7 @@ such a program is covered only if its contents constitute a work based
on the Library (independent of the use of the Library in a tool for
writing it). Whether that is true depends on what the Library does
and what the program that uses the Library does.
-
+
1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an
diff --git a/autogen.sh b/autogen.sh
index 1d5a9a7..e5e6f6b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,18 +4,18 @@
#-
# Copyright (c) 2009 Jannis Pohlmann <jannis at xfce.org>
#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
+# published by the Free Software Foundation; either version 2 of
# the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
-# You should have received a copy of the GNU General Public
-# License along with this program; if not, write to the Free
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
diff --git a/configure.ac.in b/configure.ac.in
index 77ecc7a..f74fa81 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -4,18 +4,18 @@
# Copyright (c) 2009-2011 Jannis Pohlmann <jannis at xfce.org>
# Copyright (c) 2004-2015 Xfce Development Team <xfce4-dev at xfce.org>
#
-# This program is free software; you can redistribute it and/or
+# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
+# published by the Free Software Foundation; either version 2 of
# the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
-# You should have received a copy of the GNU General Public
-# License along with this program; if not, write to the Free
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
@@ -170,7 +170,7 @@ XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX], [gio-unix-2.0],
dnl ***************************************************************
dnl *** Optional support for GUDev (required for thunar-volman) ***
dnl ***************************************************************
-XDT_CHECK_OPTIONAL_PACKAGE([GUDEV], [gudev-1.0], [145], [gudev],
+XDT_CHECK_OPTIONAL_PACKAGE([GUDEV], [gudev-1.0], [145], [gudev],
[GUDev (required for thunar-volman)])
dnl **************************************
diff --git a/docs/reference/thunarx/thunarx-docs.xml b/docs/reference/thunarx/thunarx-docs.xml
index 61e0b75..6633795 100644
--- a/docs/reference/thunarx/thunarx-docs.xml
+++ b/docs/reference/thunarx/thunarx-docs.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
<!ENTITY ThunarxFileInfo SYSTEM "xml/thunarx-file-info.xml">
diff --git a/examples/tex-open-terminal/tex-open-terminal.c b/examples/tex-open-terminal/tex-open-terminal.c
index 4c86f8e..bb6f1e4 100644
--- a/examples/tex-open-terminal/tex-open-terminal.c
+++ b/examples/tex-open-terminal/tex-open-terminal.c
@@ -151,7 +151,7 @@ tex_open_terminal_activated (ThunarxMenuItem *item,
path = g_object_get_data (G_OBJECT (item), "open-terminal-here-path");
if (G_UNLIKELY (path == NULL))
return;
-
+
/* build up the command line for the terminal */
command = g_strdup_printf ("exo-open --launch TerminalEmulator --working-directory \"%s\"", path);
diff --git a/plugins/thunar-apr/thunar-apr-image-page.c b/plugins/thunar-apr/thunar-apr-image-page.c
index 48b92c5..5a84619 100644
--- a/plugins/thunar-apr/thunar-apr-image-page.c
+++ b/plugins/thunar-apr/thunar-apr-image-page.c
@@ -62,7 +62,7 @@ static const struct
#endif
-
+
struct _ThunarAprImagePageClass
{
ThunarAprAbstractPageClass __parent__;
@@ -97,7 +97,7 @@ thunar_apr_image_page_class_init (ThunarAprImagePageClass *klass)
}
-
+
static void
thunar_apr_image_page_init (ThunarAprImagePage *image_page)
{
diff --git a/plugins/thunar-sbr/README b/plugins/thunar-sbr/README
index 51f6e81..d2a1188 100644
--- a/plugins/thunar-sbr/README
+++ b/plugins/thunar-sbr/README
@@ -2,7 +2,7 @@ Thunar Simple Builtin Renamers (thunar-sbr)
===========================================
Thunar-sbr is an extension to Thunar, which includes a bunch of simple renamers
-for the bulk rename dialog:
+for the bulk rename dialog:
* Insert / Overwrite
* Insert Date / Time
diff --git a/plugins/thunar-sbr/thunar-sbr-case-renamer.h b/plugins/thunar-sbr/thunar-sbr-case-renamer.h
index 0da9735..d26413c 100644
--- a/plugins/thunar-sbr/thunar-sbr-case-renamer.h
+++ b/plugins/thunar-sbr/thunar-sbr-case-renamer.h
@@ -40,7 +40,7 @@ void thunar_sbr_case_renamer_register_type (ThunarxProvider
ThunarSbrCaseRenamer *thunar_sbr_case_renamer_new (void) G_GNUC_MALLOC;
-ThunarSbrCaseRenamerMode thunar_sbr_case_renamer_get_mode (ThunarSbrCaseRenamer *case_renamer);
+ThunarSbrCaseRenamerMode thunar_sbr_case_renamer_get_mode (ThunarSbrCaseRenamer *case_renamer);
void thunar_sbr_case_renamer_set_mode (ThunarSbrCaseRenamer *case_renamer,
ThunarSbrCaseRenamerMode mode);
diff --git a/plugins/thunar-sbr/thunar-sbr-date-renamer.c b/plugins/thunar-sbr/thunar-sbr-date-renamer.c
index 64b92d5..218d215 100644
--- a/plugins/thunar-sbr/thunar-sbr-date-renamer.c
+++ b/plugins/thunar-sbr/thunar-sbr-date-renamer.c
@@ -457,7 +457,7 @@ thunar_sbr_get_time (ThunarxFileInfo *file,
/* get the time from the info */
if (mode == THUNAR_SBR_DATE_MODE_ATIME)
{
- file_time = g_file_info_get_attribute_uint64 (file_info,
+ file_time = g_file_info_get_attribute_uint64 (file_info,
G_FILE_ATTRIBUTE_TIME_ACCESS);
}
else
diff --git a/plugins/thunar-sbr/thunar-sbr-number-renamer.c b/plugins/thunar-sbr/thunar-sbr-number-renamer.c
index 6b968b2..4b81664 100644
--- a/plugins/thunar-sbr/thunar-sbr-number-renamer.c
+++ b/plugins/thunar-sbr/thunar-sbr-number-renamer.c
@@ -493,7 +493,7 @@ thunar_sbr_number_renamer_update (ThunarSbrNumberRenamer *number_renamer)
/* check if the "start" value is valid */
if (G_UNLIKELY (invalid))
{
- /* if GTK+ wouldn't be that stupid with style properties and
+ /* if GTK+ wouldn't be that stupid with style properties and
* type plugins, this would be themable, but unfortunately
* GTK+ is totally broken, and so it's hardcoded.
*/
diff --git a/plugins/thunar-sbr/thunar-sbr-remove-renamer.c b/plugins/thunar-sbr/thunar-sbr-remove-renamer.c
index 24a27ae..373da48 100644
--- a/plugins/thunar-sbr/thunar-sbr-remove-renamer.c
+++ b/plugins/thunar-sbr/thunar-sbr-remove-renamer.c
@@ -383,7 +383,7 @@ thunar_sbr_remove_renamer_update (ThunarSbrRemoveRenamer *remove_renamer)
? remove_renamer->start_offset : (G_MAXUINT - remove_renamer->start_offset);
if (G_UNLIKELY (start_offset >= end_offset))
{
- /* if GTK+ wouldn't be that stupid with style properties and
+ /* if GTK+ wouldn't be that stupid with style properties and
* type plugins, this would be themable, but unfortunately
* GTK+ is totally broken, and so it's hardcoded.
*/
@@ -454,7 +454,7 @@ thunar_sbr_remove_renamer_get_end_offset (ThunarSbrRemoveRenamer *remove_renamer
* Sets the end offset of @remove_renamer to @end_offset.
**/
void
-thunar_sbr_remove_renamer_set_end_offset (ThunarSbrRemoveRenamer *remove_renamer,
+thunar_sbr_remove_renamer_set_end_offset (ThunarSbrRemoveRenamer *remove_renamer,
guint end_offset)
{
g_return_if_fail (THUNAR_SBR_IS_REMOVE_RENAMER (remove_renamer));
@@ -546,7 +546,7 @@ thunar_sbr_remove_renamer_get_start_offset (ThunarSbrRemoveRenamer *remove_renam
* Sets the start offset of @remove_renamer to @start_offset.
**/
void
-thunar_sbr_remove_renamer_set_start_offset (ThunarSbrRemoveRenamer *remove_renamer,
+thunar_sbr_remove_renamer_set_start_offset (ThunarSbrRemoveRenamer *remove_renamer,
guint start_offset)
{
g_return_if_fail (THUNAR_SBR_IS_REMOVE_RENAMER (remove_renamer));
diff --git a/plugins/thunar-sbr/thunar-sbr-remove-renamer.h b/plugins/thunar-sbr/thunar-sbr-remove-renamer.h
index b5e6e18..53d6294 100644
--- a/plugins/thunar-sbr/thunar-sbr-remove-renamer.h
+++ b/plugins/thunar-sbr/thunar-sbr-remove-renamer.h
@@ -41,7 +41,7 @@ void thunar_sbr_remove_renamer_register_type (Thunarx
ThunarSbrRemoveRenamer *thunar_sbr_remove_renamer_new (void) G_GNUC_MALLOC;
guint thunar_sbr_remove_renamer_get_end_offset (ThunarSbrRemoveRenamer *remove_renamer);
-void thunar_sbr_remove_renamer_set_end_offset (ThunarSbrRemoveRenamer *remove_renamer,
+void thunar_sbr_remove_renamer_set_end_offset (ThunarSbrRemoveRenamer *remove_renamer,
guint end_offset);
ThunarSbrOffsetMode thunar_sbr_remove_renamer_get_end_offset_mode (ThunarSbrRemoveRenamer *remove_renamer);
@@ -49,7 +49,7 @@ void thunar_sbr_remove_renamer_set_end_offset_mode (ThunarS
ThunarSbrOffsetMode end_offset_mode);
guint thunar_sbr_remove_renamer_get_start_offset (ThunarSbrRemoveRenamer *remove_renamer);
-void thunar_sbr_remove_renamer_set_start_offset (ThunarSbrRemoveRenamer *remove_renamer,
+void thunar_sbr_remove_renamer_set_start_offset (ThunarSbrRemoveRenamer *remove_renamer,
guint start_offset);
ThunarSbrOffsetMode thunar_sbr_remove_renamer_get_start_offset_mode (ThunarSbrRemoveRenamer *remove_renamer);
diff --git a/plugins/thunar-sbr/thunar-sbr-replace-renamer.c b/plugins/thunar-sbr/thunar-sbr-replace-renamer.c
index c9d725c..71d27a9 100644
--- a/plugins/thunar-sbr/thunar-sbr-replace-renamer.c
+++ b/plugins/thunar-sbr/thunar-sbr-replace-renamer.c
@@ -618,7 +618,7 @@ thunar_sbr_replace_renamer_pcre_update (ThunarSbrReplaceRenamer *replace_renamer
/* check if the entry is realized */
if (gtk_widget_get_realized (replace_renamer->pattern_entry))
{
- /* if GTK+ wouldn't be that stupid with style properties and
+ /* if GTK+ wouldn't be that stupid with style properties and
* type plugins, this would be themable, but unfortunately
* GTK+ is totally broken, and so it's hardcoded.
*/
diff --git a/plugins/thunar-sendto-email/main.c b/plugins/thunar-sendto-email/main.c
index ed0bdac..587cdd8 100644
--- a/plugins/thunar-sendto-email/main.c
+++ b/plugins/thunar-sendto-email/main.c
@@ -193,7 +193,7 @@ tse_ask_compress (GList *infos)
/* ask the user whether to compress the file */
tse_data = (TseData *) infos->data;
message = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE,
- _("Send \"%s\" as compressed archive?"),
+ _("Send \"%s\" as compressed archive?"),
g_file_info_get_display_name (tse_data->info));
gtk_dialog_add_button (GTK_DIALOG (message), _("_Cancel"), GTK_RESPONSE_CANCEL);
gtk_dialog_add_button (GTK_DIALOG (message), _("Send _directly"), TSE_RESPONSE_PLAIN);
@@ -429,7 +429,7 @@ tse_compress (GList *infos,
tse_data = (TseData *) infos->data;
parent = g_file_get_parent (tse_data->file);
- /* we assume the parent exists because we only allow non-root
+ /* we assume the parent exists because we only allow non-root
* files as TseData in main () */
g_assert (parent != NULL);
@@ -594,10 +594,10 @@ main (int argc, char **argv)
}
/* try to determine the info */
- info = g_file_query_info (file,
+ info = g_file_query_info (file,
G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME ","
G_FILE_ATTRIBUTE_STANDARD_SIZE ","
- G_FILE_ATTRIBUTE_STANDARD_TYPE,
+ G_FILE_ATTRIBUTE_STANDARD_TYPE,
G_FILE_QUERY_INFO_NONE, NULL, &error);
/* check if we failed */
diff --git a/plugins/thunar-tpa/thunar-tpa-bindings.xml b/plugins/thunar-tpa/thunar-tpa-bindings.xml
index edc65e1..5430fd8 100644
--- a/plugins/thunar-tpa/thunar-tpa-bindings.xml
+++ b/plugins/thunar-tpa/thunar-tpa-bindings.xml
@@ -2,17 +2,17 @@
<!--
Copyright (c) 2006 Benedikt Meurer <benny at xfce.org>
-
+
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your option)
any later version.
-
+
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
-
+
You should have received a copy of the GNU General Public License along with
this program; if not, write to the Free Software Foundation, Inc., 59 Temple
Place, Suite 330, Boston, MA 02111-1307 USA
diff --git a/plugins/thunar-uca/thunar-uca-editor.h b/plugins/thunar-uca/thunar-uca-editor.h
index c5ae792..f0aa58b 100644
--- a/plugins/thunar-uca/thunar-uca-editor.h
+++ b/plugins/thunar-uca/thunar-uca-editor.h
@@ -31,7 +31,7 @@ typedef struct _ThunarUcaEditor ThunarUcaEditor;
#define THUNAR_UCA_TYPE_EDITOR (thunar_uca_editor_get_type ())
#define THUNAR_UCA_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), THUNAR_UCA_TYPE_EDITOR, ThunarUcaEditor))
#define THUNAR_UCA_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), THUNAR_UCA_TYPE_EDITOR, ThunarUcaEditorwClass))
-#define THUNAR_UCA_IS_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THUNAR_UCA_TYPE_EDITOR))
+#define THUNAR_UCA_IS_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), THUNAR_UCA_TYPE_EDITOR))
#define THUNAR_UCA_IS_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), THUNAR_UCA_TYPE_EDITOR))
#define THUNAR_UCA_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), THUNAR_UCA_TYPE_EDITOR, ThunarUcaEditorwClass))
diff --git a/plugins/thunar-uca/thunar-uca-model.c b/plugins/thunar-uca/thunar-uca-model.c
index fc5cef9..15b0cf6 100644
--- a/plugins/thunar-uca/thunar-uca-model.c
+++ b/plugins/thunar-uca/thunar-uca-model.c
@@ -988,9 +988,9 @@ thunar_uca_model_get_unique_id (void)
* thunar_uca_model_get_default:
*
* Returns a reference to the default shared
- * #ThunarUcaModel instance. The caller is
+ * #ThunarUcaModel instance. The caller is
* responsible to free the returned instance
- * using g_object_unref() when no longer
+ * using g_object_unref() when no longer
* needed.
*
* Return value: a reference to the default
diff --git a/thunar/thunar-application.c b/thunar/thunar-application.c
index 94928e0..8de8e87 100644
--- a/thunar/thunar-application.c
+++ b/thunar/thunar-application.c
@@ -4,18 +4,18 @@
* Copyright (c) 2005 Jeff Franks <jcfranks at xfce.org>
* Copyright (c) 2009-2011 Jannis Pohlmann <jannis at xfce.org>
*
- * This program is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
+ * published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the Free
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the Free
* Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
@@ -229,9 +229,9 @@ thunar_application_class_init (ThunarApplicationClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
GApplicationClass *gapplication_class = G_APPLICATION_CLASS (klass);
-
+
/* pre-allocate the required quarks */
- thunar_application_screen_quark =
+ thunar_application_screen_quark =
g_quark_from_static_string ("thunar-application-screen");
thunar_application_startup_id_quark =
g_quark_from_static_string ("thunar-application-startup-id");
@@ -607,7 +607,7 @@ thunar_application_get_property (GObject *object,
GParamSpec *pspec)
{
ThunarApplication *application = THUNAR_APPLICATION (object);
-
+
switch (prop_id)
{
case PROP_DAEMON:
@@ -629,7 +629,7 @@ thunar_application_set_property (GObject *object,
GParamSpec *pspec)
{
ThunarApplication *application = THUNAR_APPLICATION (object);
-
+
switch (prop_id)
{
case PROP_DAEMON:
@@ -836,7 +836,7 @@ thunar_application_launch (ThunarApplication *application,
if (thunar_progress_dialog_has_jobs (THUNAR_PROGRESS_DIALOG (dialog)))
{
/* add the job to the dialog */
- thunar_progress_dialog_add_job (THUNAR_PROGRESS_DIALOG (dialog),
+ thunar_progress_dialog_add_job (THUNAR_PROGRESS_DIALOG (dialog),
job, icon_name, title);
/* show the dialog immediately */
@@ -845,7 +845,7 @@ thunar_application_launch (ThunarApplication *application,
else
{
/* add the job to the dialog */
- thunar_progress_dialog_add_job (THUNAR_PROGRESS_DIALOG (dialog),
+ thunar_progress_dialog_add_job (THUNAR_PROGRESS_DIALOG (dialog),
job, icon_name, title);
/* Set up a timer to show the dialog, to make sure we don't
@@ -853,7 +853,7 @@ thunar_application_launch (ThunarApplication *application,
*/
if (G_LIKELY (application->show_dialogs_timer_id == 0))
{
- application->show_dialogs_timer_id =
+ application->show_dialogs_timer_id =
gdk_threads_add_timeout_full (G_PRIORITY_DEFAULT, 750, thunar_application_show_dialogs,
application, thunar_application_show_dialogs_destroy);
}
@@ -891,23 +891,23 @@ thunar_application_uevent (GUdevClient *client,
has_media = g_udev_device_get_property_as_boolean (device, "ID_CDROM_MEDIA");
/* distinguish between "add", "change" and "remove" actions, ignore "move" */
- if (g_strcmp0 (action, "add") == 0
+ if (g_strcmp0 (action, "add") == 0
|| (is_cdrom && has_media && g_strcmp0 (action, "change") == 0))
{
/* only insert the path if we don't have it already */
- if (g_slist_find_custom (application->volman_udis, sysfs_path,
+ if (g_slist_find_custom (application->volman_udis, sysfs_path,
(GCompareFunc) g_utf8_collate) == NULL)
{
- application->volman_udis = g_slist_prepend (application->volman_udis,
+ application->volman_udis = g_slist_prepend (application->volman_udis,
g_strdup (sysfs_path));
/* check if there's currently no active or scheduled handler */
- if (G_LIKELY (application->volman_idle_id == 0
+ if (G_LIKELY (application->volman_idle_id == 0
&& application->volman_watch_id == 0))
{
/* schedule a new handler using the idle source, which invokes the handler */
- application->volman_idle_id =
- g_idle_add_full (G_PRIORITY_LOW, thunar_application_volman_idle,
+ application->volman_idle_id =
+ g_idle_add_full (G_PRIORITY_LOW, thunar_application_volman_idle,
application, thunar_application_volman_idle_destroy);
}
}
@@ -915,7 +915,7 @@ thunar_application_uevent (GUdevClient *client,
else if (g_strcmp0 (action, "remove") == 0)
{
/* look for the sysfs path in the list of pending paths */
- lp = g_slist_find_custom (application->volman_udis, sysfs_path,
+ lp = g_slist_find_custom (application->volman_udis, sysfs_path,
(GCompareFunc) g_utf8_collate);
if (G_LIKELY (lp != NULL))
@@ -1199,7 +1199,7 @@ thunar_application_has_windows (ThunarApplication *application)
* Lets @application take over control of the specified @window.
* @application will not exit until the last controlled #GtkWindow
* is closed by the user.
- *
+ *
* If the @window has no transient window, it will also create a
* new #GtkWindowGroup for this window. This will make different
* windows work independant (think gtk_dialog_run).
@@ -1397,7 +1397,7 @@ thunar_application_get_progress_dialog (ThunarApplication *application)
g_object_add_weak_pointer (G_OBJECT (application->progress_dialog),
(gpointer) &application->progress_dialog);
- thunar_application_take_window (application,
+ thunar_application_take_window (application,
GTK_WINDOW (application->progress_dialog));
}
@@ -1412,7 +1412,7 @@ thunar_application_process_files_finish (ThunarBrowser *browser,
ThunarFile *target_file,
GError *error,
gpointer unused)
-{
+{
ThunarApplication *application = THUNAR_APPLICATION (browser);
GdkScreen *screen;
const gchar *startup_id;
@@ -1435,7 +1435,7 @@ thunar_application_process_files_finish (ThunarBrowser *browser,
if (error->domain != G_IO_ERROR || error->code != G_IO_ERROR_CANCELLED)
{
/* tell the user that we were unable to launch the file specified */
- thunar_dialogs_show_error (screen, error, _("Failed to open \"%s\""),
+ thunar_dialogs_show_error (screen, error, _("Failed to open \"%s\""),
thunar_file_get_display_name (file));
}
@@ -1480,7 +1480,7 @@ thunar_application_process_files (ThunarApplication *application)
GdkScreen *screen;
_thunar_return_if_fail (THUNAR_IS_APPLICATION (application));
-
+
/* don't do anything if no files are to be processed */
if (application->files_to_launch == NULL)
return;
@@ -1494,7 +1494,7 @@ thunar_application_process_files (ThunarApplication *application)
/* make sure to hold a reference to the application while file processing is going on */
g_application_hold (G_APPLICATION (application));
- /* resolve the file and/or mount its enclosing volume
+ /* resolve the file and/or mount its enclosing volume
* before handling it in the callback */
thunar_browser_poke_file (THUNAR_BROWSER (application), file, screen,
thunar_application_process_files_finish, NULL);
@@ -1567,10 +1567,10 @@ thunar_application_process_filenames (ThunarApplication *application,
else
{
/* tell the user that we were unable to launch the file specified */
- thunar_dialogs_show_error (screen, derror, _("Failed to open \"%s\""),
+ thunar_dialogs_show_error (screen, derror, _("Failed to open \"%s\""),
filenames[n]);
- g_set_error (error, derror->domain, derror->code,
+ g_set_error (error, derror->domain, derror->code,
_("Failed to open \"%s\": %s"), filenames[n], derror->message);
g_error_free (derror);
@@ -1588,11 +1588,11 @@ thunar_application_process_filenames (ThunarApplication *application,
/* remember the startup id to set on the window */
if (G_LIKELY (startup_id != NULL && *startup_id != '\0'))
- g_object_set_qdata_full (G_OBJECT (lp->data), thunar_application_startup_id_quark,
+ g_object_set_qdata_full (G_OBJECT (lp->data), thunar_application_startup_id_quark,
g_strdup (startup_id), (GDestroyNotify) g_free);
/* append the file to the list of files we need to launch */
- application->files_to_launch = g_list_append (application->files_to_launch,
+ application->files_to_launch = g_list_append (application->files_to_launch,
lp->data);
}
@@ -1626,7 +1626,7 @@ thunar_application_rename_file_error (ExoJob *job,
g_assert (screen != NULL);
g_assert (file != NULL);
- thunar_dialogs_show_error (screen, error, _("Failed to rename \"%s\""),
+ thunar_dialogs_show_error (screen, error, _("Failed to rename \"%s\""),
thunar_file_get_display_name (file));
}
@@ -1676,11 +1676,11 @@ thunar_application_rename_file (ThunarApplication *application,
{
/* remember the screen and file */
g_object_set_qdata (G_OBJECT (job), thunar_application_screen_quark, screen);
- g_object_set_qdata_full (G_OBJECT (job), thunar_application_file_quark,
+ g_object_set_qdata_full (G_OBJECT (job), thunar_application_file_quark,
g_object_ref (file), g_object_unref);
/* handle rename errors */
- g_signal_connect (job, "error",
+ g_signal_connect (job, "error",
G_CALLBACK (thunar_application_rename_file_error), application);
/* destroy the job when it has finished */
@@ -1702,7 +1702,7 @@ thunar_application_rename_file (ThunarApplication *application,
* with dbus to make focus stealing work properly.
*
* Prompts the user to create a new file or directory in @parent_directory.
- * The @content_type defines the icon and other elements in the filename
+ * The @content_type defines the icon and other elements in the filename
* prompt dialog.
**/
void
@@ -1797,9 +1797,9 @@ thunar_application_create_file_from_template (ThunarApplication *application,
/* TODO pass the startup ID to the rename dialog */
/* ask the user to enter a name for the new document */
- name = thunar_show_create_dialog (screen,
+ name = thunar_show_create_dialog (screen,
thunar_file_get_content_type (template_file),
- thunar_file_get_display_name (template_file),
+ thunar_file_get_display_name (template_file),
title);
if (G_LIKELY (name != NULL))
{
@@ -1840,7 +1840,7 @@ thunar_application_create_file_from_template (ThunarApplication *application,
* Copies all files from @source_file_list to their locations specified in
* @target_file_list.
*
- * @source_file_list and @target_file_list must be of the same length.
+ * @source_file_list and @target_file_list must be of the same length.
**/
void
thunar_application_copy_to (ThunarApplication *application,
@@ -1897,7 +1897,7 @@ thunar_application_copy_into (ThunarApplication *application,
/* collect the target files and launch the job */
thunar_application_collect_and_launch (application, parent, "stock_folder-copy",
title, thunar_io_jobs_copy_files,
- source_file_list, target_file,
+ source_file_list, target_file,
new_files_closure);
/* free the title */
@@ -1942,8 +1942,8 @@ thunar_application_link_into (ThunarApplication *application,
/* collect the target files and launch the job */
thunar_application_collect_and_launch (application, parent, "insert-link",
- title, thunar_io_jobs_link_files,
- source_file_list, target_file,
+ title, thunar_io_jobs_link_files,
+ source_file_list, target_file,
new_files_closure);
/* free the title */
@@ -1980,7 +1980,7 @@ thunar_application_move_into (ThunarApplication *application,
_thunar_return_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent));
_thunar_return_if_fail (THUNAR_IS_APPLICATION (application));
_thunar_return_if_fail (target_file != NULL);
-
+
/* launch the appropriate operation depending on the target file */
if (thunar_g_file_is_trashed (target_file))
{
@@ -1994,10 +1994,10 @@ thunar_application_move_into (ThunarApplication *application,
g_free (display_name);
/* collect the target files and launch the job */
- thunar_application_collect_and_launch (application, parent,
+ thunar_application_collect_and_launch (application, parent,
"stock_folder-move", title,
- thunar_io_jobs_move_files,
- source_file_list, target_file,
+ thunar_io_jobs_move_files,
+ source_file_list, target_file,
new_files_closure);
/* free the title */
@@ -2053,7 +2053,7 @@ thunar_application_unlink_files (ThunarApplication *application,
/* prepend the path to the path list */
path_list = thunar_g_file_list_prepend (path_list, thunar_file_get_file (lp->data));
- /* permanently delete if at least one of the file is not a local
+ /* permanently delete if at least one of the file is not a local
* file (e.g. resides in the trash) or cannot be trashed */
if (!thunar_file_is_local (lp->data) || !thunar_file_can_be_trashed (lp->data))
permanently = TRUE;
@@ -2096,7 +2096,7 @@ thunar_application_unlink_files (ThunarApplication *application,
_("_Delete"), GTK_RESPONSE_YES,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES);
- gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
_("If you delete a file, it is permanently lost."));
response = gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
@@ -2141,7 +2141,7 @@ thunar_application_trash (ThunarApplication *application,
_thunar_return_if_fail (THUNAR_IS_APPLICATION (application));
_thunar_return_if_fail (file_list != NULL);
- thunar_application_launch (application, parent, "user-trash-full",
+ thunar_application_launch (application, parent, "user-trash-full",
_("Moving files into the trash..."), trash_stub,
file_list, NULL, NULL);
}
@@ -2182,7 +2182,7 @@ thunar_application_creat (ThunarApplication *application,
_thunar_return_if_fail (parent == NULL || GDK_IS_SCREEN (parent) || GTK_IS_WIDGET (parent));
_thunar_return_if_fail (THUNAR_IS_APPLICATION (application));
-
+
template_list.next = template_list.prev = NULL;
template_list.data = template_file;
@@ -2356,7 +2356,7 @@ thunar_application_restore_files (ThunarApplication *application,
if (G_UNLIKELY (err != NULL))
{
/* display an error dialog */
- thunar_dialogs_show_error (parent, err, _("Could not restore \"%s\""),
+ thunar_dialogs_show_error (parent, err, _("Could not restore \"%s\""),
thunar_file_get_display_name (lp->data));
g_error_free (err);
}
diff --git a/thunar/thunar-application.h b/thunar/thunar-application.h
index b282630..6e4d673 100644
--- a/thunar/thunar-application.h
+++ b/thunar/thunar-application.h
@@ -4,18 +4,18 @@
* Copyright (c) 2005 Jeff Franks <jcfranks at xfce.org>
* Copyright (c) 2009-2011 Jannis Pohlmann <jannis at xfce.org>
*
- * This program is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
+ * published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the Free
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the Free
* Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
diff --git a/thunar/thunar-chooser-button.c b/thunar/thunar-chooser-button.c
index f2993b8..f833925 100644
--- a/thunar/thunar-chooser-button.c
+++ b/thunar/thunar-chooser-button.c
@@ -4,18 +4,18 @@
* Copyright (c) 2010 Nick Schermer <nick at xfce.org>
* Copyright (c) 2009-2011 Jannis Pohlmann <jannis at xfce.org>
*
- * This program is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
+ * published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the Free
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the Free
* Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
@@ -141,10 +141,10 @@ thunar_chooser_button_init (ThunarChooserButton *chooser_button)
G_TYPE_OBJECT,
G_TYPE_BOOLEAN,
PANGO_TYPE_STYLE);
- gtk_combo_box_set_model (GTK_COMBO_BOX (chooser_button),
+ gtk_combo_box_set_model (GTK_COMBO_BOX (chooser_button),
GTK_TREE_MODEL (chooser_button->store));
- g_signal_connect (chooser_button, "changed",
+ g_signal_connect (chooser_button, "changed",
G_CALLBACK (thunar_chooser_button_changed), NULL);
g_signal_connect (chooser_button, "popup",
G_CALLBACK (thunar_chooser_button_popup), NULL);
@@ -158,9 +158,9 @@ thunar_chooser_button_init (ThunarChooserButton *chooser_button)
renderer = gtk_cell_renderer_pixbuf_new ();
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (chooser_button), renderer, FALSE);
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (chooser_button), renderer,
- "gicon",
+ "gicon",
THUNAR_CHOOSER_BUTTON_STORE_COLUMN_ICON,
- "sensitive",
+ "sensitive",
THUNAR_CHOOSER_BUTTON_STORE_COLUMN_SENSITIVE,
NULL);
@@ -168,9 +168,9 @@ thunar_chooser_button_init (ThunarChooserButton *chooser_button)
renderer = gtk_cell_renderer_text_new ();
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (chooser_button), renderer, FALSE);
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (chooser_button), renderer,
- "text",
+ "text",
THUNAR_CHOOSER_BUTTON_STORE_COLUMN_NAME,
- "sensitive",
+ "sensitive",
THUNAR_CHOOSER_BUTTON_STORE_COLUMN_SENSITIVE,
"style",
THUNAR_CHOOSER_BUTTON_STORE_COLUMN_STYLE,
@@ -256,8 +256,8 @@ thunar_chooser_button_scroll_event (GtkWidget *widget,
&& gtk_combo_box_get_active_iter (GTK_COMBO_BOX (widget), &iter)
&& gtk_tree_model_iter_next (model, &iter))
{
- gtk_tree_model_get (model, &iter,
- THUNAR_CHOOSER_BUTTON_STORE_COLUMN_APPLICATION,
+ gtk_tree_model_get (model, &iter,
+ THUNAR_CHOOSER_BUTTON_STORE_COLUMN_APPLICATION,
&application, -1);
if (application == NULL)
@@ -305,7 +305,7 @@ thunar_chooser_button_changed (GtkComboBox *combo_box)
if (!g_app_info_set_as_default_for_type (app_info, content_type, &error))
{
/* tell the user that it didn't work */
- thunar_dialogs_show_error (GTK_WIDGET (chooser_button), error,
+ thunar_dialogs_show_error (GTK_WIDGET (chooser_button), error,
_("Failed to set default application for \"%s\""),
thunar_file_get_display_name (chooser_button->file));
g_error_free (error);
@@ -449,7 +449,7 @@ thunar_chooser_button_file_changed (ThunarChooserButton *chooser_button,
/* determine all applications that claim to be able to handle the file */
app_infos = g_app_info_get_all_for_type (content_type);
app_infos = g_list_sort (app_infos, thunar_chooser_button_sort_applications);
-
+
/* add all possible applications */
for (lp = app_infos, i = 0; lp != NULL; lp = lp->next, ++i)
{
@@ -466,7 +466,7 @@ thunar_chooser_button_file_changed (ThunarChooserButton *chooser_button,
THUNAR_CHOOSER_BUTTON_STORE_COLUMN_SENSITIVE,
TRUE,
-1);
-
+
/* pre-select the default application */
if (g_app_info_equal (lp->data, app_info))
gtk_combo_box_set_active_iter (GTK_COMBO_BOX (chooser_button), &iter);
@@ -486,7 +486,7 @@ thunar_chooser_button_file_changed (ThunarChooserButton *chooser_button,
chooser_button->has_default_application = TRUE;
}
}
-
+
if (content_type == NULL || !chooser_button->has_default_application)
{
/* add the "No application selected" item and set as active */
diff --git a/thunar/thunar-chooser-dialog.c b/thunar/thunar-chooser-dialog.c
index 7fd6154..782967b 100644
--- a/thunar/thunar-chooser-dialog.c
+++ b/thunar/thunar-chooser-dialog.c
@@ -499,9 +499,9 @@ thunar_chooser_dialog_response (GtkDialog *widget,
if (!g_app_info_launch (app_info, &list, G_APP_LAUNCH_CONTEXT (context), &error))
{
/* display an error to the user */
- thunar_dialogs_show_error (GTK_WIDGET (dialog),
- error,
- _("Failed to execute application \"%s\""),
+ thunar_dialogs_show_error (GTK_WIDGET (dialog),
+ error,
+ _("Failed to execute application \"%s\""),
g_app_info_get_name (app_info));
/* release the error */
diff --git a/thunar/thunar-chooser-model.c b/thunar/thunar-chooser-model.c
index cfc54be..b54e1ea 100644
--- a/thunar/thunar-chooser-model.c
+++ b/thunar/thunar-chooser-model.c
@@ -96,11 +96,11 @@ thunar_chooser_model_class_init (ThunarChooserModelClass *klass)
**/
g_object_class_install_property (gobject_class,
PROP_CONTENT_TYPE,
- g_param_spec_string ("content-type",
- "content-type",
+ g_param_spec_string ("content-type",
+ "content-type",
"content-type",
NULL,
- G_PARAM_CONSTRUCT_ONLY |
+ G_PARAM_CONSTRUCT_ONLY |
EXO_PARAM_READWRITE));
}
@@ -120,8 +120,8 @@ thunar_chooser_model_init (ThunarChooserModel *model)
};
/* register the column types */
- gtk_tree_store_set_column_types (GTK_TREE_STORE (model),
- G_N_ELEMENTS (column_types),
+ gtk_tree_store_set_column_types (GTK_TREE_STORE (model),
+ G_N_ELEMENTS (column_types),
column_types);
}
@@ -242,7 +242,7 @@ thunar_chooser_model_append (ThunarChooserModel *model,
inserted_infos = TRUE;
}
}
-
+
if (!inserted_infos)
{
/* tell the user that we don't have any applications for this category */
@@ -294,9 +294,9 @@ thunar_chooser_model_reload (ThunarChooserModel *model)
/* append them as recommended */
recommended = g_list_sort (recommended, sort_app_infos);
- thunar_chooser_model_append (model,
- _("Recommended Applications"),
- "preferences-desktop-default-applications",
+ thunar_chooser_model_append (model,
+ _("Recommended Applications"),
+ "preferences-desktop-default-applications",
recommended);
all = g_app_info_get_all ();
@@ -385,9 +385,9 @@ thunar_chooser_model_remove (ThunarChooserModel *model,
_thunar_return_val_if_fail (gtk_tree_store_iter_is_valid (GTK_TREE_STORE (model), iter), FALSE);
/* determine the app info for the iter */
- gtk_tree_model_get (GTK_TREE_MODEL (model),
- iter,
- THUNAR_CHOOSER_MODEL_COLUMN_APPLICATION, &app_info,
+ gtk_tree_model_get (GTK_TREE_MODEL (model),
+ iter,
+ THUNAR_CHOOSER_MODEL_COLUMN_APPLICATION, &app_info,
-1);
if (G_UNLIKELY (app_info == NULL))
diff --git a/thunar/thunar-clipboard-manager.c b/thunar/thunar-clipboard-manager.c
index 4796716..a5de04e 100644
--- a/thunar/thunar-clipboard-manager.c
+++ b/thunar/thunar-clipboard-manager.c
@@ -3,18 +3,18 @@
* Copyright (c) 2005-2006 Benedikt Meurer <benny at xfce.org>
* Copyright (c) 2009-2011 Jannis Pohlmann <jannis at xfce.org>
*
- * This program is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
+ * published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the Free
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the Free
* Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
@@ -341,7 +341,7 @@ thunar_clipboard_manager_contents_received (GtkClipboard *clipboard,
if (G_UNLIKELY (!path_copy))
gtk_clipboard_clear (manager->clipboard);
- /* check the contents of the clipboard again if either the Xserver or
+ /* check the contents of the clipboard again if either the Xserver or
* our GTK+ version doesn't support the XFixes extension */
if (!gdk_display_supports_selection_notification (gtk_clipboard_get_display (manager->clipboard)))
{
diff --git a/thunar/thunar-column-model.c b/thunar/thunar-column-model.c
index 9ec2ea5..35ac6fc 100644
--- a/thunar/thunar-column-model.c
+++ b/thunar/thunar-column-model.c
@@ -44,7 +44,7 @@ static void thunar_column_model_tree_model_init (GtkTreeMo
static void thunar_column_model_finalize (GObject *object);
static GtkTreeModelFlags thunar_column_model_get_flags (GtkTreeModel *tree_model);
static gint thunar_column_model_get_n_columns (GtkTreeModel *tree_model);
-static GType thunar_column_model_get_column_type (GtkTreeModel *tree_model,
+static GType thunar_column_model_get_column_type (GtkTreeModel *tree_model,
gint idx);
static gboolean thunar_column_model_get_iter (GtkTreeModel *tree_model,
GtkTreeIter *iter,
@@ -233,7 +233,7 @@ thunar_column_model_get_n_columns (GtkTreeModel *tree_model)
static GType
-thunar_column_model_get_column_type (GtkTreeModel *tree_model,
+thunar_column_model_get_column_type (GtkTreeModel *tree_model,
gint idx)
{
switch (idx)
diff --git a/thunar/thunar-create-dialog.c b/thunar/thunar-create-dialog.c
index a0ecd39..6fb204b 100644
--- a/thunar/thunar-create-dialog.c
+++ b/thunar/thunar-create-dialog.c
@@ -106,8 +106,8 @@ thunar_create_dialog_class_init (ThunarCreateDialogClass *klass)
**/
g_object_class_install_property (gobject_class,
PROP_FILENAME,
- g_param_spec_string ("filename",
- "filename",
+ g_param_spec_string ("filename",
+ "filename",
"filename",
NULL,
EXO_PARAM_READWRITE));
@@ -119,8 +119,8 @@ thunar_create_dialog_class_init (ThunarCreateDialogClass *klass)
**/
g_object_class_install_property (gobject_class,
PROP_CONTENT_TYPE,
- g_param_spec_string ("content-type",
- "content-type",
+ g_param_spec_string ("content-type",
+ "content-type",
"content-type",
NULL,
EXO_PARAM_READWRITE));
@@ -328,7 +328,7 @@ thunar_create_dialog_set_filename (ThunarCreateDialog *dialog,
_thunar_return_if_fail (THUNAR_IS_CREATE_DIALOG (dialog));
_thunar_return_if_fail (filename != NULL);
-
+
/* setup the new filename */
gtk_entry_set_text (GTK_ENTRY (dialog->entry), filename);
@@ -365,7 +365,7 @@ thunar_create_dialog_set_filename (ThunarCreateDialog *dialog,
* thunar_create_dialog_set_content_type:
* @dialog : a #ThunarCreateDialog.
* @content_type : the new content type.
- *
+ *
* Set the content type for @dialog to @content_type.
**/
void
diff --git a/thunar/thunar-dbus-service-infos.xml b/thunar/thunar-dbus-service-infos.xml
index 614d4eb..572447f 100644
--- a/thunar/thunar-dbus-service-infos.xml
+++ b/thunar/thunar-dbus-service-infos.xml
@@ -2,17 +2,17 @@
<!--
Copyright (c) 2006 Benedikt Meurer <benny at xfce.org>
-
+
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the Free
Software Foundation; either version 2 of the License, or (at your option)
any later version.
-
+
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
more details.
-
+
You should have received a copy of the GNU General Public License along with
this program; if not, write to the Free Software Foundation, Inc., 59 Temple
Place, Suite 330, Boston, MA 02111-1307 USA
@@ -310,7 +310,7 @@
CreateFile (parent_directory : STRING, content_type : STRING, display : STRING, startup_id : STRING) : VOID
parent_directory : the parent directory in which the file will be created.
- content_type : content type of the file to be created (text/plain assumed
+ content_type : content type of the file to be created (text/plain assumed
when empty).
display : the screen on which to launch the filenames or ""
to use the default screen of the file manager.
diff --git a/thunar/thunar-dbus-service.c b/thunar/thunar-dbus-service.c
index c3e0c0f..258acb9 100644
--- a/thunar/thunar-dbus-service.c
+++ b/thunar/thunar-dbus-service.c
@@ -1130,13 +1130,13 @@ thunar_dbus_service_transfer_files (ThunarDBusTransferMode transfer_mode,
/* verify that at least one file to transfer is given */
if (source_filenames == NULL || *source_filenames == NULL)
{
- g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_INVAL,
+ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_INVAL,
_("At least one source filename must be specified"));
return FALSE;
}
/* verify that the target filename is set / enough target filenames are given */
- if (transfer_mode == THUNAR_DBUS_TRANSFER_MODE_COPY_TO)
+ if (transfer_mode == THUNAR_DBUS_TRANSFER_MODE_COPY_TO)
{
if (g_strv_length ((gchar **)source_filenames) != g_strv_length ((gchar **)target_filenames))
{
@@ -1204,23 +1204,23 @@ thunar_dbus_service_transfer_files (ThunarDBusTransferMode transfer_mode,
switch (transfer_mode)
{
case THUNAR_DBUS_TRANSFER_MODE_COPY_TO:
- thunar_application_copy_to (application, screen,
- source_file_list, target_file_list,
+ thunar_application_copy_to (application, screen,
+ source_file_list, target_file_list,
NULL);
break;
case THUNAR_DBUS_TRANSFER_MODE_COPY_INTO:
- thunar_application_copy_into (application, screen,
- source_file_list, target_file_list->data,
+ thunar_application_copy_into (application, screen,
+ source_file_list, target_file_list->data,
NULL);
break;
case THUNAR_DBUS_TRANSFER_MODE_MOVE_INTO:
- thunar_application_move_into (application, screen,
- source_file_list, target_file_list->data,
+ thunar_application_move_into (application, screen,
+ source_file_list, target_file_list->data,
NULL);
break;
case THUNAR_DBUS_TRANSFER_MODE_LINK_INTO:
- thunar_application_link_into (application, screen,
- source_file_list, target_file_list->data,
+ thunar_application_link_into (application, screen,
+ source_file_list, target_file_list->data,
NULL);
break;
}
diff --git a/thunar/thunar-deep-count-job.h b/thunar/thunar-deep-count-job.h
index 735a121..265e9c8 100644
--- a/thunar/thunar-deep-count-job.h
+++ b/thunar/thunar-deep-count-job.h
@@ -2,19 +2,19 @@
/*-
* Copyright (c) 2009 Jannis Pohlmann <jannis at xfce.org>.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*/
diff --git a/thunar/thunar-device.c b/thunar/thunar-device.c
index 697a23f..a310912 100644
--- a/thunar/thunar-device.c
+++ b/thunar/thunar-device.c
@@ -248,7 +248,7 @@ thunar_device_operation_finish (GObject *object,
{
ThunarDeviceOperation *op = user_data;
GError *error = NULL;
-
+
_thunar_return_if_fail (G_IS_OBJECT (object));
_thunar_return_if_fail (G_IS_ASYNC_RESULT (result));
diff --git a/thunar/thunar-dialogs.c b/thunar/thunar-dialogs.c
index 9905f89..1ad8905 100644
--- a/thunar/thunar-dialogs.c
+++ b/thunar/thunar-dialogs.c
@@ -181,7 +181,7 @@ thunar_dialogs_show_rename_file (gpointer parent,
{
/* hide the dialog */
gtk_widget_hide (dialog);
-
+
/* determine the new filename */
text = gtk_entry_get_text (GTK_ENTRY (entry));
@@ -229,7 +229,7 @@ thunar_dialogs_show_about (GtkWindow *parent,
"Nick Schermer <nick at xfce.org>",
NULL,
};
-
+
static const gchar *documenters[] =
{
"Benedikt Meurer <benny at xfce.org>",
@@ -249,7 +249,6 @@ thunar_dialogs_show_about (GtkWindow *parent,
comments = g_strdup_vprintf (format, args);
va_end (args);
-
/* try to load the about logo */
logo = gdk_pixbuf_new_from_file (DATADIR "/pixmaps/Thunar/Thunar-about-logo.png", NULL);
@@ -581,7 +580,7 @@ thunar_dialogs_show_job_ask_replace (GtkWindow *parent,
if (thunar_file_is_symlink (dst_file))
{
- text = g_strdup_printf (_("This folder already contains a symbolic link \"%s\"."),
+ text = g_strdup_printf (_("This folder already contains a symbolic link \"%s\"."),
thunar_file_get_display_name (dst_file));
}
else if (thunar_file_is_directory (dst_file))
@@ -590,8 +589,8 @@ thunar_dialogs_show_job_ask_replace (GtkWindow *parent,
thunar_file_get_display_name (dst_file));
}
else
- {
- text = g_strdup_printf (_("This folder already contains a file \"%s\"."),
+ {
+ text = g_strdup_printf (_("This folder already contains a file \"%s\"."),
thunar_file_get_display_name (dst_file));
}
diff --git a/thunar/thunar-dnd.c b/thunar/thunar-dnd.c
index e263a6e..9bf1b86 100644
--- a/thunar/thunar-dnd.c
+++ b/thunar/thunar-dnd.c
@@ -3,18 +3,18 @@
* Copyright (c) 2005-2006 Benedikt Meurer <benny at xfce.org>
* Copyright (c) 2009-2011 Jannis Pohlmann <jannis at xfce.org>
*
- * This program is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
+ * published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the Free
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the Free
* Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
diff --git a/thunar/thunar-enum-types.c b/thunar/thunar-enum-types.c
index 479bbcf..6bfc7b8 100644
--- a/thunar/thunar-enum-types.c
+++ b/thunar/thunar-enum-types.c
@@ -255,7 +255,7 @@ thunar_job_response_get_type (void)
if (G_UNLIKELY (type == G_TYPE_INVALID))
{
- static const GFlagsValue values[] =
+ static const GFlagsValue values[] =
{
{ THUNAR_JOB_RESPONSE_YES, "THUNAR_JOB_RESPONSE_YES", "yes" },
{ THUNAR_JOB_RESPONSE_YES_ALL, "THUNAR_JOB_RESPONSE_YES_ALL", "yes-all" },
@@ -280,9 +280,9 @@ thunar_file_mode_get_type (void)
{
static GType type = G_TYPE_INVALID;
- if (type == G_TYPE_INVALID)
+ if (type == G_TYPE_INVALID)
{
- static const GFlagsValue values[] =
+ static const GFlagsValue values[] =
{
{ THUNAR_FILE_MODE_SUID, "THUNAR_FILE_MODE_SUID", "suid" },
{ THUNAR_FILE_MODE_SGID, "THUNAR_FILE_MODE_SGID", "sgid" },
@@ -301,7 +301,7 @@ thunar_file_mode_get_type (void)
{ THUNAR_FILE_MODE_OTH_EXEC, "THUNAR_FILE_MODE_OTH_EXEC", "oth-exec" },
{ 0, NULL, NULL }
};
-
+
type = g_flags_register_static ("ThunarFileMode", values);
}
return type;
diff --git a/thunar/thunar-exec.c b/thunar/thunar-exec.c
index 06ceb82..edbe270 100644
--- a/thunar/thunar-exec.c
+++ b/thunar/thunar-exec.c
@@ -3,18 +3,18 @@
* Copyright (c) 2005-2007 Benedikt Meurer <benny at xfce.org>
* Copyright (c) 2009 Jannis Pohlmann <jannis at xfce.org>
*
- * This program is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
+ * published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the Free
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the Free
* Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
diff --git a/thunar/thunar-exec.h b/thunar/thunar-exec.h
index 32b5b3c..449d628 100644
--- a/thunar/thunar-exec.h
+++ b/thunar/thunar-exec.h
@@ -3,18 +3,18 @@
* Copyright (c) 2005-2007 Benedikt Meurer <benny at xfce.org>
* Copyright (c) 2009 Jannis Pohlmann <jannis at xfce.org>
*
- * This program is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
+ * published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the Free
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the Free
* Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
diff --git a/thunar/thunar-file-monitor.c b/thunar/thunar-file-monitor.c
index 26a91e7..5949601 100644
--- a/thunar/thunar-file-monitor.c
+++ b/thunar/thunar-file-monitor.c
@@ -130,7 +130,7 @@ thunar_file_monitor_get_default (void)
{
/* allocate the default monitor */
file_monitor_default = g_object_new (THUNAR_TYPE_FILE_MONITOR, NULL);
- g_object_add_weak_pointer (G_OBJECT (file_monitor_default),
+ g_object_add_weak_pointer (G_OBJECT (file_monitor_default),
(gpointer) &file_monitor_default);
}
else
diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c
index 2333d90..6762e7d 100644
--- a/thunar/thunar-file.c
+++ b/thunar/thunar-file.c
@@ -3,18 +3,18 @@
* Copyright (c) 2005-2007 Benedikt Meurer <benny at xfce.org>
* Copyright (c) 2009-2011 Jannis Pohlmann <jannis at xfce.org>
*
- * This program is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
+ * published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the Free
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the Free
* Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
@@ -181,7 +181,7 @@ struct _ThunarFile
/* flags for thumbnail state etc */
ThunarFileFlags flags;
-
+
/* tells whether the file watch is not set */
gboolean no_file_watch;
};
@@ -546,7 +546,7 @@ static GFileInfo *
thunar_file_info_get_file_info (ThunarxFileInfo *file_info)
{
_thunar_return_val_if_fail (THUNAR_IS_FILE (file_info), NULL);
-
+
if (THUNAR_FILE (file_info)->info != NULL)
return g_object_ref (THUNAR_FILE (file_info)->info);
else
@@ -560,7 +560,7 @@ thunar_file_info_get_filesystem_info (ThunarxFileInfo *file_info)
{
_thunar_return_val_if_fail (THUNAR_IS_FILE (file_info), NULL);
- return g_file_query_filesystem_info (THUNAR_FILE (file_info)->gfile,
+ return g_file_query_filesystem_info (THUNAR_FILE (file_info)->gfile,
THUNARX_FILESYSTEM_INFO_NAMESPACE,
NULL, NULL);
}
@@ -625,7 +625,7 @@ thunar_file_denies_access_permission (const ThunarFile *file,
{
/* we're the owner, so the usr permissions must be granted */
result = ((mode & usr_permissions) == 0);
-
+
/* release the user */
g_object_unref (G_OBJECT (user));
}
@@ -650,7 +650,7 @@ thunar_file_denies_access_permission (const ThunarFile *file,
g_object_unref (G_OBJECT (group));
return ((mode & grp_permissions) == 0);
}
-
+
/* release the effective user */
g_object_unref (G_OBJECT (user));
}
@@ -917,7 +917,7 @@ static void
thunar_file_info_clear (ThunarFile *file)
{
_thunar_return_if_fail (THUNAR_IS_FILE (file));
-
+
/* release the current file info */
if (file->info != NULL)
{
@@ -1021,14 +1021,14 @@ thunar_file_info_reload (ThunarFile *file,
if (key_file != NULL)
{
/* read the icon name from the .desktop file */
- file->custom_icon_name = g_key_file_get_string (key_file,
+ file->custom_icon_name = g_key_file_get_string (key_file,
G_KEY_FILE_DESKTOP_GROUP,
G_KEY_FILE_DESKTOP_KEY_ICON,
NULL);
if (G_UNLIKELY (exo_str_is_empty (file->custom_icon_name)))
{
- /* make sure we set null if the string is empty else the assertion in
+ /* make sure we set null if the string is empty else the assertion in
* thunar_icon_factory_lookup_icon() will fail */
g_free (file->custom_icon_name);
file->custom_icon_name = NULL;
@@ -1050,7 +1050,7 @@ thunar_file_info_reload (ThunarFile *file,
G_KEY_FILE_DESKTOP_GROUP,
G_KEY_FILE_DESKTOP_KEY_NAME,
NULL, NULL);
-
+
/* drop the name if it's empty or has invalid encoding */
if (exo_str_is_empty (file->display_name)
|| !g_utf8_validate (file->display_name, -1, NULL))
@@ -1175,7 +1175,7 @@ thunar_file_get_async_finish (GObject *object,
* @error : return location for errors or %NULL.
*
* Loads all information about the file. As this is a possibly
- * blocking call, it can be cancelled using @cancellable.
+ * blocking call, it can be cancelled using @cancellable.
*
* If loading the file fails or the operation is cancelled,
* @error will be set.
@@ -1449,7 +1449,7 @@ thunar_file_get_async (GFile *location,
*
* The returned #GFile is owned by @file and must not be released
* with g_object_unref().
- *
+ *
* Return value: the #GFile corresponding to @file.
**/
GFile *
@@ -1552,7 +1552,7 @@ thunar_file_check_loaded (ThunarFile *file)
/**
* thunar_file_execute:
* @file : a #ThunarFile instance.
- * @working_directory : the working directory used to resolve relative filenames
+ * @working_directory : the working directory used to resolve relative filenames
* in @file_list.
* @parent : %NULL, a #GdkScreen or #GtkWidget.
* @file_list : the list of #GFile<!---->s to supply to @file on execution.
@@ -1664,7 +1664,7 @@ thunar_file_execute (ThunarFile *file,
else
{
/* TRANSLATORS: `URL' is a field name in a .desktop file. Don't translate it. */
- g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_INVAL,
+ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_INVAL,
_("No URL field specified"));
}
}
@@ -1738,7 +1738,7 @@ thunar_file_execute (ThunarFile *file,
}
/* execute the command */
- result = xfce_spawn_on_screen (thunar_util_parse_parent (parent, NULL),
+ result = xfce_spawn_on_screen (thunar_util_parse_parent (parent, NULL),
directory, argv, NULL, G_SPAWN_SEARCH_PATH,
snotify, stimestamp, icon_name, error);
}
@@ -2071,7 +2071,7 @@ thunar_file_accepts_drop (ThunarFile *file,
/* if the source offers both copy and move and the GTK+ suggested action is copy, try to be smart telling whether
* we should copy or move by default by checking whether the source and target are on the same disk.
*/
- if ((actions & (GDK_ACTION_COPY | GDK_ACTION_MOVE)) != 0
+ if ((actions & (GDK_ACTION_COPY | GDK_ACTION_MOVE)) != 0
&& (suggested_action == GDK_ACTION_COPY))
{
/* default to move as suggested action */
@@ -2094,10 +2094,10 @@ thunar_file_accepts_drop (ThunarFile *file,
/* we have only move if we know the source and both the source and the target
* are on the same disk, and the source file is owned by the current user.
*/
- if (ofile == NULL
+ if (ofile == NULL
|| !thunar_file_same_filesystem (file, ofile)
- || (ofile->info != NULL
- && g_file_info_get_attribute_uint32 (ofile->info,
+ || (ofile->info != NULL
+ && g_file_info_get_attribute_uint32 (ofile->info,
G_FILE_ATTRIBUTE_UNIX_UID) != effective_user_id))
{
/* default to copy and get outa here */
@@ -2161,16 +2161,16 @@ thunar_file_get_date (const ThunarFile *file,
if (file->info == NULL)
return 0;
-
+
switch (date_type)
{
- case THUNAR_FILE_DATE_ACCESSED:
+ case THUNAR_FILE_DATE_ACCESSED:
attribute = G_FILE_ATTRIBUTE_TIME_ACCESS;
break;
case THUNAR_FILE_DATE_CHANGED:
attribute = G_FILE_ATTRIBUTE_TIME_CHANGED;
break;
- case THUNAR_FILE_DATE_MODIFIED:
+ case THUNAR_FILE_DATE_MODIFIED:
attribute = G_FILE_ATTRIBUTE_TIME_MODIFIED;
break;
default:
@@ -2323,8 +2323,8 @@ thunar_file_get_size_string_formatted (const ThunarFile *file, const gboolean fi
* thunar_file_get_volume:
* @file : a #ThunarFile instance.
*
- * Attempts to determine the #GVolume on which @file is located. If @file cannot
- * determine it's volume, then %NULL will be returned. Else a #GVolume instance
+ * Attempts to determine the #GVolume on which @file is located. If @file cannot
+ * determine it's volume, then %NULL will be returned. Else a #GVolume instance
* is returned which has to be released by the caller using g_object_unref().
*
* Return value: the #GVolume for @file or %NULL.
@@ -2543,8 +2543,8 @@ thunar_file_get_basename (const ThunarFile *file)
*
* Return value: %TRUE if @file is a symbolic link.
**/
-gboolean
-thunar_file_is_symlink (const ThunarFile *file)
+gboolean
+thunar_file_is_symlink (const ThunarFile *file)
{
_thunar_return_val_if_fail (THUNAR_IS_FILE (file), FALSE);
@@ -2583,14 +2583,14 @@ thunar_file_get_size (const ThunarFile *file)
* @file : a #ThunarFile instance.
*
* Returns the default #GAppInfo for @file or %NULL if there is none.
- *
+ *
* The caller is responsible to free the returned #GAppInfo using
* g_object_unref().
*
* Return value: Default #GAppInfo for @file or %NULL if there is none.
**/
GAppInfo *
-thunar_file_get_default_handler (const ThunarFile *file)
+thunar_file_get_default_handler (const ThunarFile *file)
{
const gchar *content_type;
GAppInfo *app_info = NULL;
@@ -2626,7 +2626,7 @@ thunar_file_get_default_handler (const ThunarFile *file)
* Return value: the kind of @file.
**/
GFileType
-thunar_file_get_kind (const ThunarFile *file)
+thunar_file_get_kind (const ThunarFile *file)
{
_thunar_return_val_if_fail (THUNAR_IS_FILE (file), G_FILE_TYPE_UNKNOWN);
return file->kind;
@@ -2643,7 +2643,7 @@ thunar_file_get_target_location (const ThunarFile *file)
if (file->info == NULL)
return g_object_ref (file->gfile);
-
+
uri = g_file_info_get_attribute_string (file->info,
G_FILE_ATTRIBUTE_STANDARD_TARGET_URI);
@@ -2661,7 +2661,7 @@ thunar_file_get_target_location (const ThunarFile *file)
* Return value: the permission bits of @file.
**/
ThunarFileMode
-thunar_file_get_mode (const ThunarFile *file)
+thunar_file_get_mode (const ThunarFile *file)
{
_thunar_return_val_if_fail (THUNAR_IS_FILE (file), 0);
@@ -2703,7 +2703,7 @@ thunar_file_exists (const ThunarFile *file)
* Return value: %TRUE if @file is a directory.
**/
gboolean
-thunar_file_is_directory (const ThunarFile *file)
+thunar_file_is_directory (const ThunarFile *file)
{
_thunar_return_val_if_fail (THUNAR_IS_FILE (file), FALSE);
return file->kind == G_FILE_TYPE_DIRECTORY;
@@ -2720,7 +2720,7 @@ thunar_file_is_directory (const ThunarFile *file)
* Return value: %TRUE if @file is a shortcut.
**/
gboolean
-thunar_file_is_shortcut (const ThunarFile *file)
+thunar_file_is_shortcut (const ThunarFile *file)
{
_thunar_return_val_if_fail (THUNAR_IS_FILE (file), FALSE);
return file->kind == G_FILE_TYPE_SHORTCUT;
@@ -2737,7 +2737,7 @@ thunar_file_is_shortcut (const ThunarFile *file)
* Return value: %TRUE if @file is a mountable file/directory.
**/
gboolean
-thunar_file_is_mountable (const ThunarFile *file)
+thunar_file_is_mountable (const ThunarFile *file)
{
_thunar_return_val_if_fail (THUNAR_IS_FILE (file), FALSE);
return file->kind == G_FILE_TYPE_MOUNTABLE;
@@ -2861,7 +2861,7 @@ thunar_file_is_ancestor (const ThunarFile *file,
*
* Determines whether the owner of the current process is allowed
* to execute the @file (or enter the directory refered to by
- * @file). On UNIX it also returns %TRUE if @file refers to a
+ * @file). On UNIX it also returns %TRUE if @file refers to a
* desktop entry.
*
* Return value: %TRUE if @file can be executed.
@@ -2927,8 +2927,8 @@ thunar_file_is_readable (const ThunarFile *file)
if (!g_file_info_has_attribute (file->info, G_FILE_ATTRIBUTE_ACCESS_CAN_READ))
return TRUE;
-
- return g_file_info_get_attribute_boolean (file->info,
+
+ return g_file_info_get_attribute_boolean (file->info,
G_FILE_ATTRIBUTE_ACCESS_CAN_READ);
}
@@ -2947,14 +2947,14 @@ gboolean
thunar_file_is_writable (const ThunarFile *file)
{
_thunar_return_val_if_fail (THUNAR_IS_FILE (file), FALSE);
-
+
if (file->info == NULL)
return FALSE;
if (!g_file_info_has_attribute (file->info, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE))
return TRUE;
- return g_file_info_get_attribute_boolean (file->info,
+ return g_file_info_get_attribute_boolean (file->info,
G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE);
}
@@ -2972,7 +2972,7 @@ gboolean
thunar_file_is_hidden (const ThunarFile *file)
{
_thunar_return_val_if_fail (THUNAR_IS_FILE (file), FALSE);
-
+
if (file->info == NULL)
return FALSE;
@@ -3020,7 +3020,7 @@ thunar_file_is_regular (const ThunarFile *file)
* thunar_file_is_trashed:
* @file : a #ThunarFile instance.
*
- * Returns %TRUE if @file is a local file that resides in
+ * Returns %TRUE if @file is a local file that resides in
* the trash bin.
*
* Return value: %TRUE if @file is in the trash, or
@@ -3193,7 +3193,7 @@ thunar_file_get_original_path (const ThunarFile *file)
* Returns the number of items in the trash, if @file refers to the
* trash root directory. Otherwise returns 0.
*
- * Return value: number of files in the trash if @file is the trash
+ * Return value: number of files in the trash if @file is the trash
* root dir, 0 otherwise.
**/
guint32
@@ -3204,7 +3204,7 @@ thunar_file_get_item_count (const ThunarFile *file)
if (file->info == NULL)
return 0;
- return g_file_info_get_attribute_uint32 (file->info,
+ return g_file_info_get_attribute_uint32 (file->info,
G_FILE_ATTRIBUTE_TRASH_ITEM_COUNT);
}
@@ -3236,7 +3236,7 @@ thunar_file_is_chmodable (const ThunarFile *file)
}
else
{
- return ((effective_user_id == 0
+ return ((effective_user_id == 0
|| effective_user_id == g_file_info_get_attribute_uint32 (file->info,
G_FILE_ATTRIBUTE_UNIX_UID))
&& !thunar_file_is_trashed (file));
@@ -3260,7 +3260,7 @@ gboolean
thunar_file_is_renameable (const ThunarFile *file)
{
_thunar_return_val_if_fail (THUNAR_IS_FILE (file), FALSE);
-
+
if (file->info == NULL)
return FALSE;
@@ -3278,7 +3278,7 @@ thunar_file_can_be_trashed (const ThunarFile *file)
if (file->info == NULL)
return FALSE;
- return g_file_info_get_attribute_boolean (file->info,
+ return g_file_info_get_attribute_boolean (file->info,
G_FILE_ATTRIBUTE_ACCESS_CAN_TRASH);
}
@@ -3326,8 +3326,8 @@ thunar_file_get_emblem_names (ThunarFile *file)
/* determine the user ID of the file owner */
/* TODO what are we going to do here on non-UNIX systems? */
- uid = file->info != NULL
- ? g_file_info_get_attribute_uint32 (file->info, G_FILE_ATTRIBUTE_UNIX_UID)
+ uid = file->info != NULL
+ ? g_file_info_get_attribute_uint32 (file->info, G_FILE_ATTRIBUTE_UNIX_UID)
: 0;
/* we add "cant-read" if either (a) the file is not readable or (b) a directory, that lacks the
@@ -3569,12 +3569,12 @@ thunar_file_get_thumb_state (const ThunarFile *file)
* @file : a #ThunarFile.
* @thumb_state : the new #ThunarFileThumbState.
*
- * Sets the #ThunarFileThumbState for @file to @thumb_state.
+ * Sets the #ThunarFileThumbState for @file to @thumb_state.
* This will cause a "file-changed" signal to be emitted from
- * #ThunarFileMonitor.
- **/
+ * #ThunarFileMonitor.
+ **/
void
-thunar_file_set_thumb_state (ThunarFile *file,
+thunar_file_set_thumb_state (ThunarFile *file,
ThunarFileThumbState state)
{
_thunar_return_if_fail (THUNAR_IS_FILE (file));
@@ -3605,7 +3605,7 @@ thunar_file_set_thumb_state (ThunarFile *file,
* thunar_file_get_custom_icon:
* @file : a #ThunarFile instance.
*
- * Queries the custom icon from @file if any, else %NULL is returned.
+ * Queries the custom icon from @file if any, else %NULL is returned.
* The custom icon can be either a themed icon name or an absolute path
* to an icon file in the local file system.
*
@@ -3985,7 +3985,7 @@ thunar_file_reload (ThunarFile *file)
}
-
+
/**
* thunar_file_reload_idle:
* @file : a #ThunarFile instance.
@@ -4123,10 +4123,10 @@ thunar_file_same_filesystem (const ThunarFile *file_a,
return FALSE;
/* determine the filesystem IDs */
- filesystem_id_a = g_file_info_get_attribute_string (file_a->info,
+ filesystem_id_a = g_file_info_get_attribute_string (file_a->info,
G_FILE_ATTRIBUTE_ID_FILESYSTEM);
- filesystem_id_b = g_file_info_get_attribute_string (file_b->info,
+ filesystem_id_b = g_file_info_get_attribute_string (file_b->info,
G_FILE_ATTRIBUTE_ID_FILESYSTEM);
/* compare the filesystem IDs */
@@ -4165,9 +4165,9 @@ thunar_file_cache_lookup (const GFile *file)
/* allocate the ThunarFile cache on-demand */
if (G_UNLIKELY (file_cache == NULL))
{
- file_cache = g_hash_table_new_full (g_file_hash,
- (GEqualFunc) g_file_equal,
- (GDestroyNotify) g_object_unref,
+ file_cache = g_hash_table_new_full (g_file_hash,
+ (GEqualFunc) g_file_equal,
+ (GDestroyNotify) g_object_unref,
(GDestroyNotify) weak_ref_free);
}
@@ -4223,7 +4223,7 @@ compare_app_infos (gconstpointer a,
* thunar_file_list_get_applications:
* @file_list : a #GList of #ThunarFile<!---->s.
*
- * Returns the #GList of #GAppInfo<!---->s that can be used to open
+ * Returns the #GList of #GAppInfo<!---->s that can be used to open
* all #ThunarFile<!---->s in the given @file_list.
*
* The caller is responsible to free the returned list using something like:
@@ -4231,7 +4231,7 @@ compare_app_infos (gconstpointer a,
* g_list_free_full (list, g_object_unref);
* </programlisting></informalexample>
*
- * Return value: the list of #GAppInfo<!---->s that can be used to open all
+ * Return value: the list of #GAppInfo<!---->s that can be used to open all
* items in the @file_list.
**/
GList*
diff --git a/thunar/thunar-file.h b/thunar/thunar-file.h
index da5b2a4..7ddd873 100644
--- a/thunar/thunar-file.h
+++ b/thunar/thunar-file.h
@@ -168,7 +168,7 @@ gchar *thunar_file_get_date_string (const ThunarFile
ThunarDateStyle date_style) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
gchar *thunar_file_get_mode_string (const ThunarFile *file) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
gchar *thunar_file_get_size_string (const ThunarFile *file) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
-gchar *thunar_file_get_size_string_formatted (const ThunarFile *file,
+gchar *thunar_file_get_size_string_formatted (const ThunarFile *file,
const gboolean file_size_binary);
GVolume *thunar_file_get_volume (const ThunarFile *file);
@@ -194,9 +194,9 @@ gboolean thunar_file_is_mountable (const ThunarFile
gboolean thunar_file_is_local (const ThunarFile *file);
gboolean thunar_file_is_parent (const ThunarFile *file,
const ThunarFile *child);
-gboolean thunar_file_is_gfile_ancestor (const ThunarFile *file,
+gboolean thunar_file_is_gfile_ancestor (const ThunarFile *file,
GFile *ancestor);
-gboolean thunar_file_is_ancestor (const ThunarFile *file,
+gboolean thunar_file_is_ancestor (const ThunarFile *file,
const ThunarFile *ancestor);
gboolean thunar_file_is_executable (const ThunarFile *file);
gboolean thunar_file_is_writable (const ThunarFile *file);
@@ -228,7 +228,7 @@ gboolean thunar_file_set_custom_icon (ThunarFile
const gchar *thunar_file_get_thumbnail_path (ThunarFile *file);
ThunarFileThumbState thunar_file_get_thumb_state (const ThunarFile *file);
-void thunar_file_set_thumb_state (ThunarFile *file,
+void thunar_file_set_thumb_state (ThunarFile *file,
ThunarFileThumbState state);
GIcon *thunar_file_get_preview_icon (const ThunarFile *file);
GFilesystemPreviewType thunar_file_get_preview_type (const ThunarFile *file);
diff --git a/thunar/thunar-gdk-extensions.c b/thunar/thunar-gdk-extensions.c
index 50ecb4a..022d7ec 100644
--- a/thunar/thunar-gdk-extensions.c
+++ b/thunar/thunar-gdk-extensions.c
@@ -151,7 +151,7 @@ thunar_gdk_cairo_create_surface (const GdkPixbuf *pixbuf)
* @display_name : a fully qualified display name.
* @error : return location for errors or %NULL.
*
- * Opens the screen referenced by the @display_name. Returns a
+ * Opens the screen referenced by the @display_name. Returns a
* reference on the #GdkScreen for @display_name or %NULL if
* @display_name couldn't be opened.
*
diff --git a/thunar/thunar-icon-factory.c b/thunar/thunar-icon-factory.c
index fd6bdc3..d2cbd6d 100644
--- a/thunar/thunar-icon-factory.c
+++ b/thunar/thunar-icon-factory.c
@@ -3,18 +3,18 @@
* Copyright (c) 2005-2006 Benedikt Meurer <benny at xfce.org>
* Copyright (c) 2009-2011 Jannis Pohlmann <jannis at xfce.org>
*
- * This program is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
+ * published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the Free
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the Free
* Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
@@ -753,7 +753,7 @@ thunar_icon_factory_load_icon (ThunarIconFactory *factory,
{
_thunar_return_val_if_fail (THUNAR_IS_ICON_FACTORY (factory), NULL);
_thunar_return_val_if_fail (size > 0, NULL);
-
+
/* cannot happen unless there's no XSETTINGS manager
* for the default screen, but just in case...
*/
@@ -837,9 +837,9 @@ thunar_icon_factory_load_file_icon (ThunarIconFactory *factory,
if (G_IS_THEMED_ICON (gicon))
{
/* we have a themed preview icon, look it up using the icon theme */
- icon_info =
- gtk_icon_theme_lookup_by_gicon (factory->icon_theme,
- gicon, icon_size,
+ icon_info =
+ gtk_icon_theme_lookup_by_gicon (factory->icon_theme,
+ gicon, icon_size,
GTK_ICON_LOOKUP_USE_BUILTIN
| GTK_ICON_LOOKUP_FORCE_SIZE);
diff --git a/thunar/thunar-image.c b/thunar/thunar-image.c
index 650da20..cff5205 100644
--- a/thunar/thunar-image.c
+++ b/thunar/thunar-image.c
@@ -2,18 +2,18 @@
/*-
* Copyright (c) 2009 Jannis Pohlmann <jannis at xfce.org>
*
- * This program is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
+ * published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the Free
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the Free
* Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
@@ -93,7 +93,7 @@ thunar_image_class_init (ThunarImageClass *klass)
g_type_class_add_private (klass, sizeof (ThunarImagePrivate));
gobject_class = G_OBJECT_CLASS (klass);
- gobject_class->finalize = thunar_image_finalize;
+ gobject_class->finalize = thunar_image_finalize;
gobject_class->get_property = thunar_image_get_property;
gobject_class->set_property = thunar_image_set_property;
@@ -114,7 +114,7 @@ thunar_image_init (ThunarImage *image)
image->priv->file = NULL;
image->priv->monitor = thunar_file_monitor_get_default ();
- g_signal_connect (image->priv->monitor, "file-changed",
+ g_signal_connect (image->priv->monitor, "file-changed",
G_CALLBACK (thunar_image_file_changed), image);
}
@@ -125,7 +125,7 @@ thunar_image_finalize (GObject *object)
{
ThunarImage *image = THUNAR_IMAGE (object);
- g_signal_handlers_disconnect_by_func (image->priv->monitor,
+ g_signal_handlers_disconnect_by_func (image->priv->monitor,
thunar_image_file_changed, image);
g_object_unref (image->priv->monitor);
@@ -187,7 +187,7 @@ thunar_image_update (ThunarImage *image)
GdkScreen *screen;
_thunar_return_if_fail (THUNAR_IS_IMAGE (image));
-
+
if (THUNAR_IS_FILE (image->priv->file))
{
screen = gtk_widget_get_screen (GTK_WIDGET (image));
diff --git a/thunar/thunar-image.h b/thunar/thunar-image.h
index 8714475..25c4e90 100644
--- a/thunar/thunar-image.h
+++ b/thunar/thunar-image.h
@@ -2,18 +2,18 @@
/*-
* Copyright (c) 2009 Jannis Pohlmann <jannis at xfce.org>
*
- * This program is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
+ * published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the Free
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the Free
* Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
diff --git a/thunar/thunar-io-jobs-util.c b/thunar/thunar-io-jobs-util.c
index 5ea3da0..2a3a47b 100644
--- a/thunar/thunar-io-jobs-util.c
+++ b/thunar/thunar-io-jobs-util.c
@@ -68,7 +68,7 @@ thunar_io_jobs_util_next_duplicate_file (ThunarJob *job,
gchar *display_name;
gchar *file_basename;
gchar *dot = NULL;
-
+
_thunar_return_val_if_fail (THUNAR_IS_JOB (job), NULL);
_thunar_return_val_if_fail (G_IS_FILE (file), NULL);
_thunar_return_val_if_fail (0 < n, NULL);
diff --git a/thunar/thunar-io-jobs.c b/thunar/thunar-io-jobs.c
index 9d904f9..242400f 100644
--- a/thunar/thunar-io-jobs.c
+++ b/thunar/thunar-io-jobs.c
@@ -50,13 +50,13 @@ _tij_collect_nofollow (ThunarJob *job,
GList *lp;
/* recursively collect the files */
- for (lp = base_file_list;
- err == NULL && lp != NULL && !exo_job_is_cancelled (EXO_JOB (job));
+ for (lp = base_file_list;
+ err == NULL && lp != NULL && !exo_job_is_cancelled (EXO_JOB (job));
lp = lp->next)
{
/* try to scan the directory */
- child_file_list = thunar_io_scan_directory (job, lp->data,
- G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
+ child_file_list = thunar_io_scan_directory (job, lp->data,
+ G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
TRUE, unlinking, FALSE, &err);
/* prepend the new files to the existing list */
@@ -98,7 +98,7 @@ _thunar_io_jobs_create (ThunarJob *job,
gchar *display_name;
GFile *template_file;
GFileInputStream *template_stream = NULL;
-
+
_thunar_return_val_if_fail (THUNAR_IS_JOB (job), FALSE);
_thunar_return_val_if_fail (param_values != NULL, FALSE);
_thunar_return_val_if_fail (param_values->len == 2, FALSE);
@@ -124,8 +124,8 @@ _thunar_io_jobs_create (ThunarJob *job,
}
/* iterate over all files in the list */
- for (lp = file_list;
- err == NULL && lp != NULL && !exo_job_is_cancelled (EXO_JOB (job));
+ for (lp = file_list;
+ err == NULL && lp != NULL && !exo_job_is_cancelled (EXO_JOB (job));
lp = lp->next)
{
g_assert (G_IS_FILE (lp->data));
@@ -135,8 +135,8 @@ _thunar_io_jobs_create (ThunarJob *job,
again:
/* try to create the file */
- stream = g_file_create (lp->data,
- G_FILE_CREATE_NONE,
+ stream = g_file_create (lp->data,
+ G_FILE_CREATE_NONE,
exo_job_get_cancellable (EXO_JOB (job)),
&err);
@@ -176,8 +176,8 @@ again:
}
/* ask the user whether he wants to overwrite the existing file */
- response = thunar_job_ask_overwrite (THUNAR_JOB (job),
- _("The file \"%s\" already exists"),
+ response = thunar_job_ask_overwrite (THUNAR_JOB (job),
+ _("The file \"%s\" already exists"),
display_name);
/* check if we should overwrite */
@@ -187,11 +187,11 @@ again:
if (g_file_delete (lp->data, exo_job_get_cancellable (EXO_JOB (job)), &err))
goto again;
}
-
+
/* clean up */
g_free (display_name);
}
- else
+ else
{
/* determine display name of the file */
base_name = g_file_get_basename (lp->data);
@@ -199,7 +199,7 @@ again:
g_free (base_name);
/* ask the user whether to skip/retry this path (cancels the job if not) */
- response = thunar_job_ask_skip (THUNAR_JOB (job),
+ response = thunar_job_ask_skip (THUNAR_JOB (job),
_("Failed to create empty file \"%s\": %s"),
display_name, err->message);
g_free (display_name);
@@ -283,7 +283,7 @@ _thunar_io_jobs_mkdir (ThunarJob *job,
/* we know the total list of files to process */
thunar_job_set_total_files (THUNAR_JOB (job), file_list);
- for (lp = file_list;
+ for (lp = file_list;
err == NULL && lp != NULL && !exo_job_is_cancelled (EXO_JOB (job));
lp = lp->next)
{
@@ -330,7 +330,7 @@ again:
}
/* ask the user whether he wants to overwrite the existing file */
- response = thunar_job_ask_overwrite (THUNAR_JOB (job),
+ response = thunar_job_ask_overwrite (THUNAR_JOB (job),
_("The file \"%s\" already exists"),
display_name);
@@ -353,7 +353,7 @@ again:
g_free (base_name);
/* ask the user whether to skip/retry this path (cancels the job if not) */
- response = thunar_job_ask_skip (THUNAR_JOB (job),
+ response = thunar_job_ask_skip (THUNAR_JOB (job),
_("Failed to create directory \"%s\": %s"),
display_name, err->message);
g_free (display_name);
@@ -381,7 +381,7 @@ again:
/* emit the "new-files" signal with the given file list */
thunar_job_new_files (THUNAR_JOB (job), file_list);
-
+
return TRUE;
}
@@ -465,10 +465,10 @@ again:
else
{
/* query the file info for the display name */
- info = g_file_query_info (lp->data,
+ info = g_file_query_info (lp->data,
G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME,
- G_FILE_QUERY_INFO_NONE,
- exo_job_get_cancellable (EXO_JOB (job)),
+ G_FILE_QUERY_INFO_NONE,
+ exo_job_get_cancellable (EXO_JOB (job)),
NULL);
/* abort if the job was cancelled */
@@ -492,8 +492,8 @@ again:
}
/* ask the user whether he wants to skip this file */
- response = thunar_job_ask_skip (THUNAR_JOB (job),
- _("Could not delete file \"%s\": %s"),
+ response = thunar_job_ask_skip (THUNAR_JOB (job),
+ _("Could not delete file \"%s\": %s"),
display_name, err->message);
g_free (display_name);
@@ -539,9 +539,9 @@ thunar_io_jobs_move_files (GList *source_file_list,
_thunar_return_val_if_fail (target_file_list != NULL, NULL);
_thunar_return_val_if_fail (g_list_length (source_file_list) == g_list_length (target_file_list), NULL);
- job = thunar_transfer_job_new (source_file_list, target_file_list,
+ job = thunar_transfer_job_new (source_file_list, target_file_list,
THUNAR_TRANSFER_JOB_MOVE);
-
+
return THUNAR_JOB (exo_job_launch (EXO_JOB (job)));
}
@@ -606,7 +606,7 @@ _thunar_io_jobs_link_file (ThunarJob *job,
if (!g_file_equal (source_file, target_file))
{
/* try to create the symlink */
- if (g_file_make_symbolic_link (target_file, source_path,
+ if (g_file_make_symbolic_link (target_file, source_path,
exo_job_get_cancellable (EXO_JOB (job)),
&err))
{
@@ -639,7 +639,7 @@ _thunar_io_jobs_link_file (ThunarJob *job,
/* return the real target file */
return duplicate_file;
}
-
+
/* release the duplicate file, we no longer need it */
g_object_unref (duplicate_file);
}
@@ -668,7 +668,7 @@ _thunar_io_jobs_link_file (ThunarJob *job,
/* try to delete the file */
if (response == THUNAR_JOB_RESPONSE_YES)
{
- /* try to remove the target file. if not possible, err will be set and
+ /* try to remove the target file. if not possible, err will be set and
* the while loop will be aborted */
g_file_delete (target_file, exo_job_get_cancellable (EXO_JOB (job)), &err);
}
@@ -740,16 +740,16 @@ _thunar_io_jobs_link (ThunarJob *job,
/* queue the file for the folder update unless it was skipped */
if (sp->data != real_target_file)
{
- new_files_list = thunar_g_file_list_prepend (new_files_list,
+ new_files_list = thunar_g_file_list_prepend (new_files_list,
real_target_file);
/* notify the thumbnail cache that we need to copy the original
* thumbnail for the symlink to have one too */
- thunar_thumbnail_cache_copy_file (thumbnail_cache, sp->data,
+ thunar_thumbnail_cache_copy_file (thumbnail_cache, sp->data,
real_target_file);
}
-
+
/* release the real target file */
g_object_unref (real_target_file);
}
@@ -863,7 +863,7 @@ thunar_io_jobs_restore_files (GList *source_file_list,
_thunar_return_val_if_fail (target_file_list != NULL, NULL);
_thunar_return_val_if_fail (g_list_length (source_file_list) == g_list_length (target_file_list), NULL);
- job = thunar_transfer_job_new (source_file_list, target_file_list,
+ job = thunar_transfer_job_new (source_file_list, target_file_list,
THUNAR_TRANSFER_JOB_MOVE);
return THUNAR_JOB (exo_job_launch (EXO_JOB (job)));
@@ -920,7 +920,7 @@ _thunar_io_jobs_chown (ThunarJob *job,
thunar_job_processing_file (THUNAR_JOB (job), lp);
/* try to query information about the file */
- info = g_file_query_info (lp->data,
+ info = g_file_query_info (lp->data,
G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME,
G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
exo_job_get_cancellable (EXO_JOB (job)),
@@ -953,11 +953,11 @@ retry_chown:
if (err != NULL && !exo_job_is_cancelled (EXO_JOB (job)))
{
/* generate a useful error message */
- message = G_LIKELY (uid >= 0) ? _("Failed to change the owner of \"%s\": %s")
+ message = G_LIKELY (uid >= 0) ? _("Failed to change the owner of \"%s\": %s")
: _("Failed to change the group of \"%s\": %s");
/* ask the user whether to skip/retry this file */
- response = thunar_job_ask_skip (THUNAR_JOB (job), message,
+ response = thunar_job_ask_skip (THUNAR_JOB (job), message,
g_file_info_get_display_name (info),
err->message);
@@ -1062,7 +1062,7 @@ _thunar_io_jobs_chmod (ThunarJob *job,
thunar_job_processing_file (THUNAR_JOB (job), lp);
/* try to query information about the file */
- info = g_file_query_info (lp->data,
+ info = g_file_query_info (lp->data,
G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME ","
G_FILE_ATTRIBUTE_STANDARD_TYPE ","
G_FILE_ATTRIBUTE_UNIX_MODE,
@@ -1089,7 +1089,7 @@ retry_chown:
/* determine the current mode */
old_mode = g_file_info_get_attribute_uint32 (info, G_FILE_ATTRIBUTE_UNIX_MODE);
- /* generate the new mode, taking the old mode (which contains file type
+ /* generate the new mode, taking the old mode (which contains file type
* information) into account */
new_mode = ((old_mode & ~mask) | mode) & 07777;
@@ -1108,7 +1108,7 @@ retry_chown:
{
/* ask the user whether to skip/retry this file */
response = thunar_job_ask_skip (job,
- _("Failed to change the permissions of \"%s\": %s"),
+ _("Failed to change the permissions of \"%s\": %s"),
g_file_info_get_display_name (info),
err->message);
@@ -1190,7 +1190,7 @@ _thunar_io_jobs_ls (ThunarJob *job,
/* collect directory contents (non-recursively) */
file_list = thunar_io_scan_directory (job, directory,
- G_FILE_QUERY_INFO_NONE,
+ G_FILE_QUERY_INFO_NONE,
FALSE, FALSE, TRUE, &err);
/* abort on errors or cancellation */
@@ -1216,7 +1216,7 @@ _thunar_io_jobs_ls (ThunarJob *job,
thunar_g_file_list_free (file_list);
}
}
-
+
/* there should be no errors here */
_thunar_assert (err == NULL);
@@ -1236,7 +1236,7 @@ ThunarJob *
thunar_io_jobs_list_directory (GFile *directory)
{
_thunar_return_val_if_fail (G_IS_FILE (directory), NULL);
-
+
return thunar_simple_job_launch (_thunar_io_jobs_ls, 1, G_TYPE_FILE, directory);
}
@@ -1284,8 +1284,8 @@ _thunar_io_jobs_rename (ThunarJob *job,
/* try to rename the file */
if (thunar_file_rename (file, display_name, exo_job_get_cancellable (EXO_JOB (job)), TRUE, &err))
{
- exo_job_send_to_mainloop (EXO_JOB (job),
- (GSourceFunc) _thunar_io_jobs_rename_notify,
+ exo_job_send_to_mainloop (EXO_JOB (job),
+ (GSourceFunc) _thunar_io_jobs_rename_notify,
g_object_ref (file), g_object_unref);
}
@@ -1308,7 +1308,7 @@ thunar_io_jobs_rename_file (ThunarFile *file,
_thunar_return_val_if_fail (THUNAR_IS_FILE (file), NULL);
_thunar_return_val_if_fail (g_utf8_validate (display_name, -1, NULL), NULL);
- return thunar_simple_job_launch (_thunar_io_jobs_rename, 2,
- THUNAR_TYPE_FILE, file,
+ return thunar_simple_job_launch (_thunar_io_jobs_rename, 2,
+ THUNAR_TYPE_FILE, file,
G_TYPE_STRING, display_name);
}
diff --git a/thunar/thunar-io-scan-directory.c b/thunar/thunar-io-scan-directory.c
index 66ddbdf..8f81724 100644
--- a/thunar/thunar-io-scan-directory.c
+++ b/thunar/thunar-io-scan-directory.c
@@ -52,7 +52,7 @@ thunar_io_scan_directory (ThunarJob *job,
const gchar *namespace;
ThunarFile *thunar_file;
gboolean is_mounted;
-
+
_thunar_return_val_if_fail (THUNAR_IS_JOB (job), NULL);
_thunar_return_val_if_fail (G_IS_FILE (file), NULL);
_thunar_return_val_if_fail (error == NULL || *error == NULL, NULL);
@@ -61,8 +61,8 @@ thunar_io_scan_directory (ThunarJob *job,
if (exo_job_set_error_if_cancelled (EXO_JOB (job), error))
return NULL;
- /* don't recurse when we are scanning prior to unlinking and the current
- * file/dir is in the trash. In GVfs, only the top-level directories in
+ /* don't recurse when we are scanning prior to unlinking and the current
+ * file/dir is in the trash. In GVfs, only the top-level directories in
* the trash can be modified and deleted directly. See
* http://bugzilla.xfce.org/show_bug.cgi?id=7147
* for more information */
@@ -108,7 +108,7 @@ thunar_io_scan_directory (ThunarJob *job,
{
/* query info of the child */
info = g_file_enumerator_next_file (enumerator,
- exo_job_get_cancellable (EXO_JOB (job)),
+ exo_job_get_cancellable (EXO_JOB (job)),
&err);
if (G_UNLIKELY (info == NULL))
@@ -150,10 +150,10 @@ thunar_io_scan_directory (ThunarJob *job,
&& is_mounted
&& g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY)
{
- child_files = thunar_io_scan_directory (job, child_file, flags, recursively,
+ child_files = thunar_io_scan_directory (job, child_file, flags, recursively,
unlinking, return_thunar_files, &err);
- /* prepend children to the file list to make sure they're
+ /* prepend children to the file list to make sure they're
* processed first (required for unlinking) */
files = g_list_concat (child_files, files);
}
@@ -177,6 +177,6 @@ thunar_io_scan_directory (ThunarJob *job,
thunar_g_file_list_free (files);
return NULL;
}
-
+
return files;
}
diff --git a/thunar/thunar-job.c b/thunar/thunar-job.c
index aa84cb3..2b2b3ff 100644
--- a/thunar/thunar-job.c
+++ b/thunar/thunar-job.c
@@ -2,18 +2,18 @@
/*-
* Copyright (c) 2009-2011 Jannis Pohlmann <jannis at xfce.org>
*
- * This program is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
+ * published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the Free
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the Free
* Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
@@ -148,7 +148,7 @@ thunar_job_class_init (ThunarJobClass *klass)
G_STRUCT_OFFSET (ThunarJobClass, ask_replace),
_thunar_job_ask_accumulator, NULL,
_thunar_marshal_FLAGS__OBJECT_OBJECT,
- THUNAR_TYPE_JOB_RESPONSE,
+ THUNAR_TYPE_JOB_RESPONSE,
2, THUNAR_TYPE_FILE, THUNAR_TYPE_FILE);
/**
@@ -157,9 +157,9 @@ thunar_job_class_init (ThunarJobClass *klass)
* @file_list : a list of #ThunarFile<!---->s.
*
* This signal is used by #ThunarJob<!---->s returned by
- * the thunar_io_jobs_list_directory() function whenever
- * there's a bunch of #ThunarFile<!---->s ready. This signal
- * is garantied to be never emitted with an @file_list
+ * the thunar_io_jobs_list_directory() function whenever
+ * there's a bunch of #ThunarFile<!---->s ready. This signal
+ * is garantied to be never emitted with an @file_list
* parameter of %NULL.
*
* To allow some further optimizations on the handler-side,
@@ -225,7 +225,7 @@ thunar_job_finalize (GObject *object)
-static ThunarJobResponse
+static ThunarJobResponse
thunar_job_real_ask (ThunarJob *job,
const gchar *message,
ThunarJobResponse choices)
@@ -239,7 +239,7 @@ thunar_job_real_ask (ThunarJob *job,
-static ThunarJobResponse
+static ThunarJobResponse
thunar_job_real_ask_replace (ThunarJob *job,
ThunarFile *source_file,
ThunarFile *target_file)
@@ -284,13 +284,13 @@ _thunar_job_ask_valist (ThunarJob *job,
_thunar_return_val_if_fail (THUNAR_IS_JOB (job), THUNAR_JOB_RESPONSE_CANCEL);
_thunar_return_val_if_fail (g_utf8_validate (format, -1, NULL), THUNAR_JOB_RESPONSE_CANCEL);
-
+
/* generate the dialog message */
text = g_strdup_vprintf (format, var_args);
- message = (question != NULL)
- ? g_strconcat (text, ".\n\n", question, NULL)
+ message = (question != NULL)
+ ? g_strconcat (text, ".\n\n", question, NULL)
: g_strconcat (text, ".", NULL);
- g_free (text);
+ g_free (text);
/* send the question and wait for the answer */
exo_job_emit (EXO_JOB (job), job_signals[ASK], 0, message, choices, &response);
@@ -332,7 +332,7 @@ thunar_job_ask_overwrite (ThunarJob *job,
va_start (var_args, format);
response = _thunar_job_ask_valist (job, format, var_args,
_("Do you want to overwrite it?"),
- THUNAR_JOB_RESPONSE_YES
+ THUNAR_JOB_RESPONSE_YES
| THUNAR_JOB_RESPONSE_YES_ALL
| THUNAR_JOB_RESPONSE_NO
| THUNAR_JOB_RESPONSE_NO_ALL
@@ -386,7 +386,7 @@ thunar_job_ask_create (ThunarJob *job,
va_start (var_args, format);
response = _thunar_job_ask_valist (job, format, var_args,
_("Do you want to create it?"),
- THUNAR_JOB_RESPONSE_YES
+ THUNAR_JOB_RESPONSE_YES
| THUNAR_JOB_RESPONSE_CANCEL);
va_end (var_args);
@@ -405,7 +405,7 @@ thunar_job_ask_create (ThunarJob *job,
-ThunarJobResponse
+ThunarJobResponse
thunar_job_ask_replace (ThunarJob *job,
GFile *source_path,
GFile *target_path,
@@ -443,7 +443,7 @@ thunar_job_ask_replace (ThunarJob *job,
return THUNAR_JOB_RESPONSE_NO;
}
- exo_job_emit (EXO_JOB (job), job_signals[ASK_REPLACE], 0,
+ exo_job_emit (EXO_JOB (job), job_signals[ASK_REPLACE], 0,
source_file, target_file, &response);
g_object_unref (source_file);
@@ -465,14 +465,14 @@ thunar_job_ask_replace (ThunarJob *job,
-ThunarJobResponse
+ThunarJobResponse
thunar_job_ask_skip (ThunarJob *job,
const gchar *format,
...)
{
ThunarJobResponse response;
va_list var_args;
-
+
_thunar_return_val_if_fail (THUNAR_IS_JOB (job), THUNAR_JOB_RESPONSE_CANCEL);
_thunar_return_val_if_fail (format != NULL, THUNAR_JOB_RESPONSE_CANCEL);
@@ -488,7 +488,7 @@ thunar_job_ask_skip (ThunarJob *job,
va_start (var_args, format);
response = _thunar_job_ask_valist (job, format, var_args,
_("Do you want to skip it?"),
- THUNAR_JOB_RESPONSE_YES
+ THUNAR_JOB_RESPONSE_YES
| THUNAR_JOB_RESPONSE_YES_ALL
| THUNAR_JOB_RESPONSE_CANCEL
| THUNAR_JOB_RESPONSE_RETRY);
diff --git a/thunar/thunar-location-button.c b/thunar/thunar-location-button.c
index f7eb4e5..efeb9ff 100644
--- a/thunar/thunar-location-button.c
+++ b/thunar/thunar-location-button.c
@@ -132,7 +132,7 @@ struct _ThunarLocationButton
/* the current icon state (i.e. accepting drops) */
ThunarFileIconState file_icon_state;
-
+
/* enter folders using DnD */
guint enter_timeout_id;
@@ -395,7 +395,7 @@ thunar_location_button_file_changed (ThunarLocationButton *location_button,
/* TODO: listen for icon theme changes */
/* update and show the label widget (hide for the local root folder) */
- if (thunar_file_is_local (file) && thunar_file_is_root (file))
+ if (thunar_file_is_local (file) && thunar_file_is_root (file))
{
/* hide the label would otherwise show up */
gtk_widget_hide (location_button->label);
diff --git a/thunar/thunar-location-buttons.c b/thunar/thunar-location-buttons.c
index 23b49b2..53da5cd 100644
--- a/thunar/thunar-location-buttons.c
+++ b/thunar/thunar-location-buttons.c
@@ -1283,9 +1283,9 @@ thunar_location_buttons_action_create_folder (GtkAction *action,
return;
/* ask the user to enter a name for the new folder */
- name = thunar_show_create_dialog (GTK_WIDGET (buttons),
- "inode/directory",
- _("New Folder"),
+ name = thunar_show_create_dialog (GTK_WIDGET (buttons),
+ "inode/directory",
+ _("New Folder"),
_("Create New Folder"));
if (G_LIKELY (name != NULL))
{
diff --git a/thunar/thunar-location-entry.c b/thunar/thunar-location-entry.c
index c190407..fff18e1 100644
--- a/thunar/thunar-location-entry.c
+++ b/thunar/thunar-location-entry.c
@@ -3,18 +3,18 @@
* Copyright (c) 2005-2006 Benedikt Meurer <benny at xfce.org>
* Copyright (c) 2009-2010 Jannis Pohlmann <jannis at xfce.org>
*
- * This program is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
+ * published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the Free
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the Free
* Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
@@ -245,7 +245,7 @@ thunar_location_entry_set_property (GObject *object,
{
case PROP_CURRENT_DIRECTORY:
thunar_navigator_set_current_directory (THUNAR_NAVIGATOR (object), g_value_get_object (value));
- thunar_path_entry_set_working_directory (THUNAR_PATH_ENTRY (entry->path_entry),
+ thunar_path_entry_set_working_directory (THUNAR_PATH_ENTRY (entry->path_entry),
entry->current_directory);
break;
@@ -339,7 +339,7 @@ thunar_location_entry_open_or_launch (ThunarLocationEntry *location_entry,
/* be sure to reset the current file of the path entry */
if (G_LIKELY (location_entry->current_directory != NULL))
{
- thunar_path_entry_set_current_file (THUNAR_PATH_ENTRY (location_entry->path_entry),
+ thunar_path_entry_set_current_file (THUNAR_PATH_ENTRY (location_entry->path_entry),
location_entry->current_directory);
}
}
@@ -352,8 +352,8 @@ thunar_location_entry_open_or_launch (ThunarLocationEntry *location_entry,
/* check if we need to display an error dialog */
if (error != NULL)
{
- thunar_dialogs_show_error (location_entry->path_entry, error,
- _("Failed to open \"%s\""),
+ thunar_dialogs_show_error (location_entry->path_entry, error,
+ _("Failed to open \"%s\""),
thunar_file_get_display_name (file));
g_error_free (error);
}
@@ -374,14 +374,14 @@ thunar_location_entry_poke_file_finish (ThunarBrowser *browser,
if (error == NULL)
{
/* try to open or launch the target file */
- thunar_location_entry_open_or_launch (THUNAR_LOCATION_ENTRY (browser),
+ thunar_location_entry_open_or_launch (THUNAR_LOCATION_ENTRY (browser),
target_file);
}
else
{
/* display an error explaining why we couldn't open/mount the file */
thunar_dialogs_show_error (THUNAR_LOCATION_ENTRY (browser)->path_entry,
- error, _("Failed to open \"%s\""),
+ error, _("Failed to open \"%s\""),
thunar_file_get_display_name (file));
}
}
diff --git a/thunar/thunar-misc-jobs.c b/thunar/thunar-misc-jobs.c
index 373e2f5..506ec2c 100644
--- a/thunar/thunar-misc-jobs.c
+++ b/thunar/thunar-misc-jobs.c
@@ -70,7 +70,7 @@ _thunar_misc_jobs_load_templates (ThunarJob *job,
if (files == NULL || exo_job_is_cancelled (EXO_JOB (job)))
{
- g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND,
+ g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND,
_("No templates installed"));
return FALSE;
diff --git a/thunar/thunar-navigator.c b/thunar/thunar-navigator.c
index e5b5707..ff3e761 100644
--- a/thunar/thunar-navigator.c
+++ b/thunar/thunar-navigator.c
@@ -67,7 +67,7 @@ thunar_navigator_get_type (void)
type = g_type_register_static (G_TYPE_INTERFACE, I_("ThunarNavigator"), &info, 0);
g_type_interface_add_prerequisite (type, G_TYPE_OBJECT);
-
+
g_once_init_leave (&type__volatile, type);
}
diff --git a/thunar/thunar-path-entry.c b/thunar/thunar-path-entry.c
index d627799..56780f0 100644
--- a/thunar/thunar-path-entry.c
+++ b/thunar/thunar-path-entry.c
@@ -3,18 +3,18 @@
* Copyright (c) 2005-2006 Benedikt Meurer <benny at xfce.org>
* Copyright (c) 2009-2010 Jannis Pohlmann <jannis at xfce.org>
*
- * This program is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
+ * published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the Free
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the Free
* Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*
@@ -62,11 +62,11 @@ enum
static void thunar_path_entry_editable_init (GtkEditableInterface *iface);
static void thunar_path_entry_finalize (GObject *object);
-static void thunar_path_entry_get_property (GObject *object,
+static void thunar_path_entry_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec);
-static void thunar_path_entry_set_property (GObject *object,
+static void thunar_path_entry_set_property (GObject *object,
guint prop_id,
const GValue *value,
GParamSpec *pspec);
@@ -310,7 +310,7 @@ thunar_path_entry_finalize (GObject *object)
static void
-thunar_path_entry_get_property (GObject *object,
+thunar_path_entry_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec)
@@ -332,7 +332,7 @@ thunar_path_entry_get_property (GObject *object,
static void
-thunar_path_entry_set_property (GObject *object,
+thunar_path_entry_set_property (GObject *object,
guint prop_id,
const GValue *value,
GParamSpec *pspec)
@@ -841,7 +841,7 @@ thunar_path_entry_common_prefix_lookup (ThunarPathEntry *path_entry,
model = gtk_entry_completion_get_model (gtk_entry_get_completion (GTK_ENTRY (path_entry)));
if (gtk_tree_model_get_iter_first (model, &iter))
{
- do
+ do
{
/* determine the real file name for the iter */
gtk_tree_model_get (model, &iter, THUNAR_COLUMN_FILE_NAME, &name, -1);
@@ -854,7 +854,7 @@ thunar_path_entry_common_prefix_lookup (ThunarPathEntry *path_entry,
{
/* remember the prefix */
*prefix_return = g_strdup (name);
-
+
/* determine the file for the iter */
gtk_tree_model_get (model, &iter, THUNAR_COLUMN_FILE, file_return, -1);
}
@@ -966,7 +966,7 @@ thunar_path_entry_match_selected (GtkEntryCompletion *completion,
/* determine the file for the iterator */
gtk_tree_model_get (model, iter, THUNAR_COLUMN_FILE, &file, -1);
-
+
/* determine the real name for the file */
gtk_tree_model_get (model, iter, THUNAR_COLUMN_FILE_NAME, &real_name, -1);
@@ -1119,7 +1119,7 @@ thunar_path_entry_check_completion_idle_destroy (gpointer user_data)
/**
* thunar_path_entry_new:
- *
+ *
* Allocates a new #ThunarPathEntry instance.
*
* Return value: the newly allocated #ThunarPathEntry.
diff --git a/thunar/thunar-path-entry.h b/thunar/thunar-path-entry.h
index 0baa21a..41bbb8f 100644
--- a/thunar/thunar-path-entry.h
+++ b/thunar/thunar-path-entry.h
@@ -3,18 +3,18 @@
* Copyright (c) 2005 Benedikt Meurer <benny at xfce.org>
* Copyright (c) 2010 Benedikt Meurer <benny at xfce.org>
*
- * This program is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
+ * published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the Free
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the Free
* Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
diff --git a/thunar/thunar-progress-dialog.c b/thunar/thunar-progress-dialog.c
index af80b0d..1a87a38 100644
--- a/thunar/thunar-progress-dialog.c
+++ b/thunar/thunar-progress-dialog.c
@@ -2,18 +2,18 @@
/*-
* Copyright (c) 2009-2010 Jannis Pohlmann <jannis at xfce.org>
*
- * This program is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
+ * published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the Free
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the Free
* Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
@@ -38,7 +38,7 @@ static void thunar_progress_dialog_dispose (GObject
static void thunar_progress_dialog_finalize (GObject *object);
static void thunar_progress_dialog_shown (ThunarProgressDialog *dialog);
static gboolean thunar_progress_dialog_closed (ThunarProgressDialog *dialog);
-static gboolean thunar_progress_dialog_toggled (ThunarProgressDialog *dialog,
+static gboolean thunar_progress_dialog_toggled (ThunarProgressDialog *dialog,
GdkEventButton *button,
GtkStatusIcon *status_icon);
static void thunar_progress_dialog_update_status_icon (ThunarProgressDialog *dialog);
@@ -98,10 +98,10 @@ thunar_progress_dialog_init (ThunarProgressDialog *dialog)
gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), FALSE);
gtk_window_set_type_hint (GTK_WINDOW (dialog), GDK_WINDOW_TYPE_HINT_DIALOG);
- g_signal_connect_swapped (dialog, "show",
+ g_signal_connect_swapped (dialog, "show",
G_CALLBACK (thunar_progress_dialog_shown), dialog);
- g_signal_connect (dialog, "delete-event",
+ g_signal_connect (dialog, "delete-event",
G_CALLBACK (thunar_progress_dialog_closed), dialog);
dialog->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
@@ -188,7 +188,7 @@ thunar_progress_dialog_toggled (ThunarProgressDialog *dialog,
_thunar_return_val_if_fail (GTK_IS_STATUS_ICON (status_icon), FALSE);
/* check if the window is visible and has the focus */
- if (gtk_widget_get_visible (GTK_WIDGET (dialog))
+ if (gtk_widget_get_visible (GTK_WIDGET (dialog))
&& gtk_window_is_active (GTK_WINDOW (dialog)))
{
/* remember the position of the dialog */
@@ -259,7 +259,7 @@ thunar_progress_dialog_job_finished (ThunarProgressDialog *dialog,
gtk_widget_destroy (dialog->scrollwin);
}
- /* check if we have less than SCROLLVIEW_THRESHOLD views
+ /* check if we have less than SCROLLVIEW_THRESHOLD views
* and need to shrink the window */
if (n_views < SCROLLVIEW_THRESHOLD)
{
@@ -296,9 +296,9 @@ thunar_progress_dialog_update_status_icon (ThunarProgressDialog *dialog)
n_views = g_list_length (dialog->views);
/* build the tooltip text */
- tooltip_text = g_strdup_printf (ngettext ("%d file operation running",
+ tooltip_text = g_strdup_printf (ngettext ("%d file operation running",
"%d file operations running",
- n_views),
+ n_views),
n_views);
/* update the tooltip */
@@ -347,13 +347,13 @@ thunar_progress_dialog_add_job (ThunarProgressDialog *dialog,
/* add the view to the list of known views */
dialog->views = g_list_prepend (dialog->views, view);
- /* check if we need to wrap the views in a scroll window (starting
+ /* check if we need to wrap the views in a scroll window (starting
* at SCROLLVIEW_THRESHOLD parallel operations */
if (g_list_length (dialog->views) == SCROLLVIEW_THRESHOLD)
{
/* create a scrolled window and add it to the dialog */
dialog->scrollwin = gtk_scrolled_window_new (NULL, NULL);
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (dialog->scrollwin),
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (dialog->scrollwin),
GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
gtk_container_add (GTK_CONTAINER (dialog->vbox), dialog->scrollwin);
gtk_widget_show (dialog->scrollwin);
@@ -369,7 +369,7 @@ thunar_progress_dialog_add_job (ThunarProgressDialog *dialog,
gtk_widget_reparent (dialog->content_box, viewport);
}
- g_signal_connect_swapped (view, "need-attention",
+ g_signal_connect_swapped (view, "need-attention",
G_CALLBACK (thunar_progress_dialog_view_needs_attention), dialog);
g_signal_connect_swapped (view, "finished",
diff --git a/thunar/thunar-progress-dialog.h b/thunar/thunar-progress-dialog.h
index 335fa62..04e148d 100644
--- a/thunar/thunar-progress-dialog.h
+++ b/thunar/thunar-progress-dialog.h
@@ -2,18 +2,18 @@
/*-
* Copyright (c) 2009 Jannis Pohlmann <jannis at xfce.org>
*
- * This program is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
+ * published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the Free
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the Free
* Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
diff --git a/thunar/thunar-progress-view.c b/thunar/thunar-progress-view.c
index 4a5814c..96b7129 100644
--- a/thunar/thunar-progress-view.c
+++ b/thunar/thunar-progress-view.c
@@ -232,7 +232,7 @@ thunar_progress_view_init (ThunarProgressView *view)
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, TRUE, 0);
gtk_widget_set_can_focus (button, FALSE);
gtk_widget_show (button);
-
+
image = gtk_image_new_from_icon_name ("process-stop", GTK_ICON_SIZE_BUTTON);
gtk_container_add (GTK_CONTAINER (button), image);
gtk_widget_show (image);
diff --git a/thunar/thunar-properties-dialog.h b/thunar/thunar-properties-dialog.h
index 54890b3..f45ed89 100644
--- a/thunar/thunar-properties-dialog.h
+++ b/thunar/thunar-properties-dialog.h
@@ -38,10 +38,10 @@ GType thunar_properties_dialog_get_type (void) G_GNUC_CONST;
GtkWidget *thunar_properties_dialog_new (GtkWindow *parent);
-void thunar_properties_dialog_set_files (ThunarPropertiesDialog *dialog,
+void thunar_properties_dialog_set_files (ThunarPropertiesDialog *dialog,
GList *files);
-void thunar_properties_dialog_set_file (ThunarPropertiesDialog *dialog,
+void thunar_properties_dialog_set_file (ThunarPropertiesDialog *dialog,
ThunarFile *file);
G_END_DECLS;
diff --git a/thunar/thunar-renamer-dialog.c b/thunar/thunar-renamer-dialog.c
index 08716bb..5cbffe7 100644
--- a/thunar/thunar-renamer-dialog.c
+++ b/thunar/thunar-renamer-dialog.c
@@ -1479,7 +1479,7 @@ thunar_renamer_dialog_drag_motion (GtkWidget *tree_view,
/* we cannot handle the drop */
return FALSE;
}
-
+
/* compute the drop position */
if (gtk_tree_view_get_dest_row_at_pos (GTK_TREE_VIEW (tree_view), x, y, &path, &position))
{
@@ -1538,10 +1538,10 @@ thunar_renamer_dialog_drag_drop (GtkWidget *tree_view,
GtkTreeViewDropPosition drop_pos;
gint position = -1;
GList *rows;
-
+
_thunar_return_val_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog), FALSE);
_thunar_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), FALSE);
-
+
/* determine the drop target */
target = gtk_drag_dest_find_target (tree_view, context, NULL);
if (G_LIKELY (target == gdk_atom_intern_static_string ("text/uri-list")))
@@ -1589,7 +1589,7 @@ thunar_renamer_dialog_drag_drop (GtkWidget *tree_view,
return TRUE;
}
-
+
static void
diff --git a/thunar/thunar-renamer-model.c b/thunar/thunar-renamer-model.c
index 33e5174..aeb3ea0 100644
--- a/thunar/thunar-renamer-model.c
+++ b/thunar/thunar-renamer-model.c
@@ -1015,7 +1015,7 @@ thunar_renamer_model_cmp_array (gconstpointer pointer_a,
{
const SortTuple *a = pointer_a;
const SortTuple *b = pointer_b;
-
+
if (G_UNLIKELY (a->position == b->position))
/* return the sort order for the 'moved' items in the list */
return a->offset - b->offset;
@@ -1333,7 +1333,7 @@ thunar_renamer_model_insert (ThunarRenamerModel *renamer_model,
* @tree_paths : the list of #GtkTreePath that need to be moved to
* @position.
* @position : the new position for the list of paths.
- *
+ *
* Reorder the treepaths in the model to their new postion in the list
* and sends an update to the treeview to reorder the list.
**/
@@ -1424,7 +1424,7 @@ thunar_renamer_model_reorder (ThunarRenamerModel *renamer_model,
/* invalidate all items */
thunar_renamer_model_invalidate_all (renamer_model);
-
+
/* cleanup if we used the heap */
if (G_UNLIKELY (n_items >= 500))
g_free (sort_array);
diff --git a/thunar/thunar-renamer-pair.c b/thunar/thunar-renamer-pair.c
index 2548f3f..7529687 100644
--- a/thunar/thunar-renamer-pair.c
+++ b/thunar/thunar-renamer-pair.c
@@ -142,7 +142,7 @@ thunar_renamer_pair_list_copy (GList *renamer_pair_list)
return result;
}
-
+
/**
diff --git a/thunar/thunar-sendto-model.c b/thunar/thunar-sendto-model.c
index 1eaefb8..b95b82c 100644
--- a/thunar/thunar-sendto-model.c
+++ b/thunar/thunar-sendto-model.c
@@ -153,7 +153,7 @@ thunar_sendto_model_load (ThunarSendtoModel *sendto_model)
if (G_LIKELY (app_info != NULL))
{
/* add to our handler list, sorted by their desktop-ids (reverse order) */
- sendto_model->handlers = g_list_insert_sorted (sendto_model->handlers,
+ sendto_model->handlers = g_list_insert_sorted (sendto_model->handlers,
G_APP_INFO (app_info),
(GCompareFunc) g_app_info_compare);
@@ -233,8 +233,8 @@ thunar_sendto_model_get_default (void)
* thunar_sendto_model_get_matching:
* @sendto_model : a #ThunarSendtoModel.
* @files : a #GList of #ThunarFile<!---->s.
- *
- * Returns the list of #GAppInfo<!---->s for the "Send To" targets that
+ *
+ * Returns the list of #GAppInfo<!---->s for the "Send To" targets that
* support the specified @files.
*
* The returned list is owned by the caller and must be freed when no
diff --git a/thunar/thunar-shortcuts-icon-renderer.c b/thunar/thunar-shortcuts-icon-renderer.c
index 2fd839f..879e292 100644
--- a/thunar/thunar-shortcuts-icon-renderer.c
+++ b/thunar/thunar-shortcuts-icon-renderer.c
@@ -236,7 +236,7 @@ thunar_shortcuts_icon_renderer_render (GtkCellRenderer *renderer,
else
gicon = thunar_device_get_icon (shortcuts_icon_renderer->device);
- icon_info = gtk_icon_theme_lookup_by_gicon (icon_theme, gicon, cell_area->width,
+ icon_info = gtk_icon_theme_lookup_by_gicon (icon_theme, gicon, cell_area->width,
GTK_ICON_LOOKUP_USE_BUILTIN |
GTK_ICON_LOOKUP_FORCE_SIZE);
g_object_unref (gicon);
diff --git a/thunar/thunar-simple-job.c b/thunar/thunar-simple-job.c
index 87b68c9..2d0233a 100644
--- a/thunar/thunar-simple-job.c
+++ b/thunar/thunar-simple-job.c
@@ -122,7 +122,7 @@ thunar_simple_job_execute (ExoJob *job,
{
g_assert (err != NULL || exo_job_is_cancelled (job));
- /* set error if the job was cancelled. otherwise just propagate
+ /* set error if the job was cancelled. otherwise just propagate
* the results of the processing function */
if (exo_job_set_error_if_cancelled (job, error))
{
diff --git a/thunar/thunar-simple-job.h b/thunar/thunar-simple-job.h
index 336c735..83e5b86 100644
--- a/thunar/thunar-simple-job.h
+++ b/thunar/thunar-simple-job.h
@@ -28,7 +28,7 @@ G_BEGIN_DECLS
/**
* ThunarSimpleJobFunc:
* @job : a #ThunarJob.
- * @param_values : a #GArray of the #GValue<!---->s passed to
+ * @param_values : a #GArray of the #GValue<!---->s passed to
* thunar_simple_job_launch().
* @error : return location for errors.
*
diff --git a/thunar/thunar-size-label.c b/thunar/thunar-size-label.c
index 40fc4fe..2f32913 100644
--- a/thunar/thunar-size-label.c
+++ b/thunar/thunar-size-label.c
@@ -414,7 +414,7 @@ thunar_size_label_status_update (ThunarDeepCountJob *job,
size_string = g_format_size_full (total_size, size_label->file_size_binary ? G_FORMAT_SIZE_IEC_UNITS : G_FORMAT_SIZE_DEFAULT);
text = g_strdup_printf (ngettext ("%u item, totalling %s", "%u items, totalling %s", n), n, size_string);
g_free (size_string);
-
+
if (unreadable_directory_count > 0)
{
/* TRANSLATORS: this is shows if during the deep count size
@@ -423,7 +423,7 @@ thunar_size_label_status_update (ThunarDeepCountJob *job,
g_free (text);
text = unreable_text;
}
-
+
gtk_label_set_text (GTK_LABEL (size_label->label), text);
g_free (text);
}
diff --git a/thunar/thunar-standard-view-ui.xml b/thunar/thunar-standard-view-ui.xml
index 7626765..a365fe8 100644
--- a/thunar/thunar-standard-view-ui.xml
+++ b/thunar/thunar-standard-view-ui.xml
@@ -40,7 +40,7 @@
<menuitem action="restore" />
</placeholder>
</menu>
-
+
<menu action="go-menu">
<placeholder name="placeholder-go-history-actions">
<menuitem action="back" />
diff --git a/thunar/thunar-statusbar.c b/thunar/thunar-statusbar.c
index 4cf09a7..2544920 100644
--- a/thunar/thunar-statusbar.c
+++ b/thunar/thunar-statusbar.c
@@ -3,18 +3,18 @@
* Copyright (c) 2005-2006 Benedikt Meurer <benny at xfce.org>
* Copyright (c) 2011 Jannis Pohlmann <jannis at xfce.org>
*
- * This program is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
+ * published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the Free
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the Free
* Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
diff --git a/thunar/thunar-templates-action.c b/thunar/thunar-templates-action.c
index c6c9a92..b9297b8 100644
--- a/thunar/thunar-templates-action.c
+++ b/thunar/thunar-templates-action.c
@@ -182,12 +182,12 @@ item_activated (GtkWidget *item,
file = g_object_get_data (G_OBJECT (item), I_("thunar-file"));
if (G_UNLIKELY (file != NULL))
{
- g_signal_emit (G_OBJECT (templates_action),
+ g_signal_emit (G_OBJECT (templates_action),
templates_action_signals[CREATE_TEMPLATE], 0, file);
}
else
{
- g_signal_emit (G_OBJECT (templates_action),
+ g_signal_emit (G_OBJECT (templates_action),
templates_action_signals[CREATE_EMPTY_FILE], 0);
}
}
@@ -212,8 +212,8 @@ find_parent_menu (ThunarFile *file,
return NULL;
/* iterate over all dirs and menu items */
- for (lp = g_list_first (dirs), ip = g_list_first (items);
- parent_menu == NULL && lp != NULL && ip != NULL;
+ for (lp = g_list_first (dirs), ip = g_list_first (items);
+ parent_menu == NULL && lp != NULL && ip != NULL;
lp = lp->next, ip = ip->next)
{
/* check if the current dir/item is the parent of our file */
@@ -247,14 +247,14 @@ compare_files (ThunarFile *a,
/* check whether the files are equal */
if (g_file_equal (file_a, file_b))
return 0;
-
+
/* directories always come first */
- if (thunar_file_get_kind (a) == G_FILE_TYPE_DIRECTORY
+ if (thunar_file_get_kind (a) == G_FILE_TYPE_DIRECTORY
&& thunar_file_get_kind (b) != G_FILE_TYPE_DIRECTORY)
{
return -1;
}
- else if (thunar_file_get_kind (a) != G_FILE_TYPE_DIRECTORY
+ else if (thunar_file_get_kind (a) != G_FILE_TYPE_DIRECTORY
&& thunar_file_get_kind (b) == G_FILE_TYPE_DIRECTORY)
{
return 1;
@@ -335,14 +335,14 @@ thunar_templates_action_files_ready (ThunarJob *job,
/* get the icon factory */
icon_factory = thunar_icon_factory_get_default ();
- /* sort items so that directories come before files and ancestors come
+ /* sort items so that directories come before files and ancestors come
* before descendants */
files = g_list_sort (files, (GCompareFunc) compare_files);
for (lp = g_list_first (files); lp != NULL; lp = lp->next)
{
file = lp->data;
-
+
/* determine the parent menu for this file/directory */
parent_menu = find_parent_menu (file, dirs, items);
parent_menu = parent_menu == NULL ? menu : parent_menu;
@@ -358,7 +358,7 @@ thunar_templates_action_files_ready (ThunarJob *job,
item = gtk_image_menu_item_new_with_label (thunar_file_get_display_name (file));
gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), submenu);
- /* prepend the directory, its item and the parent menu it should
+ /* prepend the directory, its item and the parent menu it should
* later be added to to the respective lists */
dirs = g_list_prepend (dirs, file);
items = g_list_prepend (items, item);
@@ -374,9 +374,9 @@ thunar_templates_action_files_ready (ThunarJob *job,
/* allocate a new menu item */
item = gtk_image_menu_item_new_with_label (label);
- g_object_set_data_full (G_OBJECT (item), I_("thunar-file"),
+ g_object_set_data_full (G_OBJECT (item), I_("thunar-file"),
g_object_ref (file), g_object_unref);
- g_signal_connect (item, "activate", G_CALLBACK (item_activated),
+ g_signal_connect (item, "activate", G_CALLBACK (item_activated),
templates_action);
gtk_menu_shell_append (GTK_MENU_SHELL (parent_menu), item);
gtk_widget_show (item);
@@ -398,8 +398,8 @@ thunar_templates_action_files_ready (ThunarJob *job,
}
/* add all non-empty directory items to their parent menu */
- for (lp = items, pp = parent_menus;
- lp != NULL && pp != NULL;
+ for (lp = items, pp = parent_menus;
+ lp != NULL && pp != NULL;
lp = lp->next, pp = pp->next)
{
/* determine the submenu for this directory item */
@@ -486,7 +486,7 @@ thunar_templates_action_load_finished (ThunarJob *job,
/* add the "Empty File" item */
item = gtk_menu_item_new_with_mnemonic (_("_Empty File"));
- g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (item_activated),
+ g_signal_connect (G_OBJECT (item), "activate", G_CALLBACK (item_activated),
templates_action);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_show (item);
@@ -519,13 +519,13 @@ thunar_templates_action_menu_shown (GtkWidget *menu,
(gpointer) &templates_action->job);
g_signal_connect (templates_action->job, "files-ready",
- G_CALLBACK (thunar_templates_action_files_ready),
+ G_CALLBACK (thunar_templates_action_files_ready),
templates_action);
g_signal_connect (templates_action->job, "error",
- G_CALLBACK (thunar_templates_action_load_error),
+ G_CALLBACK (thunar_templates_action_load_error),
templates_action);
g_signal_connect (templates_action->job, "finished",
- G_CALLBACK (thunar_templates_action_load_finished),
+ G_CALLBACK (thunar_templates_action_load_finished),
templates_action);
}
}
diff --git a/thunar/thunar-thumbnail-cache.h b/thunar/thunar-thumbnail-cache.h
index dc32fc8..bdcb70b 100644
--- a/thunar/thunar-thumbnail-cache.h
+++ b/thunar/thunar-thumbnail-cache.h
@@ -2,18 +2,18 @@
/*-
* Copyright (c) 2011 Jannis Pohlmann <jannis at xfce.org>
*
- * This program is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
+ * published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the Free
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the Free
* Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
diff --git a/thunar/thunar-thumbnailer.h b/thunar/thunar-thumbnailer.h
index daed609..a733400 100644
--- a/thunar/thunar-thumbnailer.h
+++ b/thunar/thunar-thumbnailer.h
@@ -2,18 +2,18 @@
/*-
* Copyright (c) 2009-2011 Jannis Pohlmann <jannis at xfce.org>
*
- * This program is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
+ * published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the Free
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the Free
* Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
diff --git a/thunar/thunar-transfer-job.h b/thunar/thunar-transfer-job.h
index b597167..d4eeaa5 100644
--- a/thunar/thunar-transfer-job.h
+++ b/thunar/thunar-transfer-job.h
@@ -2,19 +2,19 @@
/*-
* Copyright (c) 2009 Jannis Pohlmann <jannis at xfce.org>.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*/
diff --git a/thunar/thunar-trash-action.c b/thunar/thunar-trash-action.c
index 86f7652..56302b0 100644
--- a/thunar/thunar-trash-action.c
+++ b/thunar/thunar-trash-action.c
@@ -101,7 +101,7 @@ thunar_trash_action_constructed (GObject *object)
{
ThunarTrashAction *trash_action = THUNAR_TRASH_ACTION (object);
const gchar *label;
-
+
if (trash_action->trash_bin != NULL)
label = thunar_file_get_display_name (trash_action->trash_bin);
else
@@ -145,7 +145,7 @@ thunar_trash_action_changed (ThunarTrashAction *trash_action,
thunar_icon_factory_clear_pixmap_cache (trash_bin);
/* adjust the stock icon appropriately */
- if (thunar_file_get_item_count (trash_bin) > 0)
+ if (thunar_file_get_item_count (trash_bin) > 0)
g_object_set (G_OBJECT (trash_action), "stock-id", THUNAR_STOCK_TRASH_FULL, NULL);
else
g_object_set (G_OBJECT (trash_action), "stock-id", THUNAR_STOCK_TRASH_EMPTY, NULL);
diff --git a/thunar/thunar-tree-view.c b/thunar/thunar-tree-view.c
index b5a6533..17954bb 100644
--- a/thunar/thunar-tree-view.c
+++ b/thunar/thunar-tree-view.c
@@ -1287,7 +1287,7 @@ thunar_tree_view_context_menu (ThunarTreeView *view,
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_set_sensitive (item, (file != NULL || device != NULL));
gtk_widget_show (item);
-
+
/* set the icon */
image = gtk_image_new_from_icon_name ("document-open", GTK_ICON_SIZE_MENU);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
@@ -1373,7 +1373,7 @@ thunar_tree_view_context_menu (ThunarTreeView *view,
g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_create_folder), view);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_show (item);
-
+
/* set the icon */
icon = g_themed_icon_new ("folder-new");
image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_MENU);
@@ -2150,11 +2150,11 @@ thunar_tree_view_mount_finish (ThunarDevice *device,
case OPEN_IN_WINDOW:
thunar_tree_view_open_selection_in_new_window (data->view);
break;
-
+
case OPEN_IN_TAB:
thunar_tree_view_open_selection_in_new_tab (data->view);
break;
-
+
default:
thunar_tree_view_open_selection (data->view);
break;
diff --git a/thunar/thunar-util.c b/thunar/thunar-util.c
index 0784e5c..e4a291d 100644
--- a/thunar/thunar-util.c
+++ b/thunar/thunar-util.c
@@ -3,18 +3,18 @@
* Copyright (c) 2006-2007 Benedikt Meurer <benny at xfce.org>
* Copyright (c) 2009-2010 Jannis Pohlmann <jannis at xfce.org>
*
- * This program is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
+ * published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the Free
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the Free
* Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
@@ -320,7 +320,7 @@ thunar_util_expand_filename (const gchar *filename,
/* use the homedir of the specified user */
replacement = passwd->pw_dir;
}
-
+
/* generate the filename */
return g_build_filename (replacement, slash, NULL);
}
@@ -328,12 +328,12 @@ thunar_util_expand_filename (const gchar *filename,
{
/* examine the remainder of the filename */
remainder = filename + 1;
-
+
/* transform working directory into a filename string */
if (G_LIKELY (working_directory != NULL))
{
pwd = g_file_get_path (working_directory);
-
+
/* if we only have the slash then we want the working directory only */
if (G_UNLIKELY (*remainder == '\0'))
return pwd;
@@ -554,15 +554,15 @@ thunar_util_time_from_rfc3339 (const gchar *date_string)
tm.tm_year = val - 1900;
date_string++;
tm.tm_mon = strtoul (date_string, (gchar **) &date_string, 10) - 1;
-
+
if (G_UNLIKELY (*date_string++ != '-'))
return 0;
-
+
tm.tm_mday = strtoul (date_string, (gchar **) &date_string, 10);
if (G_UNLIKELY (*date_string++ != 'T'))
return 0;
-
+
val = strtoul (date_string, (gchar **) &date_string, 10);
if (G_UNLIKELY (*date_string != ':'))
return 0;
@@ -571,10 +571,10 @@ thunar_util_time_from_rfc3339 (const gchar *date_string)
tm.tm_hour = val;
date_string++;
tm.tm_min = strtoul (date_string, (gchar **) &date_string, 10);
-
+
if (G_UNLIKELY (*date_string++ != ':'))
return 0;
-
+
tm.tm_sec = strtoul (date_string, (gchar **) &date_string, 10);
#endif /* !HAVE_STRPTIME */
diff --git a/thunar/thunar-util.h b/thunar/thunar-util.h
index eee56be..adf0585 100644
--- a/thunar/thunar-util.h
+++ b/thunar/thunar-util.h
@@ -3,18 +3,18 @@
* Copyright (c) 2006-2007 Benedikt Meurer <benny at xfce.org>
* Copyright (c) 2009-2010 Jannis Pohlmann <jannis at xfce.org>
*
- * This program is free software; you can redistribute it and/or
+ * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
+ * published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the Free
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the Free
* Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
diff --git a/thunarx/thunarx-file-info.c b/thunarx/thunarx-file-info.c
index 763382e..74bc420 100644
--- a/thunarx/thunarx-file-info.c
+++ b/thunarx/thunarx-file-info.c
@@ -68,7 +68,7 @@ thunarx_file_info_get_type (void)
0);
g_type_interface_add_prerequisite (type, G_TYPE_OBJECT);
-
+
/**
* ThunarxFileInfo::changed:
* @file_info : a #ThunarxFileInfo.
@@ -299,8 +299,8 @@ thunarx_file_info_is_directory (ThunarxFileInfo *file_info)
*
* Returns the #GFileInfo associated with @file_info,
* which includes additional information about the @file_info
- * as queried from GIO earlier. The caller is responsible to free the
- * returned #GFileInfo object using g_object_unref() when
+ * as queried from GIO earlier. The caller is responsible to free the
+ * returned #GFileInfo object using g_object_unref() when
* no longer needed.
*
* Return value: the #GFileInfo object associated with @file_info,
@@ -320,12 +320,12 @@ thunarx_file_info_get_file_info (ThunarxFileInfo *file_info)
* @file_info : a #ThunarxFileInfo.
*
* Returns the #GFileInfo which includes additional information about
- * the filesystem @file_info resides on. The caller is responsible to
- * free the returned #GFileInfo object using g_object_unref() when
+ * the filesystem @file_info resides on. The caller is responsible to
+ * free the returned #GFileInfo object using g_object_unref() when
* no longer needed.
*
* Return value: the #GFileInfo containing information about the
- * filesystem of @file_info or %NULL if no filesystem
+ * filesystem of @file_info or %NULL if no filesystem
* information is available. It MUST be released using
* g_object_unref().
**/
diff --git a/thunarx/thunarx-file-info.h b/thunarx/thunarx-file-info.h
index b0bb09a..2a2f9cb 100644
--- a/thunarx/thunarx-file-info.h
+++ b/thunarx/thunarx-file-info.h
@@ -33,7 +33,7 @@
G_BEGIN_DECLS;
/**
- * File information namespaces available in the #GFileInfo returned by
+ * File information namespaces available in the #GFileInfo returned by
* thunarx_file_info_get_file_info().
**/
#define THUNARX_FILE_INFO_NAMESPACE \
diff --git a/thunarx/thunarx-menu-provider.c b/thunarx/thunarx-menu-provider.c
index 1b1cff6..597553e 100644
--- a/thunarx/thunarx-menu-provider.c
+++ b/thunarx/thunarx-menu-provider.c
@@ -195,7 +195,7 @@ thunarx_menu_provider_get_folder_menu_items (ThunarxMenuProvider *provider,
* @provider : a #ThunarxMenuProvider.
* @window : the #GtkWindow within which the menu items will be used.
* @folder : the folder into which the @files are being dropped
- * @files : the list of #ThunarxFileInfo<!---->s for the files that are
+ * @files : the list of #ThunarxFileInfo<!---->s for the files that are
* being dropped to @folder in @window.
*
* Returns the list of #ThunarxMenuItem<!---->s that @provider has to offer for
diff --git a/thunarx/thunarx-provider-plugin.c b/thunarx/thunarx-provider-plugin.c
index d5e7447..a1d3abf 100644
--- a/thunarx/thunarx-provider-plugin.c
+++ b/thunarx/thunarx-provider-plugin.c
@@ -120,7 +120,7 @@ thunarx_provider_plugin_get_resident (const ThunarxProviderPlugin *plugin)
* no longer needed. If this method is invoked with a @resident value
* of %TRUE then the application will never try to unload @plugin.
*
- * This method has no effect unless called from the
+ * This method has no effect unless called from the
* %thunar_extension_initialize method of the @plugin.
**/
void
@@ -147,7 +147,7 @@ thunarx_provider_plugin_set_resident (ThunarxProviderPlugin *plugin,
* and the resulting #GType identifier returned.
*
* When reregistering a type (typically because a module is unloaded then reloaded, and reinitialized), module and
- * @type_parent must be the same as they were previously.
+ * @type_parent must be the same as they were previously.
*
* Return value: the new or existing type id.
**/
@@ -202,7 +202,7 @@ thunarx_provider_plugin_add_interface (ThunarxProviderPlugin *plugin,
* @const_static_values : an array of #GEnumValue structs for the possible enumeration values.
* The array is terminated by a struct with all members being %0.
*
- * Looks up or registers an enumeration that is implemented with a particular type @plugin. If a type
+ * Looks up or registers an enumeration that is implemented with a particular type @plugin. If a type
* with name @name was previously registered, the #GType identifier for the type is returned,
* otherwise the type is newly registered, and the resulting #GType identifier returned.
*
@@ -235,7 +235,7 @@ thunarx_provider_plugin_register_enum (ThunarxProviderPlugin *plugin,
* qname was previously registered, the #GType identifier for the type is returned, otherwise the type is newly
* registered, and the resulting #GType identifier returned.
*
- * As long as any instances of the type exist, the type @plugin will not be unloaded.
+ * As long as any instances of the type exist, the type @plugin will not be unloaded.
*
* Return value: the new or existing type id.
**/
diff --git a/thunarx/thunarx-renamer.c b/thunarx/thunarx-renamer.c
index 510fc89..6fa3560 100644
--- a/thunarx/thunarx-renamer.c
+++ b/thunarx/thunarx-renamer.c
@@ -334,7 +334,7 @@ thunarx_renamer_real_load (ThunarxRenamer *renamer,
/* determine the key for the parameter */
key = thunarx_param_spec_get_option_name (specs[n]);
-
+
/* check if we have a value for that key */
setting = g_hash_table_lookup (settings, key);
if (G_LIKELY (setting != NULL))
@@ -632,7 +632,7 @@ thunarx_renamer_save (ThunarxRenamer *renamer,
* (the empty list), but derived classes may override this method
* to provide additional items for files in the bulk renamer
* dialog list.
- *
+ *
* The returned #ThunarxMenuItem<!---->s will be displayed in the file's
* context menu of the bulk renamer dialog, when this @renamer is
* active. For example, an ID3-Tag based renamer may add an menu item
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list