[maemo-commits] [maemo-commits] r17806 - in projects/haf/trunk/hildon-thumbnail: . daemon daemon/plugins thumbs
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Thu Mar 26 12:06:21 EET 2009
- Previous message: [maemo-commits] r17805 - projects/haf/trunk/libmatchbox2/debian
- Next message: [maemo-commits] r17807 - in projects/haf/trunk/hildon-thumbnail: . daemon daemon/plugins
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: pvanhoof Date: 2009-03-26 12:06:17 +0200 (Thu, 26 Mar 2009) New Revision: 17806 Modified: projects/haf/trunk/hildon-thumbnail/ChangeLog projects/haf/trunk/hildon-thumbnail/daemon/albumart.c projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-daemon.c projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.c projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.h projects/haf/trunk/hildon-thumbnail/daemon/plugin-runner.c projects/haf/trunk/hildon-thumbnail/daemon/plugins/exec-plugin.c projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-jpeg-out-plugin.c projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-plugin.c projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-png-out-plugin.c projects/haf/trunk/hildon-thumbnail/daemon/plugins/gstreamer-video-plugin.c projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c projects/haf/trunk/hildon-thumbnail/daemon/utils.c projects/haf/trunk/hildon-thumbnail/daemon/utils.h projects/haf/trunk/hildon-thumbnail/thumbs/hildon-albumart-factory.c projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-factory.c projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c Log: 2009-03-26 Philip Van Hoof <pvanhoof at codeminded.be> * thumbs/hildon-thumbnail-factory.c * thumbs/hildon-thumbnail-obj.c * thumbs/hildon-albumart-factory.c * daemon/hildon-thumbnail-plugin.h * daemon/hildon-thumbnail-daemon.c * daemon/plugins/gdkpixbuf-plugin.c * daemon/plugins/exec-plugin.c * daemon/plugins/gdkpixbuf-png-out-plugin.c * daemon/plugins/gdkpixbuf-jpeg-out-plugin.c * daemon/plugins/gstreamer-video-plugin.c * daemon/utils.c * daemon/utils.h * daemon/plugin-runner.c * daemon/albumart.c * daemon/thumbnailer.c * daemon/hildon-thumbnail-plugin.c: Fixes for Bug #108103 Modified: projects/haf/trunk/hildon-thumbnail/ChangeLog =================================================================== --- projects/haf/trunk/hildon-thumbnail/ChangeLog 2009-03-26 08:05:58 UTC (rev 17805) +++ projects/haf/trunk/hildon-thumbnail/ChangeLog 2009-03-26 10:06:17 UTC (rev 17806) @@ -1,3 +1,22 @@ +2009-03-26 Philip Van Hoof <pvanhoof at codeminded.be> + + * thumbs/hildon-thumbnail-factory.c + * thumbs/hildon-thumbnail-obj.c + * thumbs/hildon-albumart-factory.c + * daemon/hildon-thumbnail-plugin.h + * daemon/hildon-thumbnail-daemon.c + * daemon/plugins/gdkpixbuf-plugin.c + * daemon/plugins/exec-plugin.c + * daemon/plugins/gdkpixbuf-png-out-plugin.c + * daemon/plugins/gdkpixbuf-jpeg-out-plugin.c + * daemon/plugins/gstreamer-video-plugin.c + * daemon/utils.c + * daemon/utils.h + * daemon/plugin-runner.c + * daemon/albumart.c + * daemon/thumbnailer.c + * daemon/hildon-thumbnail-plugin.c: Fixes for Bug #108103 + 2009-03-24 Philip Van Hoof <pvanhoof at codeminded.be> * daemon/plugins/gstreamer-video-plugin.c: Bugfix in error reporting Modified: projects/haf/trunk/hildon-thumbnail/daemon/albumart.c =================================================================== --- projects/haf/trunk/hildon-thumbnail/daemon/albumart.c 2009-03-26 08:05:58 UTC (rev 17805) +++ projects/haf/trunk/hildon-thumbnail/daemon/albumart.c 2009-03-26 10:06:17 UTC (rev 17806) @@ -32,6 +32,7 @@ #include <glib.h> #include <gio/gio.h> #include <dbus/dbus-glib-bindings.h> +#include <glib/gstdio.h> #include "albumart.h" #include "albumart-marshal.h" @@ -120,7 +121,7 @@ static guint num = 0; if (!kind || strlen (album) == 0) - kind = "album"; + kind = (gchar *) "album"; if (artist_or_title && strlen (artist_or_title) <= 0) artist_or_title = NULL; Modified: projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-daemon.c =================================================================== --- projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-daemon.c 2009-03-26 08:05:58 UTC (rev 17805) +++ projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-daemon.c 2009-03-26 10:06:17 UTC (rev 17806) @@ -34,6 +34,8 @@ #include <malloc.h> #endif +#include <unistd.h> + #include <glib.h> #include <dbus/dbus-glib-bindings.h> #include <gio/gio.h> @@ -46,6 +48,8 @@ #include "albumart-manager.h" #include "thumb-hal.h" +void keep_alive (void); + static GHashTable *registrations; static GHashTable *outregistrations; static gboolean do_shut_down_next_time = TRUE; @@ -104,7 +108,9 @@ #define IOPRIO_CLASS_SHIFT 13 +void initialize_priority (void); + static inline int ioprio_set (int which, int who, int ioprio_val) { @@ -127,8 +133,11 @@ /* Maemo on X86 doesn't have new enough kernel headers. */ #ifdef SCHED_IDLE - if (sched_getparam (0, &sp) == 0) - sched_setscheduler (0, SCHED_IDLE, &sp); + if (sched_getparam (0, &sp) == 0) { + if (sched_setscheduler (0, SCHED_IDLE, &sp) == -1) { + /* Didn't work, but we ignore */ + } + } #endif } @@ -377,7 +386,6 @@ error ? error->message : "no error given."); else { GMainLoop *main_loop; - GError *error = NULL; ThumbnailManager *manager; AlbumartManager *a_manager; Thumbnailer *thumbnailer; Modified: projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.c =================================================================== --- projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.c 2009-03-26 08:05:58 UTC (rev 17805) +++ projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.c 2009-03-26 10:06:17 UTC (rev 17806) @@ -34,7 +34,7 @@ typedef gchar * (*GetOrigFunc) (const gchar *path); typedef void (*CleanupFunc) (const gchar *uri_match, guint64 max_mtime); -gchar * +void hildon_thumbnail_outplugins_cleanup (const gchar *uri_match, guint since) { Modified: projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.h =================================================================== --- projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.h 2009-03-26 08:05:58 UTC (rev 17805) +++ projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.h 2009-03-26 10:06:17 UTC (rev 17806) @@ -75,7 +75,7 @@ const gchar *uri); gchar * hildon_thumbnail_outplugins_get_orig (const gchar *path); -gchar * hildon_thumbnail_outplugins_cleanup (const gchar *uri_match, +void hildon_thumbnail_outplugins_cleanup (const gchar *uri_match, guint since); Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugin-runner.c =================================================================== --- projects/haf/trunk/hildon-thumbnail/daemon/plugin-runner.c 2009-03-26 08:05:58 UTC (rev 17805) +++ projects/haf/trunk/hildon-thumbnail/daemon/plugin-runner.c 2009-03-26 10:06:17 UTC (rev 17806) @@ -63,6 +63,9 @@ PROP_MODULE }; +void daemon_create (Daemon *object, GStrv uris, gchar *mime_hint, DBusGMethodInvocation *context); +GType daemon_get_type (void); + G_DEFINE_TYPE (Daemon, daemon, G_TYPE_OBJECT) #define DAEMON_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_DAEMON, DaemonPrivate)) Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/exec-plugin.c =================================================================== --- projects/haf/trunk/hildon-thumbnail/daemon/plugins/exec-plugin.c 2009-03-26 08:05:58 UTC (rev 17805) +++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/exec-plugin.c 2009-03-26 10:06:17 UTC (rev 17806) @@ -402,7 +402,7 @@ } static void -on_file_changed (GFileMonitor *monitor, GFile *file, GFile *other_file, GFileMonitorEvent event_type, gpointer user_data) +on_file_changed (GFileMonitor *monitor_, GFile *file, GFile *other_file, GFileMonitorEvent event_type, gpointer user_data) { if (event_type == G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT || event_type == G_FILE_MONITOR_EVENT_CREATED) { gchar *config = g_file_get_path (file); @@ -417,7 +417,6 @@ gchar *config = g_build_filename (g_get_user_config_dir (), "hildon-thumbnailer", "exec-plugin.conf", NULL); GFile *file = g_file_new_for_path (config); guint i = 0; - const gchar **supported; const gchar *uri_schemes[2] = { "file", NULL }; monitor = g_file_monitor_file (file, G_FILE_MONITOR_NONE, NULL, NULL); @@ -432,7 +431,7 @@ *cropping = do_cropped; if (func) { - supported = hildon_thumbnail_plugin_supported (); + supported = (gchar **) hildon_thumbnail_plugin_supported (); if (supported) { while (supported[i] != NULL) { func (thumbnailer, supported[i], module, (const GStrv) uri_schemes, 0); Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-jpeg-out-plugin.c =================================================================== --- projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-jpeg-out-plugin.c 2009-03-26 08:05:58 UTC (rev 17805) +++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-jpeg-out-plugin.c 2009-03-26 10:06:17 UTC (rev 17806) @@ -54,9 +54,11 @@ #ifdef HAVE_SQLITE3 static sqlite3 *db = NULL; -static gint callback (void *NotUsed, gint argc, gchar **argv, gchar **azColName) { } +static gint callback (void *NotUsed, gint argc, gchar **argv, gchar **azColName) { return 0; } #endif +void hildon_thumbnail_outplugin_cleanup (const gchar *uri_match, guint since); + void hildon_thumbnail_outplugin_cleanup (const gchar *uri_match, guint since) { @@ -76,7 +78,7 @@ if (db) { gchar *sql = g_strdup_printf ("select Path from jpegthumbnails where URI LIKE '%s%%' and MTime <= '%u'", uri_match, since); - sqlite3_prepare_v2 (db, sql, -1, &stmt, NULL); + result = sqlite3_prepare_v2 (db, sql, -1, &stmt, NULL); while (result == SQLITE_OK || result == SQLITE_ROW || result == SQLITE_BUSY) { const unsigned char *path; @@ -96,7 +98,7 @@ } path = sqlite3_column_text (stmt, 0); - g_unlink (path); + g_unlink ((const gchar *) path); } g_free (sql); sql = g_strdup_printf ("delete from jpegthumbnails where URI LIKE '%s%%' and MTime <= '%u'", @@ -129,7 +131,7 @@ const unsigned char *tmp; gchar *sql = g_strdup_printf ("select URI from jpegthumbnails where Path = '%s'", path); - sqlite3_prepare_v2 (db, sql, -1, &stmt, NULL); + result = sqlite3_prepare_v2 (db, sql, -1, &stmt, NULL); g_free (sql); while (result == SQLITE_OK || result == SQLITE_ROW || result == SQLITE_BUSY) { @@ -150,7 +152,7 @@ tmp = sqlite3_column_text (stmt, 0); if (tmp) { - retval = g_strdup (tmp); + retval = g_strdup ((const gchar *) tmp); break; } } @@ -188,7 +190,7 @@ if (g_file_test (filen, G_FILE_TEST_EXISTS)) { struct stat st; g_stat (filen, &st); - if (st.st_mtime != mtime) + if (st.st_mtime != (gint64) mtime) retval = TRUE; } else retval = TRUE; @@ -242,7 +244,6 @@ if (!nerror) { #ifdef HAVE_SQLITE3 - gchar *dbfile; gboolean create = FALSE; if (!db) { @@ -313,7 +314,7 @@ static void -on_file_changed (GFileMonitor *monitor, GFile *file, GFile *other_file, GFileMonitorEvent event_type, gpointer user_data) +on_file_changed (GFileMonitor *monitor_, GFile *file, GFile *other_file, GFileMonitorEvent event_type, gpointer user_data) { if (event_type == G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT || event_type == G_FILE_MONITOR_EVENT_CREATED) { gchar *config = g_file_get_path (file); Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-plugin.c =================================================================== --- projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-plugin.c 2009-03-26 08:05:58 UTC (rev 17805) +++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-plugin.c 2009-03-26 10:06:17 UTC (rev 17806) @@ -415,7 +415,7 @@ } static void -on_file_changed (GFileMonitor *monitor, GFile *file, GFile *other_file, GFileMonitorEvent event_type, gpointer user_data) +on_file_changed (GFileMonitor *monitor_, GFile *file, GFile *other_file, GFileMonitorEvent event_type, gpointer user_data) { if (event_type == G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT || event_type == G_FILE_MONITOR_EVENT_CREATED) { gchar *config = g_file_get_path (file); @@ -430,7 +430,6 @@ gchar *config = g_build_filename (g_get_user_config_dir (), "hildon-thumbnailer", "gdkpixbuf-plugin.conf", NULL); GFile *file = g_file_new_for_path (config); guint i = 0; - const gchar **supported; const gchar *uri_schemes[8] = { "file", "http", "https", "smb", "nfs", "ftp", "ftps", NULL }; @@ -447,7 +446,7 @@ *cropping = do_cropped; if (func) { - supported = hildon_thumbnail_plugin_supported (); + supported = (gchar **) hildon_thumbnail_plugin_supported (); if (supported) { while (supported[i] != NULL) { func (thumbnailer, supported[i], module, (const GStrv) uri_schemes, 0); Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-png-out-plugin.c =================================================================== --- projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-png-out-plugin.c 2009-03-26 08:05:58 UTC (rev 17805) +++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-png-out-plugin.c 2009-03-26 10:06:17 UTC (rev 17806) @@ -75,11 +75,8 @@ FILE *png; png_structp png_ptr; png_infop info_ptr; - png_uint_32 width, height; gint num_text; png_textp text_ptr; - gint bit_depth, color_type; - gint interlace_type, compression_type, filter_type; gchar *retval = NULL; #if defined(__linux__) @@ -112,7 +109,6 @@ if (png_get_text (png_ptr, info_ptr, &text_ptr, &num_text) > 0) { gint i; - gint j; for (i = 0; i < num_text; i++) { if (!text_ptr[i].key) { @@ -148,7 +144,7 @@ if (orig && g_str_has_prefix (orig, uri_match)) { struct stat st; g_stat (fulln, &st); - if (st.st_mtime <= since) { + if (st.st_mtime <= (gint) since) { g_unlink (fulln); } g_free (orig); @@ -216,7 +212,7 @@ if (g_file_test (filen, G_FILE_TEST_EXISTS)) { struct stat st; g_stat (filen, &st); - if (st.st_mtime != mtime) + if (st.st_mtime != (gint64) mtime) retval = TRUE; } else retval = TRUE; @@ -326,7 +322,7 @@ static void -on_file_changed (GFileMonitor *monitor, GFile *file, GFile *other_file, GFileMonitorEvent event_type, gpointer user_data) +on_file_changed (GFileMonitor *monitor_, GFile *file, GFile *other_file, GFileMonitorEvent event_type, gpointer user_data) { if (event_type == G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT || event_type == G_FILE_MONITOR_EVENT_CREATED) { gchar *config = g_file_get_path (file); Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/gstreamer-video-plugin.c =================================================================== --- projects/haf/trunk/hildon-thumbnail/daemon/plugins/gstreamer-video-plugin.c 2009-03-26 08:05:58 UTC (rev 17805) +++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gstreamer-video-plugin.c 2009-03-26 10:06:17 UTC (rev 17806) @@ -34,6 +34,7 @@ #include <glib.h> #include <gst/gst.h> #include <gio/gio.h> +#include <glib/gstdio.h> #include <hildon-thumbnail-plugin.h> @@ -42,7 +43,7 @@ #define GSTP_ERROR_DOMAIN "HildonThumbnailerGStreamerVideoPlugin" #define GSTP_ERROR g_quark_from_static_string (GSTP_ERROR_DOMAIN) -static gchar *supported[] = { "video/mp4", "video/mpeg", "video/quicktime", +static const gchar *supported[] = { "video/mp4", "video/mpeg", "video/quicktime", "video/x-msvideo", "audio/x-pn-realaudio", "video/3gpp", NULL }; @@ -88,9 +89,6 @@ } VideoThumbnailer; -#ifndef g_sprintf -gint g_sprintf (gchar *string, gchar const *format, ...); -#endif static void create_output (HildonThumbnailPluginOutType target, unsigned char *data, guint width, guint height, guint bpp, const gchar *uri, guint mtime, gboolean alpha, GError **error) @@ -376,7 +374,7 @@ gst_bin_add (GST_BIN (thumber->pipeline), thumber->bin); gst_element_seek (thumber->pipeline, 1.0, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH, - GST_SEEK_TYPE_SET, 30000000000 /* 30 seconds worth of nanoseconds */, + GST_SEEK_TYPE_SET, 30000000 /* 30 seconds worth of nanoseconds */, GST_SEEK_TYPE_NONE, GST_CLOCK_TIME_NONE); /* Run */ @@ -420,7 +418,7 @@ gst_object_unref (thumber->video_sink); } - g_object_unref (thumber->decodebin); + /* g_object_unref (thumber->decodebin); */ g_mutex_unlock (thumber->pipe_lock); @@ -496,7 +494,7 @@ if (g_file_test (filen, G_FILE_TEST_EXISTS)) { struct stat st; g_stat (filen, &st); - if (st.st_mtime != mtime) + if (st.st_mtime != (gint64) mtime) retval = TRUE; } else retval = TRUE; @@ -684,7 +682,7 @@ } static void -on_file_changed (GFileMonitor *monitor, GFile *file, GFile *other_file, GFileMonitorEvent event_type, gpointer user_data) +on_file_changed (GFileMonitor *monitor_, GFile *file, GFile *other_file, GFileMonitorEvent event_type, gpointer user_data) { if (event_type == G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT || event_type == G_FILE_MONITOR_EVENT_CREATED) { gchar *config = g_file_get_path (file); @@ -699,8 +697,8 @@ gchar *config = g_build_filename (g_get_user_config_dir (), "hildon-thumbnailer", "gstreamer-video-plugin.conf", NULL); GFile *file = g_file_new_for_path (config); guint i = 0; - const gchar **supported; GError *nerror = NULL; + const gchar **sup; /* TODO: Perhaps we can add a few remote ones here too (streaming media) */ const gchar *uri_schemes[2] = { "file", NULL }; @@ -731,10 +729,10 @@ *cropping = do_cropped; if (func) { - supported = hildon_thumbnail_plugin_supported (); - if (supported) { - while (supported[i] != NULL) { - func (thumbnailer, supported[i], module, (const GStrv) uri_schemes, 0); + sup = hildon_thumbnail_plugin_supported (); + if (sup) { + while (sup[i] != NULL) { + func (thumbnailer, sup[i], module, (const GStrv) uri_schemes, 0); i++; } } Modified: projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c =================================================================== --- projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c 2009-03-26 08:05:58 UTC (rev 17805) +++ projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c 2009-03-26 10:06:17 UTC (rev 17806) @@ -301,7 +301,7 @@ } static gboolean -strv_contains (GStrv list, gchar *uri) +strv_contains (const GStrv list, gchar *uri) { guint i = 0; gboolean found = FALSE; @@ -376,7 +376,7 @@ GList *thumb_items = NULL, *copy; GStrv cached_items; - static gchar *remotefss[9] = { + static const gchar *remotefss[9] = { "smb://", "file:///media", "file:///mnt", "ftp://", "ftps://", "dav://", "nfs://", @@ -536,10 +536,12 @@ while (g_hash_table_iter_next (&iter, &key, &value)) { gboolean had_err = FALSE; gchar *mime_type = g_strdup (key); - GList *urlm = value, *copy = urlm; + GList *urlm = value; GStrv urlss; DBusGProxy *proxy; + copy = urlm; + urlss = (GStrv) g_malloc0 (sizeof (gchar *) * (g_list_length (urlm) + 1)); i = 0; Modified: projects/haf/trunk/hildon-thumbnail/daemon/utils.c =================================================================== --- projects/haf/trunk/hildon-thumbnail/daemon/utils.c 2009-03-26 08:05:58 UTC (rev 17805) +++ projects/haf/trunk/hildon-thumbnail/daemon/utils.c 2009-03-26 10:06:17 UTC (rev 17806) @@ -53,8 +53,8 @@ { gchar *ascii_digest, *filename = NULL; gchar *lascii_digest = NULL; - gchar *thumb_filename, *uri_t = NULL; - gchar *cropped_filename, *ptr; + gchar *thumb_filename; + gchar *cropped_filename; static gchar *large_dir = NULL; static gchar *normal_dir = NULL; static gchar *cropped_dir = NULL; Modified: projects/haf/trunk/hildon-thumbnail/daemon/utils.h =================================================================== --- projects/haf/trunk/hildon-thumbnail/daemon/utils.h 2009-03-26 08:05:58 UTC (rev 17805) +++ projects/haf/trunk/hildon-thumbnail/daemon/utils.h 2009-03-26 10:06:17 UTC (rev 17806) @@ -33,12 +33,5 @@ void hildon_thumbnail_util_get_thumb_paths (const gchar *uri, gchar **large, gchar **normal, gchar **cropped, gchar **local_large, gchar **local_normal, gchar **local_cropped, gboolean as_png); void hildon_thumbnail_util_get_albumart_path (const gchar *a, const gchar *b, const gchar *prefix, gchar **path); -#ifndef g_sprintf -gint g_sprintf (gchar *string, gchar const *format, ...); -#endif -#ifndef g_unlink -int g_unlink (const gchar *filename); #endif - -#endif Modified: projects/haf/trunk/hildon-thumbnail/thumbs/hildon-albumart-factory.c =================================================================== --- projects/haf/trunk/hildon-thumbnail/thumbs/hildon-albumart-factory.c 2009-03-26 08:05:58 UTC (rev 17805) +++ projects/haf/trunk/hildon-thumbnail/thumbs/hildon-albumart-factory.c 2009-03-26 10:06:17 UTC (rev 17806) @@ -164,7 +164,7 @@ } static void -on_task_finished (DBusGProxy *proxy, +on_task_finished (DBusGProxy *proxy_, guint handle, gpointer user_data) { @@ -310,7 +310,7 @@ static gboolean waiting_for_cb = FALSE; static void -on_got_handle (DBusGProxy *proxy, guint OUT_handle, GError *error, gpointer userdata) +on_got_handle (DBusGProxy *proxy_, guint OUT_handle, GError *error, gpointer userdata) { ArtsItem *item = userdata; gchar *key = g_strdup_printf ("%d", OUT_handle); @@ -410,7 +410,7 @@ static void -on_cancelled (DBusGProxy *proxy, GError *error, gpointer userdata) +on_cancelled (DBusGProxy *proxy_, GError *error, gpointer userdata) { ArtsItem *item = userdata; gchar *key = g_strdup_printf ("%d", item->handle_id); @@ -449,7 +449,7 @@ } } -static void file_opp_reply (DBusGProxy *proxy, GError *error, gpointer userdata) +static void file_opp_reply (DBusGProxy *proxy_, GError *error, gpointer userdata) { } @@ -467,6 +467,8 @@ } +void hildon_albumart_factory_set_debug(gboolean debug); + void hildon_albumart_factory_set_debug(gboolean debug) { init (); Modified: projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-factory.c =================================================================== --- projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-factory.c 2009-03-26 08:05:58 UTC (rev 17805) +++ projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-factory.c 2009-03-26 10:06:17 UTC (rev 17806) @@ -39,6 +39,7 @@ #include <sys/wait.h> #include <glib.h> +#include <glib/gstdio.h> #include <glib/gprintf.h> #include <glib/gfileutils.h> #include <gdk-pixbuf/gdk-pixbuf.h> @@ -104,16 +105,16 @@ static DBusGProxy* get_tracker_proxy (void) { - static DBusGProxy *proxy = NULL; + static DBusGProxy *proxy_ = NULL; - if (!proxy) { + if (!proxy_) { GError *error = NULL; - DBusGConnection *connection; + DBusGConnection *connection_; - connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error); + connection_ = dbus_g_bus_get (DBUS_BUS_SESSION, &error); if (!error) { - proxy = dbus_g_proxy_new_for_name (connection, + proxy_ = dbus_g_proxy_new_for_name (connection_, TRACKER_METADATA_SERVICE, TRACKER_METADATA_PATH, TRACKER_METADATA_INTERFACE); @@ -122,7 +123,7 @@ } } - return proxy; + return proxy_; } /* Copied from GThumb (and/or many other projects that have copied this too) @@ -369,7 +370,7 @@ } static void -on_task_error (DBusGProxy *proxy, +on_task_error (DBusGProxy *proxy_, guint handle, GStrv failed_uris, gint error_code, @@ -392,7 +393,7 @@ } static void -on_task_finished (DBusGProxy *proxy, +on_task_finished (DBusGProxy *proxy_, guint handle, gpointer user_data) { @@ -569,7 +570,7 @@ static gboolean waiting_for_cb = FALSE; static void -on_got_handle (DBusGProxy *proxy, guint OUT_handle, GError *error, gpointer userdata) +on_got_handle (DBusGProxy *proxy_, guint OUT_handle, GError *error, gpointer userdata) { ThumbsItem *item = userdata; gchar *key = g_strdup_printf ("%d", OUT_handle); @@ -798,7 +799,7 @@ } static void -on_cancelled (DBusGProxy *proxy, GError *error, gpointer userdata) +on_cancelled (DBusGProxy *proxy_, GError *error, gpointer userdata) { } @@ -835,7 +836,7 @@ } } -static void file_opp_reply (DBusGProxy *proxy, GError *error, gpointer userdata) +static void file_opp_reply (DBusGProxy *proxy_, GError *error, gpointer userdata) { } @@ -890,9 +891,10 @@ void hildon_thumbnail_factory_remove(const gchar *uri) { - g_return_if_fail(uri); GStrv in; + g_return_if_fail(uri); + init(); in = (GStrv) g_malloc0 (sizeof (gchar *) * 2); Modified: projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c =================================================================== --- projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c 2009-03-26 08:05:58 UTC (rev 17805) +++ projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c 2009-03-26 10:06:17 UTC (rev 17806) @@ -421,10 +421,10 @@ HildonThumbnailFactoryPrivate *f_priv = FACTORY_GET_PRIVATE (r_priv->factory); gchar *key = g_strdup_printf ("%d", OUT_handle); - r_priv->key = g_strdup (key); + r_priv->key = key; if (!error) { - g_hash_table_replace (f_priv->tasks, key, + g_hash_table_replace (f_priv->tasks, g_strdup (key), g_object_ref (request)); } else { if (r_priv->pcallback) @@ -528,8 +528,7 @@ (GDestroyNotify) g_object_unref); } - if (mime_types) - g_strfreev (mime_types); + g_strfreev (mime_types); return request; }
- Previous message: [maemo-commits] r17805 - projects/haf/trunk/libmatchbox2/debian
- Next message: [maemo-commits] r17807 - in projects/haf/trunk/hildon-thumbnail: . daemon daemon/plugins
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]