[Xfce4-commits] <thunar-vfs:master> Drop tabs and trailing spaces.
Nick Schermer
noreply at xfce.org
Fri Nov 5 11:16:02 CET 2010
Updating branch refs/heads/master
to 42786b1f54eea03e624ebaa262326c4fe1349a52 (commit)
from 62a90bf38a301f2eea646c412747abbc5ac8112d (commit)
commit 42786b1f54eea03e624ebaa262326c4fe1349a52
Author: Nick Schermer <nick at xfce.org>
Date: Fri Nov 5 11:15:33 2010 +0100
Drop tabs and trailing spaces.
thunar-vfs/thunar-vfs-exec.c | 2 +-
thunar-vfs/thunar-vfs-font-thumbnailer.c | 10 +-
thunar-vfs/thunar-vfs-io-local.c | 4 +-
thunar-vfs/thunar-vfs-io-ops.c | 2 +-
thunar-vfs/thunar-vfs-io-trash.c | 6 +-
thunar-vfs/thunar-vfs-job.c | 4 +-
thunar-vfs/thunar-vfs-mime-application.c | 2 +-
thunar-vfs/thunar-vfs-mime-cache.c | 20 +++---
thunar-vfs/thunar-vfs-mime-database.c | 2 +-
thunar-vfs/thunar-vfs-mime-info.c | 2 +-
thunar-vfs/thunar-vfs-mime-legacy.c | 2 +-
thunar-vfs/thunar-vfs-mime-parser.c | 90 ++++++++++----------
thunar-vfs/thunar-vfs-monitor.c | 8 +-
thunar-vfs/thunar-vfs-path.c | 6 +-
thunar-vfs/thunar-vfs-private.c | 10 +-
thunar-vfs/thunar-vfs-simple-job.c | 2 +-
thunar-vfs/thunar-vfs-thumb.c | 2 +-
thunar-vfs/thunar-vfs-types.h | 2 +-
thunar-vfs/thunar-vfs-update-thumbnailers-cache.c | 4 +-
thunar-vfs/thunar-vfs-util.c | 54 ++++++------
thunar-vfs/thunar-vfs-volume-hal.c | 4 +-
thunar-vfs/thunar-vfs-volume-manager.c | 6 +-
thunar-vfs/thunar-vfs-volume.c | 2 +-
thunar-vfs/thunar-vfs.c | 2 +-
24 files changed, 124 insertions(+), 124 deletions(-)
diff --git a/thunar-vfs/thunar-vfs-exec.c b/thunar-vfs/thunar-vfs-exec.c
index 414898c..9578121 100644
--- a/thunar-vfs/thunar-vfs-exec.c
+++ b/thunar-vfs/thunar-vfs-exec.c
@@ -540,7 +540,7 @@ thunar_vfs_exec_on_screen (GdkScreen *screen,
* @command_fmt : the command to execute (can be a printf
* format string).
* @error : return location for errors or %NULL.
- * @... : additional parameters to fill into
+ * @... : additional parameters to fill into
* @command_fmt.
*
* Executes the given @command_fmt and returns %TRUE if the
diff --git a/thunar-vfs/thunar-vfs-font-thumbnailer.c b/thunar-vfs/thunar-vfs-font-thumbnailer.c
index 4de4c8b..6c51767 100644
--- a/thunar-vfs/thunar-vfs-font-thumbnailer.c
+++ b/thunar-vfs/thunar-vfs-font-thumbnailer.c
@@ -224,7 +224,7 @@ tft_save_pixbuf (GdkPixbuf *pixbuf,
if (seen_pixel)
break;
}
-
+
if (seen_pixel)
break;
}
@@ -244,7 +244,7 @@ tft_save_pixbuf (GdkPixbuf *pixbuf,
if (seen_pixel)
break;
}
-
+
if (seen_pixel)
break;
}
@@ -264,7 +264,7 @@ tft_save_pixbuf (GdkPixbuf *pixbuf,
if (seen_pixel)
break;
}
-
+
if (seen_pixel)
break;
}
@@ -284,7 +284,7 @@ tft_save_pixbuf (GdkPixbuf *pixbuf,
if (seen_pixel)
break;
}
-
+
if (seen_pixel)
break;
}
@@ -302,7 +302,7 @@ tft_save_pixbuf (GdkPixbuf *pixbuf,
g_object_unref (G_OBJECT (subpixbuf));
subpixbuf = scaled;
}
-
+
succeed = gdk_pixbuf_save (subpixbuf, opt_output, "png", error, NULL);
g_object_unref (G_OBJECT (subpixbuf));
diff --git a/thunar-vfs/thunar-vfs-io-local.c b/thunar-vfs/thunar-vfs-io-local.c
index 0741309..6d044d7 100644
--- a/thunar-vfs/thunar-vfs-io-local.c
+++ b/thunar-vfs/thunar-vfs-io-local.c
@@ -137,8 +137,8 @@ thunar_vfs_io_local_listdir_internal (volatile GList **list,
continue;
#elif defined(__GNUC__) && (defined(__amd64__) || defined(__x86_64__))
__asm__ __volatile__ ("lock; cmpxchgq %q2, %1"
- : "=a" (lr), "=m" (*list)
- : "r" (ln), "m" (*list), "0" (lp));
+ : "=a" (lr), "=m" (*list)
+ : "r" (ln), "m" (*list), "0" (lp));
if (G_UNLIKELY (lr != lp))
continue;
diff --git a/thunar-vfs/thunar-vfs-io-ops.c b/thunar-vfs/thunar-vfs-io-ops.c
index 6b85b6c..e663ce1 100644
--- a/thunar-vfs/thunar-vfs-io-ops.c
+++ b/thunar-vfs/thunar-vfs-io-ops.c
@@ -240,7 +240,7 @@ _thunar_vfs_io_ops_copy_file (ThunarVfsPath *source_path,
* real target path may be different than the suggested @target_path, and will
* be returned in @target_path_return if not %NULL.
*
- * The caller is responsible to free the #ThunarVfsPath object returned in
+ * The caller is responsible to free the #ThunarVfsPath object returned in
* @target_path_return using thunar_vfs_path_unref() when no longer needed
* if %TRUE is returned.
*
diff --git a/thunar-vfs/thunar-vfs-io-trash.c b/thunar-vfs/thunar-vfs-io-trash.c
index c78227d..72c7da7 100644
--- a/thunar-vfs/thunar-vfs-io-trash.c
+++ b/thunar-vfs/thunar-vfs-io-trash.c
@@ -1172,7 +1172,7 @@ _thunar_vfs_io_trash_get_metadata (ThunarVfsPath *path,
_thunar_vfs_return_val_if_fail (_thunar_vfs_path_is_trash (path), NULL);
_thunar_vfs_return_val_if_fail (error == NULL || *error == NULL, NULL);
-
+
switch (metadata)
{
case THUNAR_VFS_INFO_METADATA_FILE_LINK_TARGET:
@@ -1369,7 +1369,7 @@ _thunar_vfs_io_trash_copy_file (ThunarVfsPath *source_path,
if (G_UNLIKELY (!succeed))
{
/* drop the file from the trash and release the target path */
- if (!_thunar_vfs_io_trash_remove (target_path, NULL))
+ if (!_thunar_vfs_io_trash_remove (target_path, NULL))
g_warning ("Failed to remove stale trash handle %s in %u", file_id, trash_id);
thunar_vfs_path_unref (target_path);
}
@@ -1484,7 +1484,7 @@ _thunar_vfs_io_trash_move_file (ThunarVfsPath *source_path,
if (G_UNLIKELY (!succeed))
{
/* drop the file from the trash and release the target path */
- if (!_thunar_vfs_io_trash_remove (target_path, NULL))
+ if (!_thunar_vfs_io_trash_remove (target_path, NULL))
g_warning ("Failed to remove stale trash handle %s in %u", file_id, trash_id);
thunar_vfs_path_unref (target_path);
}
diff --git a/thunar-vfs/thunar-vfs-job.c b/thunar-vfs/thunar-vfs-job.c
index 9f266d6..f543f36 100644
--- a/thunar-vfs/thunar-vfs-job.c
+++ b/thunar-vfs/thunar-vfs-job.c
@@ -886,7 +886,7 @@ _thunar_vfs_job_ask_overwrite (ThunarVfsJob *job,
/* check if the user said "Overwrite All" earlier */
if (G_UNLIKELY (job->priv->ask_overwrite_all))
return THUNAR_VFS_JOB_RESPONSE_YES;
-
+
/* check if the user said "Overwrite None" earlier */
if (G_UNLIKELY (job->priv->ask_overwrite_none))
return THUNAR_VFS_JOB_RESPONSE_NO;
@@ -952,7 +952,7 @@ _thunar_vfs_job_ask_replace (ThunarVfsJob *job,
/* check if the user said "Overwrite All" earlier */
if (G_UNLIKELY (job->priv->ask_overwrite_all))
return THUNAR_VFS_JOB_RESPONSE_YES;
-
+
/* check if the user said "Overwrite None" earlier */
if (G_UNLIKELY (job->priv->ask_overwrite_none))
return THUNAR_VFS_JOB_RESPONSE_NO;
diff --git a/thunar-vfs/thunar-vfs-mime-application.c b/thunar-vfs/thunar-vfs-mime-application.c
index 254c3b2..39801f8 100644
--- a/thunar-vfs/thunar-vfs-mime-application.c
+++ b/thunar-vfs/thunar-vfs-mime-application.c
@@ -458,7 +458,7 @@ thunar_vfs_mime_application_get_mime_types (const ThunarVfsMimeApplication *mime
* thunar_vfs_mime_application_hash:
* @mime_application : a #ThunarVfsMimeApplication.
*
- * Converts @mime_application to a hash value. It can be
+ * Converts @mime_application to a hash value. It can be
* passed to g_hash_table_new() as the @hash_func parameter,
* when using #ThunarVfsMimeApplication<!---->s as keys
* in a #GHashTable.
diff --git a/thunar-vfs/thunar-vfs-mime-cache.c b/thunar-vfs/thunar-vfs-mime-cache.c
index 2edb820..27854aa 100644
--- a/thunar-vfs/thunar-vfs-mime-cache.c
+++ b/thunar-vfs/thunar-vfs-mime-cache.c
@@ -192,7 +192,7 @@ cache_magic_matchlet_compare_to_data (const gchar *buffer,
for (i = range_start; i <= range_start + range_length; i++)
{
valid_matchlet = TRUE;
-
+
if (i + data_length > length)
return FALSE;
@@ -214,12 +214,12 @@ cache_magic_matchlet_compare_to_data (const gchar *buffer,
break;
}
}
-
+
if (valid_matchlet)
return TRUE;
}
-
- return FALSE;
+
+ return FALSE;
}
@@ -233,18 +233,18 @@ cache_magic_matchlet_compare (const gchar *buffer,
guint32 n_children = CACHE_READ32 (buffer, offset + 24);
guint32 child_offset = CACHE_READ32 (buffer, offset + 28);
guint32 i;
-
+
if (cache_magic_matchlet_compare_to_data (buffer, offset, data, length))
{
if (n_children == 0)
return TRUE;
-
+
for (i = 0; i < n_children; i++)
if (cache_magic_matchlet_compare (buffer, child_offset + 32 * i, data, length))
return TRUE;
}
-
- return FALSE;
+
+ return FALSE;
}
@@ -318,7 +318,7 @@ static const gchar*
cache_node_lookup_suffix (const gchar *buffer,
guint32 n_entries,
guint32 offset,
- const gchar *suffix,
+ const gchar *suffix,
gboolean ignore_case)
{
const gchar *type;
@@ -341,7 +341,7 @@ next:
min = mid + 1;
else if (match_char > character)
max = mid - 1;
- else
+ else
{
suffix = g_utf8_next_char (suffix);
if (*suffix == '\0')
diff --git a/thunar-vfs/thunar-vfs-mime-database.c b/thunar-vfs/thunar-vfs-mime-database.c
index 3094f8f..3844156 100644
--- a/thunar-vfs/thunar-vfs-mime-database.c
+++ b/thunar-vfs/thunar-vfs-mime-database.c
@@ -1732,7 +1732,7 @@ thunar_vfs_mime_database_remove_application (ThunarVfsMimeDatabase *database,
/* determine the desktop-id of the application */
desktop_id = thunar_vfs_mime_application_get_desktop_id (application);
-
+
/* determine the save location for applications */
directory = xfce_resource_save_location (XFCE_RESOURCE_DATA, "applications/", TRUE);
if (G_UNLIKELY (directory == NULL))
diff --git a/thunar-vfs/thunar-vfs-mime-info.c b/thunar-vfs/thunar-vfs-mime-info.c
index b10467d..c2dffb6 100644
--- a/thunar-vfs/thunar-vfs-mime-info.c
+++ b/thunar-vfs/thunar-vfs-mime-info.c
@@ -333,7 +333,7 @@ thunar_vfs_mime_info_hash (gconstpointer info)
* @b : a #ThunarVfsMimeInfo.
*
* Compares @a and @b and returns %TRUE if both
- * are equal.
+ * are equal.
*
* Return value: %TRUE if @a and @b are equal.
**/
diff --git a/thunar-vfs/thunar-vfs-mime-legacy.c b/thunar-vfs/thunar-vfs-mime-legacy.c
index 71bb19c..5754db6 100644
--- a/thunar-vfs/thunar-vfs-mime-legacy.c
+++ b/thunar-vfs/thunar-vfs-mime-legacy.c
@@ -798,7 +798,7 @@ thunar_vfs_mime_legacy_parse_magic (ThunarVfsMimeLegacy *legacy,
n = THUNAR_VFS_MIME_LEGACY_MATCHLET (lp->data)->value_length
+ THUNAR_VFS_MIME_LEGACY_MATCHLET (lp->data)->range_length
+ THUNAR_VFS_MIME_LEGACY_MATCHLET (lp->data)->offset;
-
+
/* check if new max */
if (n > (gint) legacy->max_buffer_extents)
legacy->max_buffer_extents = n;
diff --git a/thunar-vfs/thunar-vfs-mime-parser.c b/thunar-vfs/thunar-vfs-mime-parser.c
index f6ae7f5..9f6462c 100644
--- a/thunar-vfs/thunar-vfs-mime-parser.c
+++ b/thunar-vfs/thunar-vfs-mime-parser.c
@@ -37,9 +37,9 @@ typedef enum
PARSER_STATE_COMMENT,
PARSER_STATE_UNKNOWN,
} ParserState;
-
+
typedef XFCE_GENERIC_STACK(ParserState) ParserStateStack;
-
+
typedef struct
{
ParserStateStack *stack;
@@ -48,9 +48,9 @@ typedef struct
GString *comment;
const gchar *locale;
} Parser;
-
-
-
+
+
+
static void start_element_handler (GMarkupParseContext *context,
const gchar *element_name,
const gchar **attribute_names,
@@ -66,9 +66,9 @@ static void text_handler (GMarkupParseContext *context,
gsize text_len,
gpointer user_data,
GError **error);
-
-
-
+
+
+
static GMarkupParser markup_parser =
{
start_element_handler,
@@ -77,9 +77,9 @@ static GMarkupParser markup_parser =
NULL,
NULL,
};
-
-
-
+
+
+
static void
start_element_handler (GMarkupParseContext *context,
const gchar *element_name,
@@ -91,7 +91,7 @@ start_element_handler (GMarkupParseContext *context,
Parser *parser = (Parser *) user_data;
guint match;
guint n;
-
+
switch (xfce_stack_top (parser->stack))
{
case PARSER_STATE_START:
@@ -102,14 +102,14 @@ start_element_handler (GMarkupParseContext *context,
else
goto unknown_element;
break;
-
+
case PARSER_STATE_MIMETYPE:
if (exo_str_is_equal (element_name, "comment"))
{
for (n = 0; attribute_names[n] != NULL; ++n)
if (exo_str_is_equal (attribute_names[n], "xml:lang"))
break;
-
+
if (G_UNLIKELY (attribute_names[n] == NULL))
{
parser->comment_use = (parser->comment_match <= XFCE_LOCALE_NO_MATCH);
@@ -127,31 +127,31 @@ start_element_handler (GMarkupParseContext *context,
parser->comment_use = FALSE;
}
}
-
+
if (parser->comment_use)
g_string_truncate (parser->comment, 0);
-
+
xfce_stack_push (parser->stack, PARSER_STATE_COMMENT);
}
else
xfce_stack_push (parser->stack, PARSER_STATE_UNKNOWN);
break;
-
+
default:
xfce_stack_push (parser->stack, PARSER_STATE_UNKNOWN);
break;
}
-
+
return;
-
+
unknown_element:
g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_UNKNOWN_ELEMENT,
"Unknown element <%s>", element_name);
return;
}
-
-
-
+
+
+
static void
end_element_handler (GMarkupParseContext *context,
const gchar *element_name,
@@ -159,39 +159,39 @@ end_element_handler (GMarkupParseContext *context,
GError **error)
{
Parser *parser = (Parser *) user_data;
-
+
switch (xfce_stack_top (parser->stack))
{
case PARSER_STATE_START:
g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
"End element handler called while in root context");
return;
-
+
case PARSER_STATE_MIMETYPE:
if (!exo_str_is_equal (element_name, "mime-type"))
goto unknown_element;
break;
-
+
case PARSER_STATE_COMMENT:
if (!exo_str_is_equal (element_name, "comment"))
goto unknown_element;
break;
-
+
default:
break;
}
-
+
xfce_stack_pop (parser->stack);
return;
-
+
unknown_element:
g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_UNKNOWN_ELEMENT,
"Unknown closing element <%s>", element_name);
return;
}
-
-
-
+
+
+
static void
text_handler (GMarkupParseContext *context,
const gchar *text,
@@ -200,21 +200,21 @@ text_handler (GMarkupParseContext *context,
GError **error)
{
Parser *parser = (Parser *) user_data;
-
+
switch (xfce_stack_top (parser->stack))
{
case PARSER_STATE_COMMENT:
if (parser->comment_use)
g_string_append_len (parser->comment, text, text_len);
break;
-
+
default:
break;
}
}
-
-
-
+
+
+
gchar*
_thunar_vfs_mime_parser_load_comment_from_file (const gchar *filename,
GError **error)
@@ -225,33 +225,33 @@ _thunar_vfs_mime_parser_load_comment_from_file (const gchar *filename,
gsize content_len;
gboolean comment_free = TRUE;
gchar *comment = NULL;
-
+
if (!g_file_get_contents (filename, &content, &content_len, error))
return NULL;
-
+
parser.comment_match = XFCE_LOCALE_NO_MATCH;
parser.comment = g_string_new ("");
parser.locale = setlocale (LC_MESSAGES, NULL);
-
+
parser.stack = xfce_stack_new (ParserStateStack);
xfce_stack_push (parser.stack, PARSER_STATE_START);
-
+
context = g_markup_parse_context_new (&markup_parser, 0, &parser, NULL);
-
+
if (!g_markup_parse_context_parse (context, content, content_len, error))
goto done;
-
+
if (!g_markup_parse_context_end_parse (context, error))
goto done;
-
+
comment = parser.comment->str;
comment_free = FALSE;
-
+
done:
g_markup_parse_context_free (context);
g_string_free (parser.comment, comment_free);
xfce_stack_free (parser.stack);
g_free (content);
-
+
return comment;
}
diff --git a/thunar-vfs/thunar-vfs-monitor.c b/thunar-vfs/thunar-vfs-monitor.c
index 6046c15..f5d5fde 100644
--- a/thunar-vfs/thunar-vfs-monitor.c
+++ b/thunar-vfs/thunar-vfs-monitor.c
@@ -116,7 +116,7 @@ struct _ThunarVfsMonitorHandle
#ifdef HAVE_LIBFAM
FAMRequest fr;
#else
- struct
+ struct
{
gint reqnum;
} fr;
@@ -468,7 +468,7 @@ thunar_vfs_monitor_fam_watch (GIOChannel *channel,
{
ThunarVfsMonitor *monitor = THUNAR_VFS_MONITOR (user_data);
gboolean result = FALSE;
-
+
/* acquire the monitor lock */
g_mutex_lock (monitor->lock);
@@ -498,10 +498,10 @@ thunar_vfs_monitor_fam_watch (GIOChannel *channel,
* @monitor : a #ThunarVfsMonitor.
* @path : a #ThunarVfsPath
*
- * Checks whether the path is among the paths to be excluded from
+ * Checks whether the path is among the paths to be excluded from
* monitoring.
*
- * Return value: %TRUE if @path should be excluded from monitoring,
+ * Return value: %TRUE if @path should be excluded from monitoring,
* %FALSE otherwise.
**/
static gboolean
diff --git a/thunar-vfs/thunar-vfs-path.c b/thunar-vfs/thunar-vfs-path.c
index f44f4ad..d4d6994 100644
--- a/thunar-vfs/thunar-vfs-path.c
+++ b/thunar-vfs/thunar-vfs-path.c
@@ -65,7 +65,7 @@ static guint thunar_vfs_path_escape_uri (const ThunarVfsPath *path,
/* A table of the ASCII chars from space (32) to DEL (127) */
static const guchar ACCEPTABLE_URI_CHARS[96] = {
- /* ! " # $ % & ' ( ) * + , - . / */
+ /* ! " # $ % & ' ( ) * + , - . / */
0x00,0x3F,0x20,0x20,0x28,0x00,0x2C,0x3F,0x3F,0x3F,0x3F,0x2A,0x28,0x3F,0x3F,0x1C,
/* 0 1 2 3 4 5 6 7 8 9 : ; < = > ? */
0x3F,0x3F,0x3F,0x3F,0x3F,0x3F,0x3F,0x3F,0x3F,0x3F,0x38,0x20,0x20,0x2C,0x20,0x20,
@@ -307,7 +307,7 @@ thunar_vfs_path_list_get_type (void)
* @identifier or %NULL on error. In the latter case
* @error will be set to point to an #GError describing
* the problem.
- *
+ *
* The caller is responsible to free the returned
* object using thunar_vfs_path_unref() when no
* longer needed.
@@ -419,7 +419,7 @@ thunar_vfs_path_new (const gchar *identifier,
* returned object using thunar_vfs_path_unref()
* when no longer needed.
*
- * Return value: the #ThunarVfsPath for the
+ * Return value: the #ThunarVfsPath for the
* current users home directory.
**/
ThunarVfsPath*
diff --git a/thunar-vfs/thunar-vfs-private.c b/thunar-vfs/thunar-vfs-private.c
index 6013c55..c7bb4a0 100644
--- a/thunar-vfs/thunar-vfs-private.c
+++ b/thunar-vfs/thunar-vfs-private.c
@@ -242,13 +242,13 @@ unescape_character (const gchar *s)
gint second_digit;
first_digit = g_ascii_xdigit_value (s[0]);
- if (first_digit < 0)
+ if (first_digit < 0)
return -1;
-
+
second_digit = g_ascii_xdigit_value (s[1]);
- if (second_digit < 0)
+ if (second_digit < 0)
return -1;
-
+
return (first_digit << 4) | second_digit;
}
@@ -327,7 +327,7 @@ _thunar_vfs_unescape_rfc2396_string (const gchar *escaped_string,
*t++ = c;
}
*t = '\0';
-
+
return unescaped_string;
error:
diff --git a/thunar-vfs/thunar-vfs-simple-job.c b/thunar-vfs/thunar-vfs-simple-job.c
index 83cc82f..1e82825 100644
--- a/thunar-vfs/thunar-vfs-simple-job.c
+++ b/thunar-vfs/thunar-vfs-simple-job.c
@@ -73,7 +73,7 @@ thunar_vfs_simple_job_get_type (void)
if (G_UNLIKELY (type == G_TYPE_INVALID))
{
- type = _thunar_vfs_g_type_register_simple (THUNAR_VFS_TYPE_INTERACTIVE_JOB,
+ type = _thunar_vfs_g_type_register_simple (THUNAR_VFS_TYPE_INTERACTIVE_JOB,
"ThunarVfsSimpleJob",
sizeof (ThunarVfsSimpleJobClass),
thunar_vfs_simple_job_class_init,
diff --git a/thunar-vfs/thunar-vfs-thumb.c b/thunar-vfs/thunar-vfs-thumb.c
index dc6a3b2..a679067 100644
--- a/thunar-vfs/thunar-vfs-thumb.c
+++ b/thunar-vfs/thunar-vfs-thumb.c
@@ -549,7 +549,7 @@ thunar_vfs_thumb_factory_cache_monitor (ThunarVfsMonitor *monitor,
{
/* determine the thumbnailers.cache file */
cache_file = thunar_vfs_path_dup_string (handle_path);
-
+
/* the thumbnailers.cache file was changed, reload it */
g_mutex_lock (factory->cache_lock);
thunar_vfs_thumb_factory_cache_unload (factory);
diff --git a/thunar-vfs/thunar-vfs-types.h b/thunar-vfs/thunar-vfs-types.h
index 04f1962..8d6d567 100644
--- a/thunar-vfs/thunar-vfs-types.h
+++ b/thunar-vfs/thunar-vfs-types.h
@@ -120,7 +120,7 @@ typedef enum /*< flags >*/
* @THUNAR_VFS_FILE_FLAGS_NONE : No additional information available.
* @THUNAR_VFS_FILE_FLAGS_SYMLINK : The file is a symlink. Whether or not
* the info fields refer to the symlink
- * itself or the linked file, depends on
+ * itself or the linked file, depends on
* whether the symlink is broken or not.
* @THUNAR_VFS_FILE_FLAGS_EXECUTABLE : The file can most probably be executed
* by thunar_vfs_info_execute().
diff --git a/thunar-vfs/thunar-vfs-update-thumbnailers-cache.c b/thunar-vfs/thunar-vfs-update-thumbnailers-cache.c
index f887a38..4f31833 100644
--- a/thunar-vfs/thunar-vfs-update-thumbnailers-cache.c
+++ b/thunar-vfs/thunar-vfs-update-thumbnailers-cache.c
@@ -431,14 +431,14 @@ thumbnailers_load_custom (GHashTable *thumbnailers)
mime_types = xfce_rc_read_list_entry (rc, "MimeType", ";");
if (G_UNLIKELY (mime_types == NULL))
continue;
-
+
/* process all specified mime types */
for (m = 0; mime_types[m] != NULL; ++m)
{
/* check if we have a valid mime type here */
if (strlen (mime_types[m]) > 0 && strstr (mime_types[m], "/") != NULL)
{
- /* set our thumbnailer for all those mime types (don't need to
+ /* set our thumbnailer for all those mime types (don't need to
* duplicate the exec string, because we leave the RC file open).
*/
g_hash_table_insert (thumbnailers, mime_types[m], (gchar *) exec);
diff --git a/thunar-vfs/thunar-vfs-util.c b/thunar-vfs/thunar-vfs-util.c
index c293d3f..c645ac0 100644
--- a/thunar-vfs/thunar-vfs-util.c
+++ b/thunar-vfs/thunar-vfs-util.c
@@ -49,9 +49,9 @@ static inline gint
find_next_slash (const gchar *path,
gint current_offset)
{
- const gchar *match;
- match = strchr (path + current_offset, G_DIR_SEPARATOR);
- return (match == NULL) ? -1 : (match - path);
+ const gchar *match;
+ match = strchr (path + current_offset, G_DIR_SEPARATOR);
+ return (match == NULL) ? -1 : (match - path);
}
@@ -60,19 +60,19 @@ static inline gint
find_slash_before_offset (const gchar *path,
gint to)
{
- gint next_offset;
- gint result = -1;
+ gint next_offset;
+ gint result = -1;
- for (next_offset = 0;; ++next_offset)
+ for (next_offset = 0;; ++next_offset)
{
- next_offset = find_next_slash (path, next_offset);
- if (next_offset < 0 || next_offset >= to)
- break;
+ next_offset = find_next_slash (path, next_offset);
+ if (next_offset < 0 || next_offset >= to)
+ break;
result = next_offset;
- }
+ }
- return result;
+ return result;
}
@@ -81,14 +81,14 @@ static inline void
collapse_slash_runs (gchar *path,
gint from_offset)
{
- gint i;
+ gint i;
- /* Collapse multiple `/'s in a row. */
- for (i = from_offset; path[i] == G_DIR_SEPARATOR; i++)
+ /* Collapse multiple `/'s in a row. */
+ for (i = from_offset; path[i] == G_DIR_SEPARATOR; i++)
;
- if (from_offset < i)
- memmove (path + from_offset, path + i, strlen (path + i) + 1);
+ if (from_offset < i)
+ memmove (path + from_offset, path + i, strlen (path + i) + 1);
}
@@ -122,14 +122,14 @@ thunar_vfs_canonicalize_filename (const gchar *filename)
/* take a copy of the filename to operate on */
path = g_strdup (filename);
- if (G_UNLIKELY (*path == '\0'))
+ if (G_UNLIKELY (*path == '\0'))
return path;
- /* Walk along path looking for things to compact. */
- for (i = 0, marker = 0;;)
+ /* Walk along path looking for things to compact. */
+ for (i = 0, marker = 0;;)
{
- if (G_UNLIKELY (path[i] == '\0'))
- break;
+ if (G_UNLIKELY (path[i] == '\0'))
+ break;
/* Check for `../', `./' or trailing `.' by itself. */
if (path[i] == '.')
@@ -165,8 +165,8 @@ thunar_vfs_canonicalize_filename (const gchar *filename)
continue;
}
- /* Handle `../' or trailing `..' by itself.
- * Remove the previous xxx/ part
+ /* Handle `../' or trailing `..' by itself.
+ * Remove the previous xxx/ part
*/
if (path[i + 1] == '.' && (path[i + 2] == G_DIR_SEPARATOR || path[i + 2] == '\0'))
{
@@ -184,7 +184,7 @@ thunar_vfs_canonicalize_filename (const gchar *filename)
*/
marker--;
}
-
+
/* strip the entire ../ string */
if (path[i + 2] == G_DIR_SEPARATOR)
++i;
@@ -198,12 +198,12 @@ thunar_vfs_canonicalize_filename (const gchar *filename)
if (path[i] == G_DIR_SEPARATOR)
i++;
}
-
+
collapse_slash_runs (path, i);
continue;
}
}
-
+
/* advance to the next '/' */
i = find_next_slash (path, i);
@@ -215,7 +215,7 @@ thunar_vfs_canonicalize_filename (const gchar *filename)
collapse_slash_runs (path, i);
}
- return path;
+ return path;
}
diff --git a/thunar-vfs/thunar-vfs-volume-hal.c b/thunar-vfs/thunar-vfs-volume-hal.c
index 6318e00..9973020 100644
--- a/thunar-vfs/thunar-vfs-volume-hal.c
+++ b/thunar-vfs/thunar-vfs-volume-hal.c
@@ -533,7 +533,7 @@ thunar_vfs_volume_hal_update (ThunarVfsVolumeHal *volume_hal,
* a drive, which means non-pollable then, so it's present
*/
volume_hal->status |= THUNAR_VFS_VOLUME_STATUS_PRESENT;
-
+
/* figure out if the volume is mountable */
if(hv != NULL && libhal_volume_get_fsusage (hv) == LIBHAL_VOLUME_USAGE_MOUNTABLE_FILESYSTEM)
volume_hal->status |= THUNAR_VFS_VOLUME_STATUS_MOUNTABLE;
@@ -838,7 +838,7 @@ thunar_vfs_volume_manager_hal_init (ThunarVfsVolumeManagerHal *manager_hal)
{
/* add the volume based on the UDI */
thunar_vfs_volume_manager_hal_device_added (manager_hal->context, udis[n]);
-
+
/* release the UDI (HAL bug #5279) */
free (udis[n]);
}
diff --git a/thunar-vfs/thunar-vfs-volume-manager.c b/thunar-vfs/thunar-vfs-volume-manager.c
index 870f9ad..53ec11a 100644
--- a/thunar-vfs/thunar-vfs-volume-manager.c
+++ b/thunar-vfs/thunar-vfs-volume-manager.c
@@ -61,7 +61,7 @@ enum
static void thunar_vfs_volume_manager_class_init (ThunarVfsVolumeManagerClass *klass);
static void thunar_vfs_volume_manager_finalize (GObject *object);
-static ThunarVfsVolume *thunar_vfs_volume_manager_real_get_volume_by_info (ThunarVfsVolumeManager *manager,
+static ThunarVfsVolume *thunar_vfs_volume_manager_real_get_volume_by_info (ThunarVfsVolumeManager *manager,
const ThunarVfsInfo *info);
static void thunar_vfs_volume_manager_volume_mounted (ThunarVfsVolumeManager *manager,
ThunarVfsVolume *volume);
@@ -239,7 +239,7 @@ thunar_vfs_volume_manager_finalize (GObject *object)
static ThunarVfsVolume*
-thunar_vfs_volume_manager_real_get_volume_by_info (ThunarVfsVolumeManager *manager,
+thunar_vfs_volume_manager_real_get_volume_by_info (ThunarVfsVolumeManager *manager,
const ThunarVfsInfo *info)
{
ThunarVfsVolume *best_volume = NULL;
@@ -319,7 +319,7 @@ thunar_vfs_volume_manager_volume_unmounted (ThunarVfsVolumeManager *manager,
/**
* thunar_vfs_volume_manager_get_default:
- *
+ *
* Returns the default, shared #ThunarVfsVolumeManager instance
* for this system. This function automatically determines, which
* implementation of #ThunarVfsVolumeManager should be used for
diff --git a/thunar-vfs/thunar-vfs-volume.c b/thunar-vfs/thunar-vfs-volume.c
index e11a61b..b99da13 100644
--- a/thunar-vfs/thunar-vfs-volume.c
+++ b/thunar-vfs/thunar-vfs-volume.c
@@ -470,7 +470,7 @@ dvdr:
if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-cdrom-audio"))
return "gnome-dev-cdrom-audio";
goto cdrom;
-
+
case THUNAR_VFS_VOLUME_KIND_MEMORY_CARD:
case THUNAR_VFS_VOLUME_KIND_REMOVABLE_DISK:
if (gtk_icon_theme_has_icon (icon_theme, "gnome-dev-removable"))
diff --git a/thunar-vfs/thunar-vfs.c b/thunar-vfs/thunar-vfs.c
index 020102a..dc96da5 100644
--- a/thunar-vfs/thunar-vfs.c
+++ b/thunar-vfs/thunar-vfs.c
@@ -797,7 +797,7 @@ thunar_vfs_deep_count (ThunarVfsPath *path,
GError **error)
{
ThunarVfsJob *job;
-
+
g_return_val_if_fail (path != NULL, NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
More information about the Xfce4-commits
mailing list