Author: benny Date: 2006-10-28 10:06:54 +0000 (Sat, 28 Oct 2006) New Revision: 23538
Modified: thunar/trunk/ChangeLog thunar/trunk/thunar-vfs/thunar-vfs-job-private.h thunar/trunk/thunar-vfs/thunar-vfs-job.c Log: 2006-10-28 Benedikt Meurer <[EMAIL PROTECTED]> * thunar-vfs/thunar-vfs-job-private.h, thunar-vfs/thunar-vfs-job.c: Handle file names with printf(3)-style format arguments properly when emitting the "info-message" signal from a job. Bug #2468. Modified: thunar/trunk/ChangeLog =================================================================== --- thunar/trunk/ChangeLog 2006-10-28 09:34:53 UTC (rev 23537) +++ thunar/trunk/ChangeLog 2006-10-28 10:06:54 UTC (rev 23538) @@ -1,5 +1,11 @@ 2006-10-28 Benedikt Meurer <[EMAIL PROTECTED]> + * thunar-vfs/thunar-vfs-job-private.h, thunar-vfs/thunar-vfs-job.c: + Handle file names with printf(3)-style format arguments properly + when emitting the "info-message" signal from a job. Bug #2468. + +2006-10-28 Benedikt Meurer <[EMAIL PROTECTED]> + * thunar-vfs/thunar-vfs-mime-cache.c(thunar_vfs_mime_cache_finalize): Fix compiler warning if mmap() is not available. * configure.in.in, thunar/Makefile.am: Do not install the symlink from Modified: thunar/trunk/thunar-vfs/thunar-vfs-job-private.h =================================================================== --- thunar/trunk/thunar-vfs/thunar-vfs-job-private.h 2006-10-28 09:34:53 UTC (rev 23537) +++ thunar/trunk/thunar-vfs/thunar-vfs-job-private.h 2006-10-28 10:06:54 UTC (rev 23538) @@ -65,8 +65,7 @@ void _thunar_vfs_job_error (ThunarVfsJob *job, GError *error) G_GNUC_INTERNAL; void _thunar_vfs_job_info_message (ThunarVfsJob *job, - const gchar *format, - ...) G_GNUC_INTERNAL G_GNUC_PRINTF (2, 3); + const gchar *format) G_GNUC_INTERNAL; gboolean _thunar_vfs_job_infos_ready (ThunarVfsJob *job, GList *info_list) G_GNUC_INTERNAL G_GNUC_WARN_UNUSED_RESULT; void _thunar_vfs_job_new_files (ThunarVfsJob *job, Modified: thunar/trunk/thunar-vfs/thunar-vfs-job.c =================================================================== --- thunar/trunk/thunar-vfs/thunar-vfs-job.c 2006-10-28 09:34:53 UTC (rev 23537) +++ thunar/trunk/thunar-vfs/thunar-vfs-job.c 2006-10-28 10:06:54 UTC (rev 23538) @@ -942,28 +942,19 @@ /** * _thunar_vfs_job_info_message: - * @job : a #ThunarVfsJob. - * @format : a printf(3)-style format string. - * @... : the format arguments. + * @job : a #ThunarVfsJob. + * @message : the info message. * - * Emits the ::info-message signal on @job with the formatted - * info message. + * Emits the ::info-message signal on @job with the info @message. **/ void _thunar_vfs_job_info_message (ThunarVfsJob *job, - const gchar *format, - ...) + const gchar *message) { - va_list var_args; - gchar *message; + _thunar_vfs_return_if_fail (THUNAR_VFS_IS_JOB (job)); + _thunar_vfs_return_if_fail (g_utf8_validate (message, -1, NULL)); - _thunar_vfs_return_if_fail (g_utf8_validate (format, -1, NULL)); - - va_start (var_args, format); - message = g_strdup_vprintf (format, var_args); _thunar_vfs_job_notify (job, job_signals[INFO_MESSAGE], 0, message); - va_end (var_args); - g_free (message); } _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits