[Xfce4-commits] <thunar:migration-to-gio> Prefix g_file* functions with thunar_ to avoid conflicts.
Jannis Pohlmann
jannis at xfce.org
Fri Aug 21 05:34:02 CEST 2009
Updating branch refs/heads/migration-to-gio
to fa99ba46e9bd63cd2ba5e9dfbfcd4282f3d330d0 (commit)
from 9412b3e8d8f6193b503aea6d0464d5da8e7a1ccb (commit)
commit fa99ba46e9bd63cd2ba5e9dfbfcd4282f3d330d0
Author: Jannis Pohlmann <jannis at xfce.org>
Date: Fri Aug 21 05:31:14 2009 +0200
Prefix g_file* functions with thunar_ to avoid conflicts.
thunar/thunar-application.c | 24 ++--
thunar/thunar-browser.c | 2 +-
thunar/thunar-clipboard-manager.c | 10 +-
thunar/thunar-dbus-service.c | 6 +-
thunar/thunar-file.c | 28 ++--
thunar/thunar-file.h | 4 +-
thunar/thunar-gio-extensions.c | 245 +++++++------------------------
thunar/thunar-gio-extensions.h | 107 ++++++--------
thunar/thunar-io-jobs-util.c | 2 +-
thunar/thunar-io-jobs.c | 42 +++---
thunar/thunar-io-scan-directory.c | 6 +-
thunar/thunar-launcher.c | 30 ++--
thunar/thunar-location-button.c | 8 +-
thunar/thunar-location-entry.c | 2 +-
thunar/thunar-misc-jobs.c | 6 +-
thunar/thunar-path-entry.c | 2 +-
thunar/thunar-renamer-dialog.c | 2 +-
thunar/thunar-shortcuts-icon-renderer.c | 2 +-
thunar/thunar-shortcuts-model.c | 18 +-
thunar/thunar-shortcuts-view.c | 10 +-
thunar/thunar-standard-view.c | 40 +++---
thunar/thunar-transfer-job.c | 16 +-
thunar/thunar-trash-action.c | 2 +-
thunar/thunar-tree-model.c | 18 +-
thunar/thunar-tree-view.c | 18 +-
thunar/thunar-window.c | 8 +-
26 files changed, 249 insertions(+), 409 deletions(-)
diff --git a/thunar/thunar-application.c b/thunar/thunar-application.c
index efb4f18..4530e69 100644
--- a/thunar/thunar-application.c
+++ b/thunar/thunar-application.c
@@ -367,7 +367,7 @@ thunar_application_collect_and_launch (ThunarApplication *application,
for (lp = g_list_last (source_file_list); err == NULL && lp != NULL; lp = lp->prev)
{
/* verify that we're not trying to collect a root node */
- if (G_UNLIKELY (g_file_is_root (lp->data)))
+ if (G_UNLIKELY (thunar_g_file_is_root (lp->data)))
{
/* tell the user that we cannot perform the requested operation */
g_set_error (&err, G_FILE_ERROR, G_FILE_ERROR_INVAL, "%s", g_strerror (EINVAL));
@@ -379,7 +379,7 @@ thunar_application_collect_and_launch (ThunarApplication *application,
g_free (basename);
/* add to the target file list */
- target_file_list = g_file_list_prepend (target_file_list, file);
+ target_file_list = thunar_g_file_list_prepend (target_file_list, file);
g_object_unref (file);
}
}
@@ -401,7 +401,7 @@ thunar_application_collect_and_launch (ThunarApplication *application,
}
/* release the target path list */
- g_file_list_free (target_file_list);
+ thunar_g_file_list_free (target_file_list);
}
@@ -1392,7 +1392,7 @@ thunar_application_move_into (ThunarApplication *application,
_thunar_return_if_fail (target_file != NULL);
/* launch the appropriate operation depending on the target file */
- if (g_file_is_trashed (target_file))
+ if (thunar_g_file_is_trashed (target_file))
{
thunar_application_trash (application, parent, source_file_list);
}
@@ -1455,7 +1455,7 @@ thunar_application_unlink_files (ThunarApplication *application,
for (lp = g_list_last (file_list); lp != NULL; lp = lp->prev, ++n_path_list)
{
/* prepend the path to the path list */
- path_list = g_file_list_prepend (path_list, thunar_file_get_file (lp->data));
+ path_list = thunar_g_file_list_prepend (path_list, thunar_file_get_file (lp->data));
}
/* nothing to do if we don't have any paths */
@@ -1517,7 +1517,7 @@ thunar_application_unlink_files (ThunarApplication *application,
}
/* release the path list */
- g_file_list_free (path_list);
+ thunar_g_file_list_free (path_list);
}
@@ -1677,7 +1677,7 @@ thunar_application_empty_trash (ThunarApplication *application,
/* fake a path list with only the trash root (the root
* folder itself will never be unlinked, so this is safe)
*/
- file_list.data = g_file_new_for_trash ();
+ file_list.data = thunar_g_file_new_for_trash ();
file_list.next = NULL;
file_list.prev = NULL;
@@ -1734,11 +1734,11 @@ thunar_application_restore_files (ThunarApplication *application,
break;
}
- /* TODO we need to distinguish between URIs and paths here */
+ /* TODO we might have to distinguish between URIs and paths here */
target_path = g_file_new_for_commandline_arg (original_uri);
- source_path_list = g_file_list_append (source_path_list, thunar_file_get_file (lp->data));
- target_path_list = g_file_list_append (target_path_list, target_path);
+ source_path_list = thunar_g_file_list_append (source_path_list, thunar_file_get_file (lp->data));
+ target_path_list = thunar_g_file_list_append (target_path_list, target_path);
g_object_unref (target_path);
}
@@ -1759,8 +1759,8 @@ thunar_application_restore_files (ThunarApplication *application,
}
/* free path lists */
- g_file_list_free (source_path_list);
- g_file_list_free (target_path_list);
+ thunar_g_file_list_free (source_path_list);
+ thunar_g_file_list_free (target_path_list);
}
diff --git a/thunar/thunar-browser.c b/thunar/thunar-browser.c
index 943b2d5..75ea0b7 100644
--- a/thunar/thunar-browser.c
+++ b/thunar/thunar-browser.c
@@ -517,7 +517,7 @@ thunar_browser_poke_volume (ThunarBrowser *browser,
_thunar_return_if_fail (THUNAR_IS_BROWSER (browser));
_thunar_return_if_fail (G_IS_VOLUME (volume));
- if (g_volume_is_mounted (volume))
+ if (thunar_g_volume_is_mounted (volume))
{
mount = g_volume_get_mount (volume);
mount_point = g_mount_get_root (mount);
diff --git a/thunar/thunar-clipboard-manager.c b/thunar/thunar-clipboard-manager.c
index 7ae89eb..adc9dc6 100644
--- a/thunar/thunar-clipboard-manager.c
+++ b/thunar/thunar-clipboard-manager.c
@@ -325,7 +325,7 @@ thunar_clipboard_manager_contents_received (GtkClipboard *clipboard,
}
/* determine the path list stored with the selection */
- file_list = g_file_list_new_from_string (data);
+ file_list = thunar_g_file_list_new_from_string (data);
}
/* perform the action if possible */
@@ -337,7 +337,7 @@ thunar_clipboard_manager_contents_received (GtkClipboard *clipboard,
else
thunar_application_move_into (application, request->widget, file_list, request->target_file, request->new_files_closure);
g_object_unref (G_OBJECT (application));
- g_file_list_free (file_list);
+ thunar_g_file_list_free (file_list);
/* clear the clipboard if it contained "cutted data"
* (gtk_clipboard_clear takes care of not clearing
@@ -427,10 +427,10 @@ thunar_clipboard_manager_get_callback (GtkClipboard *clipboard,
_thunar_return_if_fail (manager->clipboard == clipboard);
/* determine the path list from the file list */
- file_list = thunar_file_list_to_g_file_list (manager->files);
+ file_list = thunar_file_list_to_thunar_g_file_list (manager->files);
/* determine the string representation of the path list */
- string_list = g_file_list_to_string (file_list);
+ string_list = thunar_g_file_list_to_string (file_list);
switch (target_info)
{
@@ -449,7 +449,7 @@ thunar_clipboard_manager_get_callback (GtkClipboard *clipboard,
}
/* cleanup */
- g_file_list_free (file_list);
+ thunar_g_file_list_free (file_list);
g_free (string_list);
}
diff --git a/thunar/thunar-dbus-service.c b/thunar/thunar-dbus-service.c
index 0a847a8..16a8394 100644
--- a/thunar/thunar-dbus-service.c
+++ b/thunar/thunar-dbus-service.c
@@ -259,7 +259,7 @@ thunar_dbus_service_connect_trash_bin (ThunarDBusService *dbus_service,
if (G_UNLIKELY (dbus_service->trash_bin == NULL))
{
/* try to connect to the trash bin */
- trash_bin_path = g_file_new_for_trash ();
+ trash_bin_path = thunar_g_file_new_for_trash ();
dbus_service->trash_bin = thunar_file_get (trash_bin_path, error);
if (G_LIKELY (dbus_service->trash_bin != NULL))
{
@@ -610,7 +610,7 @@ thunar_dbus_service_move_to_trash (ThunarDBusService *dbus_service,
/* determine the path for the filename */
/* TODO Not sure this will work as expected */
file = g_file_new_for_commandline_arg (filename);
- file_list = g_file_list_append (file_list, file);
+ file_list = thunar_g_file_list_append (file_list, file);
g_object_unref (file);
}
@@ -628,7 +628,7 @@ thunar_dbus_service_move_to_trash (ThunarDBusService *dbus_service,
}
/* cleanup */
- g_file_list_free (file_list);
+ thunar_g_file_list_free (file_list);
g_object_unref (screen);
}
diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c
index 9d203a0..7ba6566 100644
--- a/thunar/thunar-file.c
+++ b/thunar/thunar-file.c
@@ -830,7 +830,7 @@ thunar_file_load (ThunarFile *file,
/* determine the custom icon name for .desktop files */
/* query a key file for the .desktop file */
- key_file = g_file_query_key_file (file->gfile, cancellable, NULL);
+ key_file = thunar_g_file_query_key_file (file->gfile, cancellable, NULL);
if (key_file != NULL)
{
/* read the icon name from the .desktop file */
@@ -999,11 +999,11 @@ thunar_file_execute (ThunarFile *file,
_thunar_return_val_if_fail (GDK_IS_SCREEN (screen), FALSE);
_thunar_return_val_if_fail (error == NULL || *error == NULL, FALSE);
- location = g_file_get_location (file->gfile);
+ location = thunar_g_file_get_location (file->gfile);
if (thunar_file_is_desktop_file (file))
{
- key_file = g_file_query_key_file (file->gfile, NULL, &err);
+ key_file = thunar_g_file_query_key_file (file->gfile, NULL, &err);
if (key_file == NULL)
{
@@ -1097,14 +1097,14 @@ thunar_file_execute (ThunarFile *file,
{
/* use the directory of the first list item */
parent = g_file_get_parent (file_list->data);
- directory = (parent != NULL) ? g_file_get_location (parent) : NULL;
+ directory = (parent != NULL) ? thunar_g_file_get_location (parent) : NULL;
g_object_unref (parent);
}
else
{
/* use the directory of the executable file */
parent = g_file_get_parent (file->gfile);
- directory = (parent != NULL) ? g_file_get_location (parent) : NULL;
+ directory = (parent != NULL) ? thunar_g_file_get_location (parent) : NULL;
g_object_unref (parent);
}
@@ -1389,7 +1389,7 @@ thunar_file_accepts_drop (ThunarFile *file,
}
/* copy/move/link within the trash not possible */
- if (G_UNLIKELY (g_file_is_trashed (lp->data) && thunar_file_is_trashed (file)))
+ if (G_UNLIKELY (thunar_g_file_is_trashed (lp->data) && thunar_file_is_trashed (file)))
return 0;
}
@@ -1406,7 +1406,7 @@ thunar_file_accepts_drop (ThunarFile *file,
for (lp = file_list, n = 0; lp != NULL && n < 100; lp = lp->next, ++n)
{
/* dropping from the trash always suggests move */
- if (G_UNLIKELY (g_file_is_trashed (lp->data)))
+ if (G_UNLIKELY (thunar_g_file_is_trashed (lp->data)))
break;
/* determine the cached version of the source file */
@@ -2150,7 +2150,7 @@ thunar_file_is_home (const ThunarFile *file)
_thunar_return_val_if_fail (THUNAR_IS_FILE (file), FALSE);
- home = g_file_new_for_home ();
+ home = thunar_g_file_new_for_home ();
is_home = g_file_equal (file->gfile, home);
g_object_unref (home);
@@ -2190,7 +2190,7 @@ gboolean
thunar_file_is_trashed (const ThunarFile *file)
{
_thunar_return_val_if_fail (THUNAR_IS_FILE (file), FALSE);
- return g_file_is_trashed (file->gfile);
+ return thunar_g_file_is_trashed (file->gfile);
}
@@ -2537,7 +2537,7 @@ thunar_file_set_custom_icon (ThunarFile *file,
_thunar_return_val_if_fail (THUNAR_IS_FILE (file), FALSE);
_thunar_return_val_if_fail (custom_icon != NULL, FALSE);
- key_file = g_file_query_key_file (file->gfile, NULL, error);
+ key_file = thunar_g_file_query_key_file (file->gfile, NULL, error);
if (key_file == NULL)
return FALSE;
@@ -2545,7 +2545,7 @@ thunar_file_set_custom_icon (ThunarFile *file,
g_key_file_set_string (key_file, G_KEY_FILE_DESKTOP_GROUP,
G_KEY_FILE_DESKTOP_KEY_ICON, custom_icon);
- if (g_file_write_key_file (file->gfile, key_file, NULL, error))
+ if (thunar_g_file_write_key_file (file->gfile, key_file, NULL, error))
{
/* tell everybody that we have changed */
thunar_file_changed (file);
@@ -3295,19 +3295,19 @@ thunar_file_list_get_applications (GList *file_list)
/**
- * thunar_file_list_to_g_file_list:
+ * thunar_file_list_to_thunar_g_file_list:
* @file_list : a #GList of #ThunarFile<!---->s.
*
* Transforms the @file_list to a #GList of #GFile<!---->s for
* the #ThunarFile<!---->s contained within @file_list.
*
* The caller is responsible to free the returned list using
- * g_file_list_free() when no longer needed.
+ * thunar_g_file_list_free() when no longer needed.
*
* Return value: the list of #GFile<!---->s for @file_list.
**/
GList*
-thunar_file_list_to_g_file_list (GList *file_list)
+thunar_file_list_to_thunar_g_file_list (GList *file_list)
{
GList *list = NULL;
GList *lp;
diff --git a/thunar/thunar-file.h b/thunar/thunar-file.h
index 9ea9152..891e051 100644
--- a/thunar/thunar-file.h
+++ b/thunar/thunar-file.h
@@ -255,7 +255,7 @@ ThunarFile *thunar_file_cache_lookup (const GFile *file
GList *thunar_file_list_get_applications (GList *file_list);
-GList *thunar_file_list_to_g_file_list (GList *file_list);
+GList *thunar_file_list_to_thunar_g_file_list (GList *file_list);
gboolean thunar_file_is_desktop (const ThunarFile *file);
@@ -267,7 +267,7 @@ gboolean thunar_file_is_desktop (const ThunarFile *file);
*
* Return value: %TRUE if @file is the root directory.
**/
-#define thunar_file_is_root(file) (g_file_is_root (THUNAR_FILE ((file))->gfile))
+#define thunar_file_is_root(file) (thunar_g_file_is_root (THUNAR_FILE ((file))->gfile))
/**
* thunar_file_has_parent:
diff --git a/thunar/thunar-gio-extensions.c b/thunar/thunar-gio-extensions.c
index a8bac83..7b8714a 100644
--- a/thunar/thunar-gio-extensions.c
+++ b/thunar/thunar-gio-extensions.c
@@ -1,20 +1,21 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
/*-
* 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 your option)
- * any later version.
+ * 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.
+ * 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
+ * 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.
*/
#ifdef HAVE_CONFIG_H
@@ -32,7 +33,7 @@
GFile *
-g_file_new_for_home (void)
+thunar_g_file_new_for_home (void)
{
return g_file_new_for_path (xfce_get_homedir ());
}
@@ -40,7 +41,7 @@ g_file_new_for_home (void)
GFile *
-g_file_new_for_root (void)
+thunar_g_file_new_for_root (void)
{
return g_file_new_for_uri ("file:///");
}
@@ -48,7 +49,7 @@ g_file_new_for_root (void)
GFile *
-g_file_new_for_trash (void)
+thunar_g_file_new_for_trash (void)
{
return g_file_new_for_uri ("trash:///");
}
@@ -56,7 +57,7 @@ g_file_new_for_trash (void)
GFile *
-g_file_new_for_desktop (void)
+thunar_g_file_new_for_desktop (void)
{
return g_file_new_for_path (g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP));
}
@@ -64,7 +65,7 @@ g_file_new_for_desktop (void)
GFile *
-g_file_new_for_user_special_dir (GUserDirectory dir)
+thunar_g_file_new_for_user_special_dir (GUserDirectory dir)
{
const gchar *path;
@@ -80,7 +81,7 @@ g_file_new_for_user_special_dir (GUserDirectory dir)
gboolean
-g_file_is_root (GFile *file)
+thunar_g_file_is_root (GFile *file)
{
GFile *parent;
gboolean is_root = TRUE;
@@ -98,7 +99,7 @@ g_file_is_root (GFile *file)
gboolean
-g_file_is_trashed (GFile *file)
+thunar_g_file_is_trashed (GFile *file)
{
_thunar_return_val_if_fail (G_IS_FILE (file), FALSE);
return g_file_has_uri_scheme (file, "trash");
@@ -107,14 +108,14 @@ g_file_is_trashed (GFile *file)
gboolean
-g_file_is_desktop (GFile *file)
+thunar_g_file_is_desktop (GFile *file)
{
GFile *desktop;
gboolean is_desktop;
_thunar_return_val_if_fail (G_IS_FILE (file), FALSE);
- desktop = g_file_new_for_desktop ();
+ desktop = thunar_g_file_new_for_desktop ();
is_desktop = g_file_equal (desktop, file);
g_object_unref (desktop);
@@ -124,9 +125,9 @@ g_file_is_desktop (GFile *file)
GKeyFile *
-g_file_query_key_file (GFile *file,
- GCancellable *cancellable,
- GError **error)
+thunar_g_file_query_key_file (GFile *file,
+ GCancellable *cancellable,
+ GError **error)
{
GKeyFile *key_file;
gchar *contents = NULL;
@@ -163,10 +164,10 @@ g_file_query_key_file (GFile *file,
gboolean
-g_file_write_key_file (GFile *file,
- GKeyFile *key_file,
- GCancellable *cancellable,
- GError **error)
+thunar_g_file_write_key_file (GFile *file,
+ GKeyFile *key_file,
+ GCancellable *cancellable,
+ GError **error)
{
gchar *contents;
gsize length;
@@ -201,7 +202,7 @@ g_file_write_key_file (GFile *file,
gchar *
-g_file_get_location (GFile *file)
+thunar_g_file_get_location (GFile *file)
{
gchar *location;
@@ -217,15 +218,15 @@ g_file_get_location (GFile *file)
GType
-g_file_list_get_type (void)
+thunar_g_file_list_get_type (void)
{
static GType type = G_TYPE_INVALID;
if (G_UNLIKELY (type == G_TYPE_INVALID))
{
- type = g_boxed_type_register_static (I_("GFileList"),
- (GBoxedCopyFunc) g_file_list_copy,
- (GBoxedFreeFunc) g_file_list_free);
+ type = g_boxed_type_register_static (I_("ThunarGFileList"),
+ (GBoxedCopyFunc) thunar_g_file_list_copy,
+ (GBoxedFreeFunc) thunar_g_file_list_free);
}
return type;
@@ -234,7 +235,7 @@ g_file_list_get_type (void)
/**
- * g_file_list_new_from_string:
+ * thunar_g_file_list_new_from_string:
* @string : a string representation of an URI list.
*
* Splits an URI list conforming to the text/uri-list
@@ -248,7 +249,7 @@ g_file_list_get_type (void)
* Return value: the list of #GFile<!---->s or %NULL.
**/
GList *
-g_file_list_new_from_string (const gchar *string)
+thunar_g_file_list_new_from_string (const gchar *string)
{
GList *list = NULL;
gchar **uris;
@@ -267,7 +268,7 @@ g_file_list_new_from_string (const gchar *string)
/**
- * g_file_list_to_string:
+ * thunar_g_file_list_to_string:
* @list : a list of #GFile<!---->s.
*
* Free the returned value using g_free() when you
@@ -277,7 +278,7 @@ g_file_list_new_from_string (const gchar *string)
* text/uri-list mime type defined in RFC 2483.
**/
gchar *
-g_file_list_to_string (GList *list)
+thunar_g_file_list_to_string (GList *list)
{
GString *string;
gchar *uri;
@@ -301,8 +302,8 @@ g_file_list_to_string (GList *list)
GList *
-g_file_list_append (GList *list,
- GFile *file)
+thunar_g_file_list_append (GList *list,
+ GFile *file)
{
return g_list_append (list, g_object_ref (file));
}
@@ -310,8 +311,8 @@ g_file_list_append (GList *list,
GList *
-g_file_list_prepend (GList *list,
- GFile *file)
+thunar_g_file_list_prepend (GList *list,
+ GFile *file)
{
return g_list_prepend (list, g_object_ref (file));
}
@@ -319,17 +320,17 @@ g_file_list_prepend (GList *list,
/**
- * g_file_list_copy:
+ * thunar_g_file_list_copy:
* @list : a list of #GFile<!---->s.
*
* Takes a deep copy of @list and returns the
* result. The caller is responsible to free the
- * returned list using g_file_list_free().
+ * returned list using thunar_g_file_list_free().
*
* Return value: a deep copy of @list.
**/
GList*
-g_file_list_copy (GList *list)
+thunar_g_file_list_copy (GList *list)
{
GList *copy = NULL;
GList *lp;
@@ -343,14 +344,14 @@ g_file_list_copy (GList *list)
/**
- * g_file_list_free:
+ * thunar_g_file_list_free:
* @list : a list of #GFile<!---->s.
*
* Frees the #GFile<!---->s in @list and
* the @list itself.
**/
void
-g_file_list_free (GList *list)
+thunar_g_file_list_free (GList *list)
{
GList *lp;
for (lp = list; lp != NULL; lp = lp->next)
@@ -361,7 +362,7 @@ g_file_list_free (GList *list)
gboolean
-g_volume_is_removable (GVolume *volume)
+thunar_g_volume_is_removable (GVolume *volume)
{
gboolean can_eject = FALSE;
gboolean can_mount = FALSE;
@@ -406,7 +407,7 @@ g_volume_is_removable (GVolume *volume)
gboolean
-g_volume_is_mounted (GVolume *volume)
+thunar_g_volume_is_mounted (GVolume *volume)
{
gboolean is_mounted = FALSE;
GMount *mount;
@@ -427,7 +428,7 @@ g_volume_is_mounted (GVolume *volume)
gboolean
-g_volume_is_present (GVolume *volume)
+thunar_g_volume_is_present (GVolume *volume)
{
gboolean has_media = FALSE;
GDrive *drive;
@@ -443,149 +444,3 @@ g_volume_is_present (GVolume *volume)
return has_media;
}
-
-
-
-gboolean
-g_mount_is_same_drive (GMount *mount,
- GMount *other)
-{
- gboolean same_drive = FALSE;
- GDrive *mount_drive;
- GDrive *other_drive;
-
- _thunar_return_val_if_fail (mount == NULL || G_IS_MOUNT (mount), FALSE);
- _thunar_return_val_if_fail (other == NULL || G_IS_MOUNT (other), FALSE);
-
- if (mount == NULL || other == NULL)
- return FALSE;
-
- mount_drive = g_mount_get_drive (mount);
- other_drive = g_mount_get_drive (other);
-
- if (mount_drive != NULL && other_drive != NULL)
- {
- same_drive = (mount_drive == other_drive);
- }
-
- if (mount_drive != NULL)
- g_object_unref (mount_drive);
-
- if (other_drive != NULL)
- g_object_unref (other_drive);
-
- return same_drive;
-}
-
-
-
-#if !GLIB_CHECK_VERSION(2,18,0)
-GFileType *
-g_file_query_file_type (GFile *file,
- GFileQueryInfoFlags flags
- GCancellable *cancellable)
-{
- GFileInfo *info;
- GFileType file_type = G_FILE_TYPE_UNKNOWN;
-
- _thunar_return_val_if_fail (G_IS_FILE (file), G_FILE_TYPE_UNKNOWN);
-
- info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_TYPE, flags,
- cancellable, NULL);
- if (info != NULL)
- {
- file_type = g_file_info_get_file_type (info);
- g_object_unref (info);
- }
-
- return file_type;
-}
-
-
-
-GFileMonitor *
-g_file_monitor (GFile *file,
- GFileMonitorFlags flags,
- GCancellable *cancellable,
- GError **error)
-{
- GFileType file_type;
-
- _thunar_return_val_if_fail (G_IS_FILE (file), NULL);
- _thunar_return_val_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable), NULL);
- _thunar_return_val_if_fail (error == NULL || *error == NULL, NULL);
-
- file_type = g_file_query_file_type (file, G_FILE_QUERY_INFO_NONE, cancelllable);
-
- if (file_type == G_FILE_TYPE_DIRECTORY)
- return g_file_monitor_directory (file, flags, cancellable, error);
- else
- return g_file_onitor_file (file, flags, cancellable, error);
-}
-
-
-
-/**
- * Copied from http://git.gnome.org/cgit/glib/plain/gio/gfile.c
- * Copyright (c) 2006-2007 Red Hat, Inc.
- * Author: Alexander Larsson <alexl at redhat.com>
- */
-gboolean
-g_file_make_directory_with_parents (GFile *file,
- GCancellable *cancellable,
- GError **error)
-{
- gboolean result;
- GFile *parent_file, *work_file;
- GList *list = NULL, *l;
- GError *my_error = NULL;
-
- if (g_cancellable_set_error_if_cancelled (cancellable, error))
- return FALSE;
-
- result = g_file_make_directory (file, cancellable, &my_error);
- if (result || my_error->code != G_IO_ERROR_NOT_FOUND)
- {
- if (my_error)
- g_propagate_error (error, my_error);
- return result;
- }
-
- work_file = file;
-
- while (!result && my_error->code == G_IO_ERROR_NOT_FOUND)
- {
- g_clear_error (&my_error);
-
- parent_file = g_file_get_parent (work_file);
- if (parent_file == NULL)
- break;
- result = g_file_make_directory (parent_file, cancellable, &my_error);
-
- if (!result && my_error->code == G_IO_ERROR_NOT_FOUND)
- list = g_list_prepend (list, parent_file);
-
- work_file = parent_file;
- }
-
- for (l = list; result && l; l = l->next)
- {
- result = g_file_make_directory ((GFile *) l->data, cancellable, &my_error);
- }
-
- /* Clean up */
- while (list != NULL)
- {
- g_object_unref ((GFile *) list->data);
- list = g_list_remove (list, list->data);
- }
-
- if (!result)
- {
- g_propagate_error (error, my_error);
- return result;
- }
-
- return g_file_make_directory (file, cancellable, error);
-}
-#endif /* !GLIB_CHECK_VERSION(2,18,0) */
diff --git a/thunar/thunar-gio-extensions.h b/thunar/thunar-gio-extensions.h
index 6cc8fb0..0b09fa2 100644
--- a/thunar/thunar-gio-extensions.h
+++ b/thunar/thunar-gio-extensions.h
@@ -1,88 +1,73 @@
-/* $Id$ */
+/* vi:set et ai sw=2 sts=2 ts=2: */
/*-
* 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 your option)
- * any later version.
+ * 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.
+ * 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
+ * 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.
*/
-#ifndef __THUNAR_GLIB_EXTENSIONS_H__
-#define __THUNAR_GLIB_EXTENSIONS_H__
+#ifndef __THUNAR_GIO_EXTENSIONS_H__
+#define __THUNAR_GIO_EXTENSIONS_H__
#include <gio/gio.h>
G_BEGIN_DECLS
-GFile *g_file_new_for_home (void);
-GFile *g_file_new_for_root (void);
-GFile *g_file_new_for_trash (void);
-GFile *g_file_new_for_desktop (void);
-GFile *g_file_new_for_user_special_dir (GUserDirectory dir);
+GFile *thunar_g_file_new_for_home (void);
+GFile *thunar_g_file_new_for_root (void);
+GFile *thunar_g_file_new_for_trash (void);
+GFile *thunar_g_file_new_for_desktop (void);
+GFile *thunar_g_file_new_for_user_special_dir (GUserDirectory dir);
-gboolean g_file_is_root (GFile *file);
-gboolean g_file_is_trashed (GFile *file);
-gboolean g_file_is_desktop (GFile *file);
+gboolean thunar_g_file_is_root (GFile *file);
+gboolean thunar_g_file_is_trashed (GFile *file);
+gboolean thunar_g_file_is_desktop (GFile *file);
-GKeyFile *g_file_query_key_file (GFile *file,
- GCancellable *cancellable,
- GError **error);
-gboolean g_file_write_key_file (GFile *file,
- GKeyFile *key_file,
- GCancellable *cancellable,
- GError **error);
+GKeyFile *thunar_g_file_query_key_file (GFile *file,
+ GCancellable *cancellable,
+ GError **error);
+gboolean thunar_g_file_write_key_file (GFile *file,
+ GKeyFile *key_file,
+ GCancellable *cancellable,
+ GError **error);
-gchar *g_file_get_location (GFile *file);
+gchar *thunar_g_file_get_location (GFile *file);
/**
- * G_TYPE_FILE_LIST:
+ * THUNAR_TYPE_G_FILE_LIST:
*
* Returns the type ID for #GList<!---->s of #GFile<!---->s which is a
* boxed type.
**/
-#define G_TYPE_FILE_LIST (g_file_list_get_type ())
+#define THUNAR_TYPE_G_FILE_LIST (thunar_g_file_list_get_type ())
-GType g_file_list_get_type (void);
+GType thunar_g_file_list_get_type (void);
-GList *g_file_list_new_from_string (const gchar *string);
-gchar *g_file_list_to_string (GList *list);
-GList *g_file_list_append (GList *list,
- GFile *file);
-GList *g_file_list_prepend (GList *list,
- GFile *file);
-GList *g_file_list_copy (GList *list);
-void g_file_list_free (GList *list);
+GList *thunar_g_file_list_new_from_string (const gchar *string);
+gchar *thunar_g_file_list_to_string (GList *list);
+GList *thunar_g_file_list_append (GList *list,
+ GFile *file);
+GList *thunar_g_file_list_prepend (GList *list,
+ GFile *file);
+GList *thunar_g_file_list_copy (GList *list);
+void thunar_g_file_list_free (GList *list);
-gboolean g_volume_is_removable (GVolume *volume);
-gboolean g_volume_is_mounted (GVolume *volume);
-gboolean g_volume_is_present (GVolume *volume);
-
-gboolean g_mount_is_same_drive (GMount *mount,
- GMount *other);
-
-#if !GLIB_CHECK_VERSION(2,18,0)
-GFileType *g_file_query_file_type (GFile *file,
- GFileQueryInfoFlags flags,
- GCancellable *cancellable) G_GNUC_WARN_UNUSED_RESULT;
-GFileMonitor *g_file_monitor (GFile *file,
- GFileMonitorFlags flags,
- GCancellable *cancellable,
- GError **error) G_GNUC_WARN_UNUSED_RESULT;
-gboolean g_file_make_directory_with_parents (GFile *file,
- GCancellable *cancellable,
- GError **error);
-#endif /* !GLIB_CHECK_VERSION(2,18,0) */
+gboolean thunar_g_volume_is_removable (GVolume *volume);
+gboolean thunar_g_volume_is_mounted (GVolume *volume);
+gboolean thunar_g_volume_is_present (GVolume *volume);
G_END_DECLS
-#endif /* !__THUNAR_GLIB_EXTENSIONS_H__ */
+#endif /* !__THUNAR_GIO_EXTENSIONS_H__ */
diff --git a/thunar/thunar-io-jobs-util.c b/thunar/thunar-io-jobs-util.c
index 821778c..8367df8 100644
--- a/thunar/thunar-io-jobs-util.c
+++ b/thunar/thunar-io-jobs-util.c
@@ -87,7 +87,7 @@ thunar_io_jobs_util_next_duplicate_file (ThunarJob *job,
_thunar_return_val_if_fail (G_IS_FILE (file), NULL);
_thunar_return_val_if_fail (0 < n, NULL);
_thunar_return_val_if_fail (error == NULL || *error == NULL, NULL);
- _thunar_return_val_if_fail (!g_file_is_root (file), NULL);
+ _thunar_return_val_if_fail (!thunar_g_file_is_root (file), NULL);
/* abort on cancellation */
if (exo_job_set_error_if_cancelled (EXO_JOB (job), error))
diff --git a/thunar/thunar-io-jobs.c b/thunar/thunar-io-jobs.c
index 7d78008..27b7725 100644
--- a/thunar/thunar-io-jobs.c
+++ b/thunar/thunar-io-jobs.c
@@ -55,7 +55,7 @@ _tij_collect_nofollow (ThunarJob *job,
TRUE, &err);
/* prepend the new files to the existing list */
- file_list = g_file_list_prepend (file_list, lp->data);
+ file_list = thunar_g_file_list_prepend (file_list, lp->data);
file_list = g_list_concat (child_file_list, file_list);
}
@@ -68,7 +68,7 @@ _tij_collect_nofollow (ThunarJob *job,
g_propagate_error (error, err);
/* release the collected files */
- g_file_list_free (file_list);
+ thunar_g_file_list_free (file_list);
return NULL;
}
@@ -218,7 +218,7 @@ ThunarJob *
thunar_io_jobs_create_files (GList *file_list)
{
return thunar_simple_job_launch (_thunar_io_jobs_create, 1,
- G_TYPE_FILE_LIST, file_list);
+ THUNAR_TYPE_G_FILE_LIST, file_list);
}
@@ -354,7 +354,7 @@ ThunarJob *
thunar_io_jobs_make_directories (GList *file_list)
{
return thunar_simple_job_launch (_thunar_io_jobs_mkdir, 1,
- G_TYPE_FILE_LIST, file_list);
+ THUNAR_TYPE_G_FILE_LIST, file_list);
}
@@ -394,7 +394,7 @@ _thunar_io_jobs_unlink (ThunarJob *job,
else
g_propagate_error (error, err);
- g_file_list_free (file_list);
+ thunar_g_file_list_free (file_list);
return FALSE;
}
@@ -407,7 +407,7 @@ _thunar_io_jobs_unlink (ThunarJob *job,
g_assert (G_IS_FILE (lp->data));
/* skip root folders which cannot be deleted anyway */
- if (g_file_is_root (lp->data))
+ if (thunar_g_file_is_root (lp->data))
continue;
again:
@@ -457,7 +457,7 @@ again:
}
/* release the file list */
- g_file_list_free (file_list);
+ thunar_g_file_list_free (file_list);
if (exo_job_set_error_if_cancelled (EXO_JOB (job), error))
return FALSE;
@@ -471,7 +471,7 @@ ThunarJob *
thunar_io_jobs_unlink_files (GList *file_list)
{
return thunar_simple_job_launch (_thunar_io_jobs_unlink, 1,
- G_TYPE_FILE_LIST, file_list);
+ THUNAR_TYPE_G_FILE_LIST, file_list);
}
@@ -563,7 +563,7 @@ again:
g_free (source_path);
if (err == NULL)
- new_files_list = g_file_list_prepend (new_files_list, sp->data);
+ new_files_list = thunar_g_file_list_prepend (new_files_list, sp->data);
else
{
/* check if we have an error from which we can recover */
@@ -600,14 +600,14 @@ again:
if (err != NULL)
{
- g_file_list_free (new_files_list);
+ thunar_g_file_list_free (new_files_list);
g_propagate_error (error, err);
return FALSE;
}
else
{
thunar_job_new_files (THUNAR_JOB (job), new_files_list);
- g_file_list_free (new_files_list);
+ thunar_g_file_list_free (new_files_list);
return TRUE;
}
}
@@ -623,8 +623,8 @@ thunar_io_jobs_link_files (GList *source_file_list,
_thunar_return_val_if_fail (g_list_length (source_file_list) == g_list_length (target_file_list), NULL);
return thunar_simple_job_launch (_thunar_io_jobs_link, 2,
- G_TYPE_FILE_LIST, source_file_list,
- G_TYPE_FILE_LIST, target_file_list);
+ THUNAR_TYPE_G_FILE_LIST, source_file_list,
+ THUNAR_TYPE_G_FILE_LIST, target_file_list);
}
@@ -673,7 +673,7 @@ thunar_io_jobs_trash_files (GList *file_list)
_thunar_return_val_if_fail (file_list != NULL, NULL);
return thunar_simple_job_launch (_thunar_io_jobs_trash, 1,
- G_TYPE_FILE_LIST, file_list);
+ THUNAR_TYPE_G_FILE_LIST, file_list);
}
@@ -727,7 +727,7 @@ _thunar_io_jobs_chown (ThunarJob *job,
if (recursive)
file_list = _tij_collect_nofollow (job, file_list, &err);
else
- file_list = g_file_list_copy (file_list);
+ file_list = thunar_g_file_list_copy (file_list);
if (err != NULL)
{
@@ -799,7 +799,7 @@ retry_chown:
}
/* release the file list */
- g_file_list_free (file_list);
+ thunar_g_file_list_free (file_list);
if (err != NULL)
{
@@ -828,7 +828,7 @@ thunar_io_jobs_change_group (GFile *file,
file_list.prev = NULL;
return thunar_simple_job_launch (_thunar_io_jobs_chown, 4,
- G_TYPE_FILE_LIST, &file_list,
+ THUNAR_TYPE_G_FILE_LIST, &file_list,
G_TYPE_INT, -1,
G_TYPE_INT, (gint) gid,
G_TYPE_BOOLEAN, recursive);
@@ -874,7 +874,7 @@ _thunar_io_jobs_chmod (ThunarJob *job,
if (recursive)
file_list = _tij_collect_nofollow (job, file_list, &err);
else
- file_list = g_file_list_copy (file_list);
+ file_list = thunar_g_file_list_copy (file_list);
if (err != NULL)
{
@@ -952,7 +952,7 @@ retry_chown:
}
/* release the file list */
- g_file_list_free (file_list);
+ thunar_g_file_list_free (file_list);
if (err != NULL)
{
@@ -985,7 +985,7 @@ thunar_io_jobs_change_mode (GFile *file,
file_list.prev = NULL;
return thunar_simple_job_launch (_thunar_io_jobs_chmod, 6,
- G_TYPE_FILE_LIST, &file_list,
+ THUNAR_TYPE_G_FILE_LIST, &file_list,
THUNAR_TYPE_FILE_MODE, dir_mask,
THUNAR_TYPE_FILE_MODE, dir_mode,
THUNAR_TYPE_FILE_MODE, file_mask,
@@ -1039,7 +1039,7 @@ _thunar_io_jobs_ls (ThunarJob *job,
}
/* free the GFile list */
- g_file_list_free (path_list);
+ thunar_g_file_list_free (path_list);
/* abort on errors or cancellation */
if (err != NULL)
diff --git a/thunar/thunar-io-scan-directory.c b/thunar/thunar-io-scan-directory.c
index 9acdae1..cacc381 100644
--- a/thunar/thunar-io-scan-directory.c
+++ b/thunar/thunar-io-scan-directory.c
@@ -90,7 +90,7 @@ thunar_io_scan_directory (ThunarJob *job,
{
/* create GFile for the child and prepend it to the file list */
child_file = g_file_get_child (file, g_file_info_get_name (info));
- files = g_file_list_prepend (files, child_file);
+ files = thunar_g_file_list_prepend (files, child_file);
/* if the child is a directory and we need to recurse ... just do so */
if (recursively && g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY)
@@ -116,13 +116,13 @@ thunar_io_scan_directory (ThunarJob *job,
if (G_UNLIKELY (err != NULL))
{
g_propagate_error (error, err);
- g_file_list_free (files);
+ thunar_g_file_list_free (files);
return NULL;
}
else if (exo_job_set_error_if_cancelled (EXO_JOB (job), &err))
{
g_propagate_error (error, err);
- g_file_list_free (files);
+ thunar_g_file_list_free (files);
return NULL;
}
diff --git a/thunar/thunar-launcher.c b/thunar/thunar-launcher.c
index 3f88af1..a9c6feb 100644
--- a/thunar/thunar-launcher.c
+++ b/thunar/thunar-launcher.c
@@ -608,7 +608,7 @@ thunar_launcher_open_files (ThunarLauncher *launcher,
applications = g_hash_table_new_full (g_direct_hash,
(GEqualFunc) g_app_info_equal,
(GDestroyNotify) g_object_unref,
- (GDestroyNotify) g_file_list_free);
+ (GDestroyNotify) thunar_g_file_list_free);
for (lp = files; lp != NULL; lp = lp->next)
{
@@ -623,11 +623,11 @@ thunar_launcher_open_files (ThunarLauncher *launcher,
if (G_LIKELY (file_list != NULL))
{
/* take a copy of the list as the old one will be dropped by the insert */
- file_list = g_file_list_copy (file_list);
+ file_list = thunar_g_file_list_copy (file_list);
}
/* append our new URI to the list */
- file_list = g_file_list_append (file_list, thunar_file_get_file (lp->data));
+ file_list = thunar_g_file_list_append (file_list, thunar_file_get_file (lp->data));
/* (re)insert the URI list for the application */
g_hash_table_insert (applications, app_info, file_list);
@@ -1231,9 +1231,9 @@ thunar_launcher_action_open (GtkAction *action,
if (G_LIKELY (app_info != NULL))
{
/* try to open the selected files using the given application */
- selected_paths = thunar_file_list_to_g_file_list (launcher->selected_files);
+ selected_paths = thunar_file_list_to_thunar_g_file_list (launcher->selected_files);
thunar_launcher_open_paths (app_info, selected_paths, launcher);
- g_file_list_free (selected_paths);
+ thunar_g_file_list_free (selected_paths);
}
else if (g_list_length (launcher->selected_files) == 1)
{
@@ -1295,12 +1295,12 @@ thunar_launcher_action_sendto_desktop (GtkAction *action,
_thunar_return_if_fail (THUNAR_IS_LAUNCHER (launcher));
/* determine the source files */
- files = thunar_file_list_to_g_file_list (launcher->selected_files);
+ files = thunar_file_list_to_thunar_g_file_list (launcher->selected_files);
if (G_UNLIKELY (files == NULL))
return;
/* determine the file to the ~/Desktop folder */
- desktop_file = g_file_new_for_desktop ();
+ desktop_file = thunar_g_file_new_for_desktop ();
/* launch the link job */
application = thunar_application_get ();
@@ -1309,7 +1309,7 @@ thunar_launcher_action_sendto_desktop (GtkAction *action,
/* cleanup */
g_object_unref (desktop_file);
- g_file_list_free (files);
+ thunar_g_file_list_free (files);
}
@@ -1324,7 +1324,7 @@ thunar_launcher_mount_data_new (ThunarLauncher *launcher,
data = _thunar_slice_new0 (ThunarLauncherMountData);
data->launcher = g_object_ref (launcher);
- data->files = g_file_list_copy (files);
+ data->files = thunar_g_file_list_copy (files);
return data;
}
@@ -1338,7 +1338,7 @@ thunar_launcher_mount_data_free (ThunarLauncherMountData *data)
_thunar_return_if_fail (THUNAR_IS_LAUNCHER (data->launcher));
g_object_unref (data->launcher);
- g_file_list_free (data->files);
+ thunar_g_file_list_free (data->files);
_thunar_slice_free (ThunarLauncherMountData, data);
}
@@ -1382,7 +1382,7 @@ thunar_launcher_sendto_volume (ThunarLauncher *launcher,
_thunar_return_if_fail (THUNAR_IS_LAUNCHER (launcher));
_thunar_return_if_fail (G_IS_VOLUME (volume));
- if (!g_volume_is_mounted (volume))
+ if (!thunar_g_volume_is_mounted (volume))
return;
mount = g_volume_get_mount (volume);
@@ -1452,7 +1452,7 @@ thunar_launcher_action_sendto_volume (GtkAction *action,
_thunar_return_if_fail (THUNAR_IS_LAUNCHER (launcher));
/* determine the source paths */
- files = thunar_file_list_to_g_file_list (launcher->selected_files);
+ files = thunar_file_list_to_thunar_g_file_list (launcher->selected_files);
if (G_UNLIKELY (files == NULL))
return;
@@ -1462,7 +1462,7 @@ thunar_launcher_action_sendto_volume (GtkAction *action,
return;
/* make sure to mount the volume first, if it's not already mounted */
- if (!g_volume_is_mounted (volume))
+ if (!thunar_g_volume_is_mounted (volume))
{
/* determine the toplevel window */
window = gtk_widget_get_toplevel (launcher->widget);
@@ -1483,7 +1483,7 @@ thunar_launcher_action_sendto_volume (GtkAction *action,
}
/* cleanup */
- g_file_list_free (files);
+ thunar_g_file_list_free (files);
}
@@ -1570,7 +1570,7 @@ thunar_launcher_sendto_idle (gpointer user_data)
{
/* skip non-removable or disc media (CD-ROMs aren't writable by Thunar) */
/* TODO skip non-writable volumes like CD-ROMs here */
- if (!g_volume_is_removable (lp->data))
+ if (!thunar_g_volume_is_removable (lp->data))
{
g_object_unref (lp->data);
continue;
diff --git a/thunar/thunar-location-button.c b/thunar/thunar-location-button.c
index 523b332..d639364 100644
--- a/thunar/thunar-location-button.c
+++ b/thunar/thunar-location-button.c
@@ -342,7 +342,7 @@ thunar_location_button_finalize (GObject *object)
ThunarLocationButton *location_button = THUNAR_LOCATION_BUTTON (object);
/* release the drop path list (just in case the drag-leave wasn't fired before) */
- g_file_list_free (location_button->drop_file_list);
+ thunar_g_file_list_free (location_button->drop_file_list);
/* be sure to cancel any pending enter timeout */
if (G_UNLIKELY (location_button->enter_timeout_id != 0))
@@ -664,7 +664,7 @@ thunar_location_button_drag_data_get (GtkWidget *button,
{
/* transform the path into an uri list string */
path_list.data = thunar_file_get_file (location_button->file); path_list.next = path_list.prev = NULL;
- uri_string = g_file_list_to_string (&path_list);
+ uri_string = thunar_g_file_list_to_string (&path_list);
/* set the uri list for the drag selection */
gtk_selection_data_set (selection_data, selection_data->target, 8, (guchar *) uri_string, strlen (uri_string));
@@ -695,7 +695,7 @@ thunar_location_button_drag_data_received (GtkWidget *button,
{
/* extract the URI list from the selection data (if valid) */
if (selection_data->format == 8 && selection_data->length > 0)
- location_button->drop_file_list = g_file_list_new_from_string ((const gchar *) selection_data->data);
+ location_button->drop_file_list = thunar_g_file_list_new_from_string ((const gchar *) selection_data->data);
/* reset the state */
location_button->drop_data_ready = TRUE;
@@ -754,7 +754,7 @@ thunar_location_button_drag_leave (GtkWidget *button,
/* reset the "drop data ready" status and free the path list */
if (G_LIKELY (location_button->drop_data_ready))
{
- g_file_list_free (location_button->drop_file_list);
+ thunar_g_file_list_free (location_button->drop_file_list);
location_button->drop_data_ready = FALSE;
location_button->drop_file_list = NULL;
}
diff --git a/thunar/thunar-location-entry.c b/thunar/thunar-location-entry.c
index 99ad380..265b586 100644
--- a/thunar/thunar-location-entry.c
+++ b/thunar/thunar-location-entry.c
@@ -760,7 +760,7 @@ thunar_location_entry_item_activated (GtkWidget *item,
if (G_UNLIKELY (volume != NULL))
{
/* check if the volume isn't already mounted */
- if (G_LIKELY (!g_volume_is_mounted (volume)))
+ if (G_LIKELY (!thunar_g_volume_is_mounted (volume)))
{
mount_operation = gtk_mount_operation_new (GTK_WINDOW (window));
diff --git a/thunar/thunar-misc-jobs.c b/thunar/thunar-misc-jobs.c
index df444e0..9005cef 100644
--- a/thunar/thunar-misc-jobs.c
+++ b/thunar/thunar-misc-jobs.c
@@ -52,8 +52,8 @@ _thunar_misc_jobs_load_templates (ThunarJob *job,
menu = g_value_get_object (g_value_array_get_nth (param_values, 0));
g_object_set_data (G_OBJECT (job), "menu", menu);
- home_dir = g_file_new_for_home ();
- templates_dir = g_file_new_for_user_special_dir (G_USER_DIRECTORY_TEMPLATES);
+ home_dir = thunar_g_file_new_for_home ();
+ templates_dir = thunar_g_file_new_for_user_special_dir (G_USER_DIRECTORY_TEMPLATES);
if (G_LIKELY (!g_file_equal (templates_dir, home_dir)))
{
@@ -72,7 +72,7 @@ _thunar_misc_jobs_load_templates (ThunarJob *job,
}
/* free the GFile list */
- g_file_list_free (paths);
+ thunar_g_file_list_free (paths);
}
g_object_unref (templates_dir);
diff --git a/thunar/thunar-path-entry.c b/thunar/thunar-path-entry.c
index ccfc636..40d61b6 100644
--- a/thunar/thunar-path-entry.c
+++ b/thunar/thunar-path-entry.c
@@ -756,7 +756,7 @@ thunar_path_entry_drag_data_get (GtkWidget *widget,
{
/* transform the path for the current file into an uri string list */
file_list.data = thunar_file_get_file (path_entry->current_file); file_list.next = file_list.prev = NULL;
- uri_string = g_file_list_to_string (&file_list);
+ uri_string = thunar_g_file_list_to_string (&file_list);
/* setup the uri list for the drag selection */
gtk_selection_data_set (selection_data, selection_data->target, 8, (guchar *) uri_string, strlen (uri_string));
diff --git a/thunar/thunar-renamer-dialog.c b/thunar/thunar-renamer-dialog.c
index 1488166..02be6c3 100644
--- a/thunar/thunar-renamer-dialog.c
+++ b/thunar/thunar-renamer-dialog.c
@@ -1362,7 +1362,7 @@ thunar_renamer_dialog_drag_data_received (GtkWidget *tree_view,
}
/* determine the file list from the selection_data */
- file_list = g_file_list_new_from_string ((const gchar *) selection_data->data);
+ file_list = thunar_g_file_list_new_from_string ((const gchar *) selection_data->data);
/* add all paths to the model */
for (lp = file_list; lp != NULL; lp = lp->next)
diff --git a/thunar/thunar-shortcuts-icon-renderer.c b/thunar/thunar-shortcuts-icon-renderer.c
index c4f1db6..953fb9e 100644
--- a/thunar/thunar-shortcuts-icon-renderer.c
+++ b/thunar/thunar-shortcuts-icon-renderer.c
@@ -267,7 +267,7 @@ thunar_shortcuts_icon_renderer_render (GtkCellRenderer *renderer,
icon_area.height = gdk_pixbuf_get_height (icon);
}
- if (!g_volume_is_mounted (shortcuts_icon_renderer->volume))
+ if (!thunar_g_volume_is_mounted (shortcuts_icon_renderer->volume))
{
/* 50% translucent for unmounted volumes */
temp = exo_gdk_pixbuf_lucent (icon, 50);
diff --git a/thunar/thunar-shortcuts-model.c b/thunar/thunar-shortcuts-model.c
index dbb56ad..5ef7eb7 100644
--- a/thunar/thunar-shortcuts-model.c
+++ b/thunar/thunar-shortcuts-model.c
@@ -289,20 +289,20 @@ thunar_shortcuts_model_init (ThunarShortcutsModel *model)
g_signal_connect (model->volume_monitor, "volume-removed", G_CALLBACK (thunar_shortcuts_model_volume_removed), model);
g_signal_connect (model->volume_monitor, "volume-changed", G_CALLBACK (thunar_shortcuts_model_volume_changed), model);
- home = g_file_new_for_home ();
+ home = thunar_g_file_new_for_home ();
/* determine the system-defined paths */
system_paths = g_list_append (system_paths, g_object_ref (home));
- system_paths = g_list_append (system_paths, g_file_new_for_trash ());
+ system_paths = g_list_append (system_paths, thunar_g_file_new_for_trash ());
- desktop = g_file_new_for_desktop ();
+ desktop = thunar_g_file_new_for_desktop ();
if (!g_file_equal (desktop, home))
system_paths = g_list_append (system_paths, desktop);
else
g_object_unref (desktop);
- system_paths = g_list_append (system_paths, g_file_new_for_root ());
+ system_paths = g_list_append (system_paths, thunar_g_file_new_for_root ());
/* will be used to append the shortcuts to the list */
path = gtk_tree_path_new_from_indices (0, -1);
@@ -319,7 +319,7 @@ thunar_shortcuts_model_init (ThunarShortcutsModel *model)
shortcut->type = THUNAR_SHORTCUT_SYSTEM_DEFINED;
shortcut->file = file;
- if (g_file_is_desktop (lp->data))
+ if (thunar_g_file_is_desktop (lp->data))
{
gchar *old_locale = NULL;
gchar *locale = NULL;
@@ -361,7 +361,7 @@ thunar_shortcuts_model_init (ThunarShortcutsModel *model)
volume = G_VOLUME (lp->data);
/* we list only present, removable devices here */
- if (g_volume_is_removable (volume) && g_volume_is_present (volume))
+ if (thunar_g_volume_is_removable (volume) && thunar_g_volume_is_present (volume))
{
/* generate the shortcut (w/o a file, else we might
* prevent the volume from being unmounted)
@@ -845,7 +845,7 @@ thunar_shortcuts_model_load (ThunarShortcutsModel *model)
FILE *fp;
gint i;
- home = g_file_new_for_home ();
+ home = thunar_g_file_new_for_home ();
/* determine the path to the GTK+ bookmarks file */
bookmarks_path = xfce_get_homefile (".gtk-bookmarks", NULL);
@@ -1192,7 +1192,7 @@ thunar_shortcuts_model_volume_changed (GVolumeMonitor *volume_monitor,
if (lp != NULL)
{
/* check if we need to display the volume now */
- if (g_volume_is_removable (volume) && g_volume_is_present (volume))
+ if (thunar_g_volume_is_removable (volume) && thunar_g_volume_is_present (volume))
{
/* remove the volume from the list of hidden volumes */
model->hidden_volumes = g_list_delete_link (model->hidden_volumes, lp);
@@ -1233,7 +1233,7 @@ thunar_shortcuts_model_volume_changed (GVolumeMonitor *volume_monitor,
_thunar_assert (shortcut->volume == volume);
/* check if we need to hide the volume now */
- if (!g_volume_is_removable (volume) || !g_volume_is_present (volume))
+ if (!thunar_g_volume_is_removable (volume) || !thunar_g_volume_is_present (volume))
{
/* move the volume to the hidden list */
model->hidden_volumes = g_list_prepend (model->hidden_volumes,
diff --git a/thunar/thunar-shortcuts-view.c b/thunar/thunar-shortcuts-view.c
index 1949f5a..91be180 100644
--- a/thunar/thunar-shortcuts-view.c
+++ b/thunar/thunar-shortcuts-view.c
@@ -304,7 +304,7 @@ thunar_shortcuts_view_finalize (GObject *object)
ThunarShortcutsView *view = THUNAR_SHORTCUTS_VIEW (object);
/* release drop path list (if drag_leave wasn't called) */
- g_file_list_free (view->drop_file_list);
+ thunar_g_file_list_free (view->drop_file_list);
/* release the provider factory */
g_object_unref (G_OBJECT (view->provider_factory));
@@ -441,7 +441,7 @@ thunar_shortcuts_view_drag_data_received (GtkWidget *widget,
{
/* extract the URI list from the selection data (if valid) */
if (info == TEXT_URI_LIST && selection_data->format == 8 && selection_data->length > 0)
- view->drop_file_list = g_file_list_new_from_string ((const gchar *) selection_data->data);
+ view->drop_file_list = thunar_g_file_list_new_from_string ((const gchar *) selection_data->data);
/* reset the state */
view->drop_data_ready = TRUE;
@@ -687,7 +687,7 @@ thunar_shortcuts_view_drag_leave (GtkWidget *widget,
/* reset the "drop data ready" status and free the URI list */
if (G_LIKELY (view->drop_data_ready))
{
- g_file_list_free (view->drop_file_list);
+ thunar_g_file_list_free (view->drop_file_list);
view->drop_data_ready = FALSE;
view->drop_file_list = NULL;
}
@@ -808,13 +808,13 @@ thunar_shortcuts_view_context_menu (ThunarShortcutsView *view,
{
/* append the "Mount Volume" menu action */
item = gtk_image_menu_item_new_with_mnemonic (_("_Mount Volume"));
- gtk_widget_set_sensitive (item, !g_volume_is_mounted (volume));
+ gtk_widget_set_sensitive (item, !thunar_g_volume_is_mounted (volume));
g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_shortcuts_view_mount), view);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_show (item);
/* check if the volume is ejectable */
- if (g_volume_is_removable (volume))
+ if (thunar_g_volume_is_removable (volume))
{
/* append the "Eject Volume" menu action */
item = gtk_image_menu_item_new_with_mnemonic (_("E_ject Volume"));
diff --git a/thunar/thunar-standard-view.c b/thunar/thunar-standard-view.c
index c1e905f..2aa6b8f 100644
--- a/thunar/thunar-standard-view.c
+++ b/thunar/thunar-standard-view.c
@@ -293,7 +293,7 @@ struct _ThunarStandardViewPrivate
gint custom_merge_id;
/* right-click drag/popup support */
- GList *drag_file_list;
+ GList *drathunar_g_file_list;
gint drag_scroll_timer_id;
gint drag_timer_id;
gint drag_x;
@@ -765,10 +765,10 @@ thunar_standard_view_finalize (GObject *object)
g_object_unref (G_OBJECT (standard_view->priv->provider_factory));
/* release the drag path list (just in case the drag-end wasn't fired before) */
- g_file_list_free (standard_view->priv->drag_file_list);
+ thunar_g_file_list_free (standard_view->priv->drathunar_g_file_list);
/* release the drop path list (just in case the drag-leave wasn't fired before) */
- g_file_list_free (standard_view->priv->drop_file_list);
+ thunar_g_file_list_free (standard_view->priv->drop_file_list);
/* release the reference on the name renderer */
g_object_unref (G_OBJECT (standard_view->name_renderer));
@@ -788,7 +788,7 @@ thunar_standard_view_finalize (GObject *object)
}
/* drop any remaining "new-files" paths */
- g_file_list_free (standard_view->priv->new_files_path_list);
+ thunar_g_file_list_free (standard_view->priv->new_files_path_list);
/* release our reference on the preferences */
g_object_unref (G_OBJECT (standard_view->preferences));
@@ -1277,7 +1277,7 @@ thunar_standard_view_set_loading (ThunarStandardView *standard_view,
thunar_standard_view_new_files (standard_view, new_files_path_list);
/* cleanup */
- g_file_list_free (new_files_path_list);
+ thunar_g_file_list_free (new_files_path_list);
}
/* notify listeners */
@@ -2140,7 +2140,7 @@ thunar_standard_view_action_duplicate (GtkAction *action,
if (G_LIKELY (current_directory != NULL))
{
/* determine the selected files for the view */
- selected_files = thunar_file_list_to_g_file_list (standard_view->selected_files);
+ selected_files = thunar_file_list_to_thunar_g_file_list (standard_view->selected_files);
if (G_LIKELY (selected_files != NULL))
{
/* copy the selected files into the current directory, which effectively
@@ -2153,7 +2153,7 @@ thunar_standard_view_action_duplicate (GtkAction *action,
g_object_unref (G_OBJECT (application));
/* clean up */
- g_file_list_free (selected_files);
+ thunar_g_file_list_free (selected_files);
}
}
}
@@ -2177,7 +2177,7 @@ thunar_standard_view_action_make_link (GtkAction *action,
if (G_LIKELY (current_directory != NULL))
{
/* determine the selected paths for the view */
- selected_files = thunar_file_list_to_g_file_list (standard_view->selected_files);
+ selected_files = thunar_file_list_to_thunar_g_file_list (standard_view->selected_files);
if (G_LIKELY (selected_files != NULL))
{
/* link the selected files into the current directory, which effectively
@@ -2190,7 +2190,7 @@ thunar_standard_view_action_make_link (GtkAction *action,
g_object_unref (G_OBJECT (application));
/* clean up */
- g_file_list_free (selected_files);
+ thunar_g_file_list_free (selected_files);
}
}
}
@@ -2340,7 +2340,7 @@ thunar_standard_view_new_files (ThunarStandardView *standard_view,
/* release the previous "new-files" paths (if any) */
if (G_UNLIKELY (standard_view->priv->new_files_path_list != NULL))
{
- g_file_list_free (standard_view->priv->new_files_path_list);
+ thunar_g_file_list_free (standard_view->priv->new_files_path_list);
standard_view->priv->new_files_path_list = NULL;
}
@@ -2348,7 +2348,7 @@ thunar_standard_view_new_files (ThunarStandardView *standard_view,
if (G_UNLIKELY (standard_view->loading))
{
/* schedule the "new-files" paths for later processing */
- standard_view->priv->new_files_path_list = g_file_list_copy (path_list);
+ standard_view->priv->new_files_path_list = thunar_g_file_list_copy (path_list);
}
else if (G_LIKELY (path_list != NULL))
{
@@ -2665,7 +2665,7 @@ thunar_standard_view_drag_data_received (GtkWidget *view,
{
/* extract the URI list from the selection data (if valid) */
if (info == TARGET_TEXT_URI_LIST && selection_data->format == 8 && selection_data->length > 0)
- standard_view->priv->drop_file_list = g_file_list_new_from_string ((gchar *) selection_data->data);
+ standard_view->priv->drop_file_list = thunar_g_file_list_new_from_string ((gchar *) selection_data->data);
/* reset the state */
standard_view->priv->drop_data_ready = TRUE;
@@ -2836,7 +2836,7 @@ thunar_standard_view_drag_leave (GtkWidget *widget,
/* reset the "drop data ready" status and free the URI list */
if (G_LIKELY (standard_view->priv->drop_data_ready))
{
- g_file_list_free (standard_view->priv->drop_file_list);
+ thunar_g_file_list_free (standard_view->priv->drop_file_list);
standard_view->priv->drop_file_list = NULL;
standard_view->priv->drop_data_ready = FALSE;
}
@@ -2943,14 +2943,14 @@ thunar_standard_view_drag_begin (GtkWidget *view,
gint size;
/* release the drag path list (just in case the drag-end wasn't fired before) */
- g_file_list_free (standard_view->priv->drag_file_list);
+ thunar_g_file_list_free (standard_view->priv->drathunar_g_file_list);
/* query the list of selected URIs */
- standard_view->priv->drag_file_list = thunar_file_list_to_g_file_list (standard_view->selected_files);
- if (G_LIKELY (standard_view->priv->drag_file_list != NULL))
+ standard_view->priv->drathunar_g_file_list = thunar_file_list_to_thunar_g_file_list (standard_view->selected_files);
+ if (G_LIKELY (standard_view->priv->drathunar_g_file_list != NULL))
{
/* determine the first selected file */
- file = thunar_file_get (standard_view->priv->drag_file_list->data, NULL);
+ file = thunar_file_get (standard_view->priv->drathunar_g_file_list->data, NULL);
if (G_LIKELY (file != NULL))
{
/* generate an icon based on that file */
@@ -2978,7 +2978,7 @@ thunar_standard_view_drag_data_get (GtkWidget *view,
gchar *uri_string;
/* set the URI list for the drag selection */
- uri_string = g_file_list_to_string (standard_view->priv->drag_file_list);
+ uri_string = thunar_g_file_list_to_string (standard_view->priv->drathunar_g_file_list);
gtk_selection_data_set (selection_data, selection_data->target, 8, (guchar *) uri_string, strlen (uri_string));
g_free (uri_string);
}
@@ -3006,8 +3006,8 @@ thunar_standard_view_drag_end (GtkWidget *view,
g_source_remove (standard_view->priv->drag_scroll_timer_id);
/* release the list of dragged URIs */
- g_file_list_free (standard_view->priv->drag_file_list);
- standard_view->priv->drag_file_list = NULL;
+ thunar_g_file_list_free (standard_view->priv->drathunar_g_file_list);
+ standard_view->priv->drathunar_g_file_list = NULL;
}
diff --git a/thunar/thunar-transfer-job.c b/thunar/thunar-transfer-job.c
index d793ad0..0fbc5de 100644
--- a/thunar/thunar-transfer-job.c
+++ b/thunar/thunar-transfer-job.c
@@ -138,7 +138,7 @@ thunar_transfer_job_finalize (GObject *object)
g_list_foreach (job->source_node_list, (GFunc) thunar_transfer_node_free, NULL);
g_list_free (job->source_node_list);
- g_file_list_free (job->target_file_list);
+ thunar_g_file_list_free (job->target_file_list);
(*G_OBJECT_CLASS (thunar_transfer_job_parent_class)->finalize) (object);
}
@@ -223,7 +223,7 @@ thunar_transfer_job_collect_node (ThunarTransferJob *job,
}
/* release the child files */
- g_file_list_free (file_list);
+ thunar_g_file_list_free (file_list);
}
/* release file info */
@@ -568,7 +568,7 @@ retry_copy:
/* add the real target file to the return list */
if (G_LIKELY (target_file_list_return != NULL))
- *target_file_list_return = g_file_list_prepend (*target_file_list_return, real_target_file);
+ *target_file_list_return = thunar_g_file_list_prepend (*target_file_list_return, real_target_file);
retry_remove:
/* try to remove the source directory if we are on copy+remove fallback for move */
@@ -669,7 +669,7 @@ thunar_transfer_job_execute (ExoJob *job,
/* check if we are moving a file out of the trash */
if (transfer_job->type == THUNAR_TRANSFER_JOB_MOVE
- && g_file_is_trashed (node->source_file))
+ && thunar_g_file_is_trashed (node->source_file))
{
/* update progress information */
exo_job_info_message (job, _("Trying to restore \"%s\""),
@@ -749,7 +749,7 @@ thunar_transfer_job_execute (ExoJob *job,
NULL, NULL, &err))
{
/* add the target file to the new files list */
- new_files_list = g_file_list_prepend (new_files_list, tp->data);
+ new_files_list = thunar_g_file_list_prepend (new_files_list, tp->data);
/* release source and target files */
thunar_transfer_node_free (node);
@@ -807,7 +807,7 @@ thunar_transfer_job_execute (ExoJob *job,
else
{
thunar_job_new_files (THUNAR_JOB (job), new_files_list);
- g_file_list_free (new_files_list);
+ thunar_g_file_list_free (new_files_list);
return TRUE;
}
}
@@ -864,7 +864,7 @@ thunar_transfer_job_new (GList *source_node_list,
sp = sp->next, tp = tp->next)
{
/* make sure we don't transfer root directories. this should be prevented in the GUI */
- if (G_UNLIKELY (g_file_is_root (sp->data) || g_file_is_root (tp->data)))
+ if (G_UNLIKELY (thunar_g_file_is_root (sp->data) || thunar_g_file_is_root (tp->data)))
continue;
/* only process non-equal pairs unless we're copying */
@@ -876,7 +876,7 @@ thunar_transfer_job_new (GList *source_node_list,
job->source_node_list = g_list_append (job->source_node_list, node);
/* append target file */
- job->target_file_list = g_file_list_append (job->target_file_list, tp->data);
+ job->target_file_list = thunar_g_file_list_append (job->target_file_list, tp->data);
}
}
diff --git a/thunar/thunar-trash-action.c b/thunar/thunar-trash-action.c
index d3727b2..39f89bc 100644
--- a/thunar/thunar-trash-action.c
+++ b/thunar/thunar-trash-action.c
@@ -102,7 +102,7 @@ thunar_trash_action_init (ThunarTrashAction *trash_action)
GFile *trash_bin;
/* try to connect to the trash bin */
- trash_bin = g_file_new_for_trash ();
+ trash_bin = thunar_g_file_new_for_trash ();
trash_action->trash_bin = thunar_file_get (trash_bin, NULL);
g_object_unref (trash_bin);
diff --git a/thunar/thunar-tree-model.c b/thunar/thunar-tree-model.c
index b4d274b..0ae4082 100644
--- a/thunar/thunar-tree-model.c
+++ b/thunar/thunar-tree-model.c
@@ -318,9 +318,9 @@ thunar_tree_model_init (ThunarTreeModel *model)
ThunarTreeModelItem *item;
ThunarFile *file;
GFile *system_path_list[3] = {
- g_file_new_for_home (),
- g_file_new_for_trash (),
- g_file_new_for_root ()
+ thunar_g_file_new_for_home (),
+ thunar_g_file_new_for_trash (),
+ thunar_g_file_new_for_root ()
};
GList *volumes;
GList *lp;
@@ -998,7 +998,7 @@ thunar_tree_model_volume_changed (GVolumeMonitor *volume_monitor,
if (G_LIKELY (lp != NULL))
{
/* check if we need to display the volume now */
- if (g_volume_is_removable (volume) && g_volume_is_present (volume))
+ if (thunar_g_volume_is_removable (volume) && thunar_g_volume_is_present (volume))
{
/* remove the volume from the list of hidden volumes */
model->hidden_volumes = g_list_delete_link (model->hidden_volumes, lp);
@@ -1040,7 +1040,7 @@ thunar_tree_model_volume_changed (GVolumeMonitor *volume_monitor,
_thunar_assert (item->volume == volume);
/* check if we need to hide the volume now */
- if (!g_volume_is_removable (volume) || !g_volume_is_present (volume))
+ if (!thunar_g_volume_is_removable (volume) || !thunar_g_volume_is_present (volume))
{
/* need to ref here, because the volumes_removed() handler will drop the reference */
g_object_ref (volume);
@@ -1054,7 +1054,7 @@ thunar_tree_model_volume_changed (GVolumeMonitor *volume_monitor,
else
{
/* check if the volume is mounted and we don't have a file yet */
- if (g_volume_is_mounted (volume) && item->file == NULL)
+ if (thunar_g_volume_is_mounted (volume) && item->file == NULL)
{
mount = g_volume_get_mount (volume);
@@ -1072,7 +1072,7 @@ thunar_tree_model_volume_changed (GVolumeMonitor *volume_monitor,
g_object_unref (mount);
}
}
- else if (!g_volume_is_mounted (volume) && item->file != NULL)
+ else if (!thunar_g_volume_is_mounted (volume) && item->file != NULL)
{
/* reset the item for the node */
thunar_tree_model_item_reset (item);
@@ -1227,7 +1227,7 @@ thunar_tree_model_item_new_with_volume (ThunarTreeModel *model,
item->model = model;
/* check if the volume is mounted */
- if (g_volume_is_mounted (volume))
+ if (thunar_g_volume_is_mounted (volume))
{
mount = g_volume_get_mount (volume);
@@ -1519,7 +1519,7 @@ thunar_tree_model_item_load_idle (gpointer user_data)
GDK_THREADS_ENTER ();
/* check if we don't have a file yet and this is a mounted volume */
- if (item->file == NULL && item->volume != NULL && g_volume_is_mounted (item->volume))
+ if (item->file == NULL && item->volume != NULL && thunar_g_volume_is_mounted (item->volume))
{
mount = g_volume_get_mount (item->volume);
diff --git a/thunar/thunar-tree-view.c b/thunar/thunar-tree-view.c
index 08fa5f8..c94e3d4 100644
--- a/thunar/thunar-tree-view.c
+++ b/thunar/thunar-tree-view.c
@@ -471,7 +471,7 @@ thunar_tree_view_finalize (GObject *object)
ThunarTreeView *view = THUNAR_TREE_VIEW (object);
/* release drop path list (if drag_leave wasn't called) */
- g_file_list_free (view->drop_file_list);
+ thunar_g_file_list_free (view->drop_file_list);
/* release the provider factory */
g_object_unref (G_OBJECT (view->provider_factory));
@@ -764,7 +764,7 @@ thunar_tree_view_drag_data_received (GtkWidget *widget,
{
/* extract the URI list from the selection data (if valid) */
if (info == TARGET_TEXT_URI_LIST && selection_data->format == 8 && selection_data->length > 0)
- view->drop_file_list = g_file_list_new_from_string ((const gchar *) selection_data->data);
+ view->drop_file_list = thunar_g_file_list_new_from_string ((const gchar *) selection_data->data);
/* reset the state */
view->drop_data_ready = TRUE;
@@ -906,7 +906,7 @@ thunar_tree_view_drag_leave (GtkWidget *widget,
/* reset the "drop data ready" status and free the URI list */
if (G_LIKELY (view->drop_data_ready))
{
- g_file_list_free (view->drop_file_list);
+ thunar_g_file_list_free (view->drop_file_list);
view->drop_data_ready = FALSE;
view->drop_file_list = NULL;
}
@@ -986,7 +986,7 @@ thunar_tree_view_test_expand_row (GtkTreeView *tree_view,
if (G_UNLIKELY (volume != NULL))
{
/* check if we need to mount the volume first */
- if (!g_volume_is_mounted (volume))
+ if (!thunar_g_volume_is_mounted (volume))
{
/* we need to mount the volume before we can expand the row */
expandable = FALSE;
@@ -1116,13 +1116,13 @@ thunar_tree_view_context_menu (ThunarTreeView *view,
{
/* append the "Mount Volume" menu action */
item = gtk_image_menu_item_new_with_mnemonic (_("_Mount Volume"));
- gtk_widget_set_sensitive (item, !g_volume_is_mounted (volume));
+ gtk_widget_set_sensitive (item, !thunar_g_volume_is_mounted (volume));
g_signal_connect_swapped (G_OBJECT (item), "activate", G_CALLBACK (thunar_tree_view_action_mount), view);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
gtk_widget_show (item);
/* check if the volume is ejectable */
- if (g_volume_is_removable (volume))
+ if (thunar_g_volume_is_removable (volume))
{
/* append the "Eject Volume" menu action */
item = gtk_image_menu_item_new_with_mnemonic (_("E_ject Volume"));
@@ -1930,7 +1930,7 @@ thunar_tree_view_mount (ThunarTreeView *view,
if (volume != NULL)
{
/* check if we need to mount the volume at all */
- if (!g_volume_is_mounted (volume))
+ if (!thunar_g_volume_is_mounted (volume))
{
/* allocate mount data */
data = thunar_tree_view_mount_data_new (view, NULL, open_after_mounting,
@@ -1970,7 +1970,7 @@ thunar_tree_view_action_open (ThunarTreeView *view)
if (volume != NULL)
{
- if (g_volume_is_mounted (volume))
+ if (thunar_g_volume_is_mounted (volume))
thunar_tree_view_open_selection (view);
else
thunar_tree_view_mount (view, TRUE, FALSE);
@@ -2019,7 +2019,7 @@ thunar_tree_view_action_open_in_new_window (ThunarTreeView *view)
if (volume != NULL)
{
- if (g_volume_is_mounted (volume))
+ if (thunar_g_volume_is_mounted (volume))
thunar_tree_view_open_selection_in_new_window (view);
else
thunar_tree_view_mount (view, TRUE, FALSE);
diff --git a/thunar/thunar-window.c b/thunar/thunar-window.c
index 7578e1a..3d837a2 100644
--- a/thunar/thunar-window.c
+++ b/thunar/thunar-window.c
@@ -619,7 +619,7 @@ thunar_window_setup_user_dir_menu_entries (ThunarWindow *window)
setlocale (LC_MESSAGES, locale);
g_free (locale);
- home_dir = g_file_new_for_home ();
+ home_dir = thunar_g_file_new_for_home ();
for (i = 0; i < G_USER_N_DIRECTORIES; i++)
{
@@ -1891,7 +1891,7 @@ thunar_window_action_open_home (GtkAction *action,
_thunar_return_if_fail (THUNAR_IS_WINDOW (window));
/* determine the path to the home directory */
- home = g_file_new_for_home ();
+ home = thunar_g_file_new_for_home ();
/* determine the file for the home directory */
home_file = thunar_file_get (home, &error);
@@ -1929,7 +1929,7 @@ thunar_window_open_user_folder (GtkAction *action,
if (G_UNLIKELY (path == NULL))
{
- home_dir = g_file_new_for_home ();
+ home_dir = thunar_g_file_new_for_home ();
user_dir = g_file_resolve_relative_path (home_dir, default_name);
path = g_file_get_path (user_dir);
g_object_unref (home_dir);
@@ -2148,7 +2148,7 @@ thunar_window_action_open_trash (GtkAction *action,
_thunar_return_if_fail (THUNAR_IS_WINDOW (window));
/* determine the path to the trash bin */
- trash_bin = g_file_new_for_trash ();
+ trash_bin = thunar_g_file_new_for_trash ();
/* determine the file for the trash bin */
trash_bin_file = thunar_file_get (trash_bin, &error);
More information about the Xfce4-commits
mailing list