diff options
Diffstat (limited to 'tumblerd')
| -rw-r--r-- | tumblerd/tumbler-cache-service.c | 50 | ||||
| -rw-r--r-- | tumblerd/tumbler-cache-service.h | 10 | ||||
| -rw-r--r-- | tumblerd/tumbler-manager.c | 8 | ||||
| -rw-r--r-- | tumblerd/tumbler-registry.c | 8 | ||||
| -rw-r--r-- | tumblerd/tumbler-scheduler.h | 6 | ||||
| -rw-r--r-- | tumblerd/tumbler-service.c | 26 |
6 files changed, 58 insertions, 50 deletions
diff --git a/tumblerd/tumbler-cache-service.c b/tumblerd/tumbler-cache-service.c index 6a6f36f..dd74770 100644 --- a/tumblerd/tumbler-cache-service.c +++ b/tumblerd/tumbler-cache-service.c @@ -98,25 +98,25 @@ struct _TumblerCacheService struct _MoveRequest { - GStrv from_uris; - GStrv to_uris; + gchar **from_uris; + gchar **to_uris; }; struct _CopyRequest { - GStrv from_uris; - GStrv to_uris; + gchar **from_uris; + gchar **to_uris; }; struct _DeleteRequest { - GStrv uris; + gchar **uris; }; struct _CleanupRequest { guint32 since; - GStrv base_uris; + gchar **base_uris; }; @@ -254,7 +254,11 @@ tumbler_cache_service_move_thread (gpointer data, g_mutex_lock (service->mutex); if (service->cache != NULL) - tumbler_cache_move (service->cache, request->from_uris, request->to_uris); + { + tumbler_cache_move (service->cache, + (const gchar *const *)request->from_uris, + (const gchar *const *)request->to_uris); + } g_strfreev (request->from_uris); g_strfreev (request->to_uris); @@ -278,7 +282,11 @@ tumbler_cache_service_copy_thread (gpointer data, g_mutex_lock (service->mutex); if (service->cache != NULL) - tumbler_cache_copy (service->cache, request->from_uris, request->to_uris); + { + tumbler_cache_copy (service->cache, + (const gchar *const *)request->from_uris, + (const gchar *const *)request->to_uris); + } g_strfreev (request->from_uris); g_strfreev (request->to_uris); @@ -302,7 +310,7 @@ tumbler_cache_service_delete_thread (gpointer data, g_mutex_lock (service->mutex); if (service->cache != NULL) - tumbler_cache_delete (service->cache, request->uris); + tumbler_cache_delete (service->cache, (const gchar *const *)request->uris); g_strfreev (request->uris); g_slice_free (DeleteRequest, request); @@ -410,8 +418,8 @@ tumbler_cache_service_start (TumblerCacheService *service, void tumbler_cache_service_move (TumblerCacheService *service, - const GStrv from_uris, - const GStrv to_uris, + const gchar *const *from_uris, + const gchar *const *to_uris, DBusGMethodInvocation *context) { MoveRequest *request; @@ -419,11 +427,11 @@ tumbler_cache_service_move (TumblerCacheService *service, dbus_async_return_if_fail (TUMBLER_IS_CACHE_SERVICE (service), context); dbus_async_return_if_fail (from_uris != NULL, context); dbus_async_return_if_fail (to_uris != NULL, context); - dbus_async_return_if_fail (g_strv_length (from_uris) == g_strv_length (to_uris), context); + dbus_async_return_if_fail (g_strv_length ((gchar **)from_uris) == g_strv_length ((gchar **)to_uris), context); request = g_slice_new0 (MoveRequest); - request->from_uris = g_strdupv (from_uris); - request->to_uris = g_strdupv (to_uris); + request->from_uris = g_strdupv ((gchar **)from_uris); + request->to_uris = g_strdupv ((gchar **)to_uris); g_thread_pool_push (service->move_pool, request, NULL); @@ -434,8 +442,8 @@ tumbler_cache_service_move (TumblerCacheService *service, void tumbler_cache_service_copy (TumblerCacheService *service, - const GStrv from_uris, - const GStrv to_uris, + const gchar *const *from_uris, + const gchar *const *to_uris, DBusGMethodInvocation *context) { CopyRequest *request; @@ -443,11 +451,11 @@ tumbler_cache_service_copy (TumblerCacheService *service, dbus_async_return_if_fail (TUMBLER_IS_CACHE_SERVICE (service), context); dbus_async_return_if_fail (from_uris != NULL, context); dbus_async_return_if_fail (to_uris != NULL, context); - dbus_async_return_if_fail (g_strv_length (from_uris) == g_strv_length (to_uris), context); + dbus_async_return_if_fail (g_strv_length ((gchar **)from_uris) == g_strv_length ((gchar **)to_uris), context); request = g_slice_new0 (CopyRequest); - request->from_uris = g_strdupv (from_uris); - request->to_uris = g_strdupv (to_uris); + request->from_uris = g_strdupv ((gchar **)from_uris); + request->to_uris = g_strdupv ((gchar **)to_uris); g_thread_pool_push (service->copy_pool, request, NULL); @@ -458,7 +466,7 @@ tumbler_cache_service_copy (TumblerCacheService *service, void tumbler_cache_service_delete (TumblerCacheService *service, - const GStrv uris, + const gchar *const *uris, DBusGMethodInvocation *context) { DeleteRequest *request; @@ -467,7 +475,7 @@ tumbler_cache_service_delete (TumblerCacheService *service, dbus_async_return_if_fail (uris != NULL, context); request = g_slice_new0 (DeleteRequest); - request->uris = g_strdupv (uris); + request->uris = g_strdupv ((gchar **)uris); g_thread_pool_push (service->delete_pool, request, NULL); diff --git a/tumblerd/tumbler-cache-service.h b/tumblerd/tumbler-cache-service.h index bb58a31..c325263 100644 --- a/tumblerd/tumbler-cache-service.h +++ b/tumblerd/tumbler-cache-service.h @@ -43,15 +43,15 @@ TumblerCacheService *tumbler_cache_service_new (DBusGConnection *conne gboolean tumbler_cache_service_start (TumblerCacheService *service, GError **error); void tumbler_cache_service_move (TumblerCacheService *service, - const GStrv from_uris, - const GStrv to_uris, + const gchar *const *from_uris, + const gchar *const *to_uris, DBusGMethodInvocation *context); void tumbler_cache_service_copy (TumblerCacheService *service, - const GStrv from_uris, - const GStrv to_uris, + const gchar *const *from_uris, + const gchar *const *to_uris, DBusGMethodInvocation *context); void tumbler_cache_service_delete (TumblerCacheService *service, - const GStrv uris, + const gchar *const *uris, DBusGMethodInvocation *context); void tumbler_cache_service_cleanup (TumblerCacheService *service, const gchar *const *uri_prefix, diff --git a/tumblerd/tumbler-manager.c b/tumblerd/tumbler-manager.c index ea552bc..4485031 100644 --- a/tumblerd/tumbler-manager.c +++ b/tumblerd/tumbler-manager.c @@ -1,6 +1,6 @@ /* vi:set et ai sw=2 sts=2 ts=2: */ /*- - * Copyright (c) 2009 Jannis Pohlmann <jannis@xfce.org> + * Copyright (c) 2009-2011 Jannis Pohlmann <jannis@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 @@ -849,7 +849,7 @@ tumbler_manager_load_thumbnailer (TumblerManager *manager, GFile *directory; GList **list; GList *lp; - GStrv hash_keys; + gchar **hash_keys; gchar *base_name; gchar *filename; gchar *name; @@ -1251,7 +1251,7 @@ tumbler_manager_thumbnailer_file_deleted (TumblerManager *manager, GFile *directory; GList **list; GList *lp; - GStrv hash_keys; + gchar **hash_keys; gchar *base_name; guint n; gint dir_index; @@ -1411,7 +1411,7 @@ tumbler_manager_directory_deleted (TumblerManager *manager, GList *delete_keys = NULL; GList **list; GList *lp; - GStrv hash_keys; + gchar **hash_keys; guint n; g_return_if_fail (TUMBLER_IS_MANAGER (manager)); diff --git a/tumblerd/tumbler-registry.c b/tumblerd/tumbler-registry.c index 15656a5..4171b75 100644 --- a/tumblerd/tumbler-registry.c +++ b/tumblerd/tumbler-registry.c @@ -1,6 +1,6 @@ /* vi:set et ai sw=2 sts=2 ts=2: */ /*- - * Copyright (c) 2009 Jannis Pohlmann <jannis@xfce.org> + * Copyright (c) 2009-2011 Jannis Pohlmann <jannis@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 @@ -342,7 +342,7 @@ tumbler_registry_add (TumblerRegistry *registry, TumblerThumbnailer *thumbnailer) { GList **list; - GStrv hash_keys; + gchar **hash_keys; gint n; g_return_if_fail (TUMBLER_IS_REGISTRY (registry)); @@ -499,8 +499,8 @@ tumbler_registry_update_supported (TumblerRegistry *registry) GList *lp; const gchar **pair; GString *pair_string; - GStrv mime_types; - GStrv uri_schemes; + gchar **mime_types; + gchar **uri_schemes; gint n; gint u; diff --git a/tumblerd/tumbler-scheduler.h b/tumblerd/tumbler-scheduler.h index e9969e7..efb0937 100644 --- a/tumblerd/tumbler-scheduler.h +++ b/tumblerd/tumbler-scheduler.h @@ -1,6 +1,6 @@ /* vi:set et ai sw=2 sts=2 ts=2: */ /*- - * Copyright (c) 2009 Jannis Pohlmann <jannis@xfce.org> + * Copyright (c) 2009-2011 Jannis Pohlmann <jannis@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 @@ -44,13 +44,13 @@ struct _TumblerSchedulerIface /* signals */ void (*error) (TumblerScheduler *scheduler, guint handle, - const GStrv failed_uris, + const gchar *const *failed_uris, gint error_code, const gchar *message); void (*finished) (TumblerScheduler *scheduler, guint handle); void (*ready) (TumblerScheduler *scheduler, - const GStrv uris); + const gchar *const *uris); void (*started) (TumblerScheduler *scheduler, guint handle); diff --git a/tumblerd/tumbler-service.c b/tumblerd/tumbler-service.c index 541cf90..6cf09a3 100644 --- a/tumblerd/tumbler-service.c +++ b/tumblerd/tumbler-service.c @@ -1,6 +1,6 @@ /* vi:set et ai sw=2 sts=2 ts=2: */ /*- - * Copyright (c) 2009 Jannis Pohlmann <jannis@xfce.org> + * Copyright (c) 2009-2011 Jannis Pohlmann <jannis@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 @@ -96,7 +96,7 @@ static void tumbler_service_scheduler_finished (TumblerScheduler *scheduler, TumblerService *service); static void tumbler_service_scheduler_ready (TumblerScheduler *scheduler, guint handle, - const GStrv uris, + const gchar *const *uris, const gchar *origin, TumblerService *service); static void tumbler_service_scheduler_started (TumblerScheduler *scheduler, @@ -131,7 +131,7 @@ struct _SchedulerIdleInfo { TumblerScheduler *scheduler; TumblerService *service; - GStrv uris; + gchar **uris; gchar *message; gchar *origin; guint handle; @@ -451,7 +451,7 @@ tumbler_service_scheduler_error (TumblerScheduler *scheduler, info->scheduler = g_object_ref (scheduler); info->handle = handle; - info->uris = g_strdupv ((GStrv) failed_uris); + info->uris = g_strdupv ((gchar **)failed_uris); info->error_code = error_code; info->message = g_strdup (message); info->origin = g_strdup (origin); @@ -575,11 +575,11 @@ tumbler_service_ready_idle (gpointer user_data) static void -tumbler_service_scheduler_ready (TumblerScheduler *scheduler, - guint handle, - const GStrv uris, - const gchar *origin, - TumblerService *service) +tumbler_service_scheduler_ready (TumblerScheduler *scheduler, + guint handle, + const gchar *const *uris, + const gchar *origin, + TumblerService *service) { SchedulerIdleInfo *info; @@ -592,7 +592,7 @@ tumbler_service_scheduler_ready (TumblerScheduler *scheduler, info->scheduler = g_object_ref (scheduler); info->handle = handle; - info->uris = g_strdupv ((GStrv) uris); + info->uris = g_strdupv ((gchar **)uris); info->origin = g_strdup (origin); info->service = g_object_ref (service); @@ -988,9 +988,9 @@ void tumbler_service_get_schedulers (TumblerService *service, DBusGMethodInvocation *context) { - GStrv supported_schedulers; - GList *iter; - guint n = 0; + gchar **supported_schedulers; + GList *iter; + guint n = 0; dbus_async_return_if_fail (TUMBLER_IS_SERVICE (service), context); |