[Xfce4-commits] r29868 - in thunar/branches/migration-to-gio: . thunar
Jannis Pohlmann
jannis at xfce.org
Mon Apr 20 19:52:41 CEST 2009
Author: jannis
Date: 2009-04-20 17:52:41 +0000 (Mon, 20 Apr 2009)
New Revision: 29868
Modified:
thunar/branches/migration-to-gio/ChangeLog
thunar/branches/migration-to-gio/thunar/thunar-chooser-dialog.c
thunar/branches/migration-to-gio/thunar/thunar-deep-count-job.h
thunar/branches/migration-to-gio/thunar/thunar-job.c
thunar/branches/migration-to-gio/thunar/thunar-preferences.c
thunar/branches/migration-to-gio/thunar/thunar-shortcuts-model.c
thunar/branches/migration-to-gio/thunar/thunar-size-label.c
Log:
* thunar/thunar-chooser-dialog.c, thunar/thunar-deep-count-job.c,
thunar/thunar-job.c, thunar/thunar-preferences.c,
thunar/thunar-shortcuts-model.c, thunar/thunar-size-label.c: Fix
compiler warnings and errors.
Modified: thunar/branches/migration-to-gio/ChangeLog
===================================================================
--- thunar/branches/migration-to-gio/ChangeLog 2009-04-20 16:28:52 UTC (rev 29867)
+++ thunar/branches/migration-to-gio/ChangeLog 2009-04-20 17:52:41 UTC (rev 29868)
@@ -1,5 +1,12 @@
2009-04-20 Jannis Pohlmann <jannis at xfce.org>
+ * thunar/thunar-chooser-dialog.c, thunar/thunar-deep-count-job.c,
+ thunar/thunar-job.c, thunar/thunar-preferences.c,
+ thunar/thunar-shortcuts-model.c, thunar/thunar-size-label.c: Fix
+ compiler warnings and errors.
+
+2009-04-20 Jannis Pohlmann <jannis at xfce.org>
+
* thunar/Makefile.am, thunar/thunar-deep-count-job.{c,h}: Add new class
for computing the total size of a file/directory recursively while
also counting the total number of files and directories. This
Modified: thunar/branches/migration-to-gio/thunar/thunar-chooser-dialog.c
===================================================================
--- thunar/branches/migration-to-gio/thunar/thunar-chooser-dialog.c 2009-04-20 16:28:52 UTC (rev 29867)
+++ thunar/branches/migration-to-gio/thunar/thunar-chooser-dialog.c 2009-04-20 17:52:41 UTC (rev 29868)
@@ -656,13 +656,10 @@
static void
thunar_chooser_dialog_update_header (ThunarChooserDialog *dialog)
{
- ThunarIconFactory *icon_factory;
- GtkIconTheme *icon_theme;
- const gchar *content_type;
- const gchar *icon_name;
- GIcon *icon;
- gchar *description;
- gchar *text;
+ const gchar *content_type;
+ GIcon *icon;
+ gchar *description;
+ gchar *text;
_thunar_return_if_fail (THUNAR_IS_CHOOSER_DIALOG (dialog));
_thunar_return_if_fail (GTK_WIDGET_REALIZED (dialog));
Modified: thunar/branches/migration-to-gio/thunar/thunar-deep-count-job.h
===================================================================
--- thunar/branches/migration-to-gio/thunar/thunar-deep-count-job.h 2009-04-20 16:28:52 UTC (rev 29867)
+++ thunar/branches/migration-to-gio/thunar/thunar-deep-count-job.h 2009-04-20 17:52:41 UTC (rev 29868)
@@ -41,7 +41,7 @@
GType thunar_deep_count_job_get_type (void) G_GNUC_CONST;
ThunarJob *thunar_deep_count_job_new (GFile *file,
- GFileQueryInfoFlags flags);
+ GFileQueryInfoFlags flags) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
G_END_DECLS;
Modified: thunar/branches/migration-to-gio/thunar/thunar-job.c
===================================================================
--- thunar/branches/migration-to-gio/thunar/thunar-job.c 2009-04-20 16:28:52 UTC (rev 29867)
+++ thunar/branches/migration-to-gio/thunar/thunar-job.c 2009-04-20 17:52:41 UTC (rev 29868)
@@ -64,6 +64,9 @@
static void thunar_job_init (ThunarJob *job);
static void thunar_job_finalize (GObject *object);
+static void _thunar_job_error (ThunarJob *job,
+ GError *error);
+static void _thunar_job_finished (ThunarJob *job);
static gboolean _thunar_job_finish (ThunarJob *job,
GSimpleAsyncResult *result,
GError **error);
@@ -217,11 +220,11 @@
if (!_thunar_job_finish (job, G_SIMPLE_ASYNC_RESULT (result), &error))
{
g_assert (error != NULL);
- thunar_job_error (job, error);
+ _thunar_job_error (job, error);
g_error_free (error);
}
- thunar_job_finished (job);
+ _thunar_job_finished (job);
}
@@ -368,6 +371,8 @@
data->signal_id,
data->signal_detail,
data->var_args);
+
+ return FALSE;
}
@@ -414,9 +419,9 @@
-void
-thunar_job_error (ThunarJob *job,
- GError *error)
+static void
+_thunar_job_error (ThunarJob *job,
+ GError *error)
{
_thunar_return_if_fail (THUNAR_IS_JOB (job));
_thunar_return_if_fail (error != NULL);
@@ -427,10 +432,9 @@
-void
-thunar_job_finished (ThunarJob *job)
+static void
+_thunar_job_finished (ThunarJob *job)
{
_thunar_return_if_fail (THUNAR_IS_JOB (job));
-
g_signal_emit (job, job_signals[FINISHED], 0);
}
Modified: thunar/branches/migration-to-gio/thunar/thunar-preferences.c
===================================================================
--- thunar/branches/migration-to-gio/thunar/thunar-preferences.c 2009-04-20 16:28:52 UTC (rev 29867)
+++ thunar/branches/migration-to-gio/thunar/thunar-preferences.c 2009-04-20 17:52:41 UTC (rev 29868)
@@ -808,9 +808,8 @@
ThunarPreferences *preferences = THUNAR_PREFERENCES (user_data);
_thunar_return_if_fail (THUNAR_IS_PREFERENCES (preferences));
- _thunar_return_if_fail (THUNAR_VFS_IS_MONITOR (monitor));
+ _thunar_return_if_fail (G_IS_FILE_MONITOR (monitor));
_thunar_return_if_fail (preferences->monitor == monitor);
- _thunar_return_if_fail (preferences->handle == handle);
/* schedule a reload whenever the file is created/changed */
if (event_type == G_FILE_MONITOR_EVENT_CHANGED
Modified: thunar/branches/migration-to-gio/thunar/thunar-shortcuts-model.c
===================================================================
--- thunar/branches/migration-to-gio/thunar/thunar-shortcuts-model.c 2009-04-20 16:28:52 UTC (rev 29867)
+++ thunar/branches/migration-to-gio/thunar/thunar-shortcuts-model.c 2009-04-20 17:52:41 UTC (rev 29868)
@@ -275,9 +275,6 @@
GList *system_paths = NULL;
GList *volumes;
GList *lp;
- guint n;
- gchar *desktop_path = NULL;
- guint index = 0;
#ifndef NDEBUG
model->stamp = g_random_int ();
Modified: thunar/branches/migration-to-gio/thunar/thunar-size-label.c
===================================================================
--- thunar/branches/migration-to-gio/thunar/thunar-size-label.c 2009-04-20 16:28:52 UTC (rev 29867)
+++ thunar/branches/migration-to-gio/thunar/thunar-size-label.c 2009-04-20 17:52:41 UTC (rev 29868)
@@ -1,6 +1,7 @@
/* $Id$ */
/*-
* Copyright (c) 2006 Benedikt Meurer <benny at xfce.org>
+ * Copyright (c) 2009 Jannis Pohlmann <jannis at xfce.org>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
@@ -359,7 +360,6 @@
ThunarSizeLabel *size_label)
{
guint64 size;
- GError *error = NULL;
gchar *size_humanized;
gchar *size_string;
gchar *text;
More information about the Xfce4-commits
mailing list