[Xfce4-commits] <xfdesktop:jannis/port-to-gio> Remove xfdesktop_file_icon_update_info() which is no longer needed.
Jannis Pohlmann
noreply at xfce.org
Sat Oct 30 00:10:01 CEST 2010
Updating branch refs/heads/jannis/port-to-gio
to bf7307e1fb3a6c730bd6f8c0a97b7908fa8cbc6c (commit)
from de70ca22fd54f1ce09c3cda1b541b551a1d883f1 (commit)
commit bf7307e1fb3a6c730bd6f8c0a97b7908fa8cbc6c
Author: Jannis Pohlmann <jannis at xfce.org>
Date: Fri Oct 29 22:13:17 2010 +0200
Remove xfdesktop_file_icon_update_info() which is no longer needed.
src/xfdesktop-file-icon.c | 63 -------------------------------------
src/xfdesktop-file-icon.h | 3 --
src/xfdesktop-regular-file-icon.c | 26 ---------------
3 files changed, 0 insertions(+), 92 deletions(-)
diff --git a/src/xfdesktop-file-icon.c b/src/xfdesktop-file-icon.c
index b6bf0e6..8d60c86 100644
--- a/src/xfdesktop-file-icon.c
+++ b/src/xfdesktop-file-icon.c
@@ -32,7 +32,6 @@
struct _XfdesktopFileIconPrivate
{
- GList *active_jobs;
};
static void xfdesktop_file_icon_finalize(GObject *obj);
@@ -67,32 +66,6 @@ xfdesktop_file_icon_init(XfdesktopFileIcon *icon)
static void
xfdesktop_file_icon_finalize(GObject *obj)
{
- XfdesktopFileIcon *icon = XFDESKTOP_FILE_ICON(obj);
-
- if(icon->priv->active_jobs) {
- GList *l;
- ThunarVfsJob *job;
- GCallback cb;
-
- for(l = icon->priv->active_jobs; l; l = l->next) {
- job = THUNAR_VFS_JOB(l->data);
- cb = g_object_get_data(G_OBJECT(job),
- "--xfdesktop-file-icon-callback");
- if(cb) {
- gpointer data = g_object_get_data(obj,
- "--xfdesktop-file-icon-data");
- g_signal_handlers_disconnect_by_func(G_OBJECT(job),
- G_CALLBACK(cb),
- data);
- g_object_set_data(G_OBJECT(job),
- "--xfdesktop-file-icon-callback", NULL);
- }
- thunar_vfs_job_cancel(job);
- g_object_unref(G_OBJECT(job));
- }
- g_list_free(icon->priv->active_jobs);
- }
-
G_OBJECT_CLASS(xfdesktop_file_icon_parent_class)->finalize(obj);
}
@@ -184,20 +157,6 @@ xfdesktop_file_icon_peek_file(XfdesktopFileIcon *icon)
}
void
-xfdesktop_file_icon_update_info(XfdesktopFileIcon *icon,
- ThunarVfsInfo *info)
-{
- XfdesktopFileIconClass *klass;
-
- g_return_if_fail(XFDESKTOP_IS_FILE_ICON(icon));
-
- klass = XFDESKTOP_FILE_ICON_GET_CLASS(icon);
-
- if(klass->update_info)
- klass->update_info(icon, info);
-}
-
-void
xfdesktop_file_icon_update_file_info(XfdesktopFileIcon *icon,
GFileInfo *info)
{
@@ -240,25 +199,3 @@ xfdesktop_file_icon_can_delete_file(XfdesktopFileIcon *icon)
else
return FALSE;
}
-
-void
-xfdesktop_file_icon_add_active_job(XfdesktopFileIcon *icon,
- ThunarVfsJob *job)
-{
- g_return_if_fail(XFDESKTOP_IS_FILE_ICON(icon) && job);
-
- icon->priv->active_jobs = g_list_prepend(icon->priv->active_jobs,
- g_object_ref(G_OBJECT(job)));
-}
-
-gboolean
-xfdesktop_file_icon_remove_active_job(XfdesktopFileIcon *icon,
- ThunarVfsJob *job)
-{
- if(g_list_find(icon->priv->active_jobs, job)) {
- icon->priv->active_jobs = g_list_remove(icon->priv->active_jobs, job);
- g_object_unref(G_OBJECT(job));
- return TRUE;
- } else
- return FALSE;
-}
diff --git a/src/xfdesktop-file-icon.h b/src/xfdesktop-file-icon.h
index 916941a..6a98d00 100644
--- a/src/xfdesktop-file-icon.h
+++ b/src/xfdesktop-file-icon.h
@@ -57,7 +57,6 @@ struct _XfdesktopFileIconClass
GFileInfo *(*peek_file_info)(XfdesktopFileIcon *icon);
GFileInfo *(*peek_filesystem_info)(XfdesktopFileIcon *icon);
GFile *(*peek_file)(XfdesktopFileIcon *icon);
- void (*update_info)(XfdesktopFileIcon *icon, ThunarVfsInfo *info);
void (*update_file_info)(XfdesktopFileIcon *icon, GFileInfo *info);
gboolean (*can_rename_file)(XfdesktopFileIcon *icon);
@@ -70,8 +69,6 @@ G_CONST_RETURN ThunarVfsInfo *xfdesktop_file_icon_peek_info(XfdesktopFileIcon *i
GFileInfo *xfdesktop_file_icon_peek_file_info(XfdesktopFileIcon *icon);
GFileInfo *xfdesktop_file_icon_peek_filesystem_info(XfdesktopFileIcon *icon);
GFile *xfdesktop_file_icon_peek_file(XfdesktopFileIcon *icon);
-void xfdesktop_file_icon_update_info(XfdesktopFileIcon *icon,
- ThunarVfsInfo *info);
void xfdesktop_file_icon_update_file_info(XfdesktopFileIcon *icon,
GFileInfo *info);
diff --git a/src/xfdesktop-regular-file-icon.c b/src/xfdesktop-regular-file-icon.c
index 05afe76..0522b4b 100644
--- a/src/xfdesktop-regular-file-icon.c
+++ b/src/xfdesktop-regular-file-icon.c
@@ -87,8 +87,6 @@ static G_CONST_RETURN ThunarVfsInfo *xfdesktop_regular_file_icon_peek_info(Xfdes
static GFileInfo *xfdesktop_regular_file_icon_peek_file_info(XfdesktopFileIcon *icon);
static GFileInfo *xfdesktop_regular_file_icon_peek_filesystem_info(XfdesktopFileIcon *icon);
static GFile *xfdesktop_regular_file_icon_peek_file(XfdesktopFileIcon *icon);
-static void xfdesktop_regular_file_icon_update_info(XfdesktopFileIcon *icon,
- ThunarVfsInfo *info);
static void xfdesktop_regular_file_icon_update_file_info(XfdesktopFileIcon *icon,
GFileInfo *info);
static gboolean xfdesktop_regular_file_can_write_parent(XfdesktopFileIcon *icon);
@@ -135,7 +133,6 @@ xfdesktop_regular_file_icon_class_init(XfdesktopRegularFileIconClass *klass)
file_icon_class->peek_file_info = xfdesktop_regular_file_icon_peek_file_info;
file_icon_class->peek_filesystem_info = xfdesktop_regular_file_icon_peek_filesystem_info;
file_icon_class->peek_file = xfdesktop_regular_file_icon_peek_file;
- file_icon_class->update_info = xfdesktop_regular_file_icon_update_info;
file_icon_class->update_file_info = xfdesktop_regular_file_icon_update_file_info;
file_icon_class->can_rename_file = xfdesktop_regular_file_can_write_parent;
file_icon_class->can_delete_file = xfdesktop_regular_file_can_write_parent;
@@ -543,29 +540,6 @@ xfdesktop_regular_file_icon_peek_file(XfdesktopFileIcon *icon)
}
static void
-xfdesktop_regular_file_icon_update_info(XfdesktopFileIcon *icon,
- ThunarVfsInfo *info)
-{
- XfdesktopRegularFileIcon *regular_file_icon = XFDESKTOP_REGULAR_FILE_ICON(icon);
- gboolean label_changed = TRUE;
-
- g_return_if_fail(XFDESKTOP_IS_REGULAR_FILE_ICON(icon) && info);
-
- if(!strcmp(regular_file_icon->priv->info->display_name, info->display_name))
- label_changed = FALSE;
-
- thunar_vfs_info_unref(regular_file_icon->priv->info);
- regular_file_icon->priv->info = thunar_vfs_info_ref(info);
-
- if(label_changed)
- xfdesktop_icon_label_changed(XFDESKTOP_ICON(icon));
-
- /* not really easy to check if this changed or not, so just invalidate it */
- xfdesktop_regular_file_icon_invalidate_pixbuf(regular_file_icon);
- xfdesktop_icon_pixbuf_changed(XFDESKTOP_ICON(icon));
-}
-
-static void
xfdesktop_regular_file_icon_update_file_info(XfdesktopFileIcon *icon,
GFileInfo *info)
{
More information about the Xfce4-commits
mailing list