diff options
-rwxr-xr-x | autogen.sh | 2 | ||||
-rw-r--r-- | po/tumbler.pot | 162 | ||||
-rw-r--r-- | tumblerd/tumbler-group-scheduler.c | 37 | ||||
-rw-r--r-- | tumblerd/tumbler-group-scheduler.h | 2 | ||||
-rw-r--r-- | tumblerd/tumbler-lifo-scheduler.c | 38 | ||||
-rw-r--r-- | tumblerd/tumbler-lifo-scheduler.h | 2 | ||||
-rw-r--r-- | tumblerd/tumbler-scheduler.c | 26 | ||||
-rw-r--r-- | tumblerd/tumbler-scheduler.h | 4 | ||||
-rw-r--r-- | tumblerd/tumbler-service.c | 2 |
9 files changed, 42 insertions, 233 deletions
@@ -29,7 +29,7 @@ fi which gnome-autogen.sh if test x"$?" = x"0"; then echo "Building using the GNOME development environment" - ./autogen.gnome.sh $@ + ./autogen-gnome.sh $@ exit $? fi diff --git a/po/tumbler.pot b/po/tumbler.pot deleted file mode 100644 index 18cd4e1..0000000 --- a/po/tumbler.pot +++ /dev/null @@ -1,162 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-30 02:45+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: .././tumblerd/tumbler-cache-service.c:398 -#, c-format -msgid "Another thumbnail cache service is already running" -msgstr "" - -#: .././tumblerd/tumbler-service.c:383 -#, c-format -msgid "Another generic thumbnailer is already running" -msgstr "" - -#: .././tumblerd/tumbler-threshold-scheduler.c:388 -#, c-format -msgid "No thumbnailer available for \"%s\"" -msgstr "" - -#: .././tumblerd/tumbler-manager.c:230 -#, c-format -msgid "Another thumbnailer manager is already running" -msgstr "" - -#. set the application name. Translators: Don't translate "Tumbler". -#: .././tumblerd/main.c:63 -msgid "Tumbler Thumbnailing Service" -msgstr "" - -#: .././tumblerd/main.c:78 -#, c-format -msgid "Failed to connect to the D-Bus session bus: %s" -msgstr "" - -#: .././tumblerd/main.c:90 -#, c-format -msgid "Failed to start the thumbnail cache service: %s" -msgstr "" - -#: .././tumblerd/main.c:137 -#, c-format -msgid "Failed to load specialized thumbnailers into the registry: %s" -msgstr "" - -#: .././tumblerd/main.c:155 -#, c-format -msgid "Failed to start the thumbnailer manager: %s" -msgstr "" - -#: .././tumblerd/main.c:173 -#, c-format -msgid "Failed to start the thumbnailer service: %s" -msgstr "" - -#: .././tumbler/tumbler-enum-types.c:49 .././tumbler/tumbler-enum-types.c:73 -msgid "Invalid format" -msgstr "" - -#: .././tumbler/tumbler-enum-types.c:50 -msgid "Normal" -msgstr "" - -#: .././tumbler/tumbler-enum-types.c:51 -msgid "Large" -msgstr "" - -#: .././tumbler/tumbler-enum-types.c:52 -msgid "Cropped" -msgstr "" - -#: .././tumbler/tumbler-enum-types.c:74 -msgid "PNG" -msgstr "" - -#: .././tumbler/tumbler-file-info.c:275 -#, c-format -msgid "The file \"%s\" is a thumbnail itself" -msgstr "" - -#: .././tumbler/tumbler-provider-plugin.c:135 -#, c-format -msgid "Plugin \"%s\" lacks required symbols." -msgstr "" - -#: .././tumbler/tumbler-provider-plugin.c:142 -#, c-format -msgid "Failed to load plugin \"%s\": %s" -msgstr "" - -#: .././plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-plugin.c:57 -#: .././plugins/font-thumbnailer/font-thumbnailer-plugin.c:57 -#: .././plugins/xdg-cache/xdg-cache-plugin.c:58 -#, c-format -msgid "Version mismatch: %s" -msgstr "" - -#: .././plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-plugin.c:62 -msgid "Initializing the Tumbler Pixbuf Thumbnailer plugin" -msgstr "" - -#: .././plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-plugin.c:79 -msgid "Shutting down the Tumbler Pixbuf Thumbnailer plugin" -msgstr "" - -#: .././plugins/font-thumbnailer/font-thumbnailer-plugin.c:62 -msgid "Initializing the Tumbler Font Thumbnailer plugin" -msgstr "" - -#: .././plugins/font-thumbnailer/font-thumbnailer-plugin.c:79 -msgid "Shutting down the Tumbler Font Thumbnailer plugin" -msgstr "" - -#. there was an error in the freetype initialization, abort -#: .././plugins/font-thumbnailer/font-thumbnailer.c:464 -#, c-format -msgid "Could not initialize freetype: %s" -msgstr "" - -#. the font file could not be loaded, emit an error signal -#: .././plugins/font-thumbnailer/font-thumbnailer.c:497 -#, c-format -msgid "Could not open font file: %s" -msgstr "" - -#. emit an error signal -#: .././plugins/font-thumbnailer/font-thumbnailer.c:525 -#, c-format -msgid "Could not set the character map: %s" -msgstr "" - -#. emit an error signal -#: .././plugins/font-thumbnailer/font-thumbnailer.c:555 -#, c-format -msgid "Could not render glyphs: %s" -msgstr "" - -#: .././plugins/xdg-cache/xdg-cache-thumbnail.c:373 -#, c-format -msgid "Could not save thumbnail to \"%s\"" -msgstr "" - -#: .././plugins/xdg-cache/xdg-cache-plugin.c:63 -msgid "Initializing the Tumbler XDG cache plugin" -msgstr "" - -#: .././plugins/xdg-cache/xdg-cache-plugin.c:81 -msgid "Shutting down the Tumbler XDG cache plugin" -msgstr "" diff --git a/tumblerd/tumbler-group-scheduler.c b/tumblerd/tumbler-group-scheduler.c index 4d0406e..bbe4654 100644 --- a/tumblerd/tumbler-group-scheduler.c +++ b/tumblerd/tumbler-group-scheduler.c @@ -35,13 +35,11 @@ #include <tumblerd/tumbler-group-scheduler.h> #include <tumblerd/tumbler-scheduler.h> - - /* Property identifiers */ enum { PROP_0, - PROP_KIND, + PROP_NAME, }; static void tumbler_group_scheduler_iface_init (TumblerSchedulerIface *iface); @@ -88,7 +86,7 @@ struct _TumblerGroupScheduler GMutex *mutex; GList *requests; guint group; - gchar *kind; + gchar *name; }; @@ -115,29 +113,16 @@ tumbler_group_scheduler_class_init (TumblerGroupSchedulerClass *klass) gobject_class->get_property = tumbler_group_scheduler_get_property; gobject_class->set_property = tumbler_group_scheduler_set_property; - g_object_class_install_property (gobject_class, - PROP_KIND, - g_param_spec_string ("kind", - "kind", - "kind", - NULL, - G_PARAM_CONSTRUCT_ONLY | - G_PARAM_READWRITE)); -} + g_object_class_override_property (gobject_class, PROP_NAME, "name"); -static const gchar* -tumbler_group_scheduler_get_kind (TumblerScheduler *scheduler) -{ - TumblerGroupScheduler *s = TUMBLER_GROUP_SCHEDULER (scheduler); - return s->kind; } + static void tumbler_group_scheduler_iface_init (TumblerSchedulerIface *iface) { iface->push = tumbler_group_scheduler_push; iface->unqueue = tumbler_group_scheduler_unqueue; - iface->get_kind = tumbler_group_scheduler_get_kind; } @@ -170,6 +155,8 @@ tumbler_group_scheduler_finalize (GObject *object) /* destroy the request list */ g_list_free (scheduler->requests); + g_free (scheduler->name); + /* destroy the mutex */ g_mutex_free (scheduler->mutex); @@ -188,8 +175,8 @@ tumbler_group_scheduler_get_property (GObject *object, switch (prop_id) { - case PROP_KIND: - g_value_set_string (value, scheduler->kind); + case PROP_NAME: + g_value_set_string (value, scheduler->name); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -209,8 +196,8 @@ tumbler_group_scheduler_set_property (GObject *object, switch (prop_id) { - case PROP_KIND: - scheduler->kind = g_value_dup_string (value); + case PROP_NAME: + scheduler->name = g_value_dup_string (value); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -565,7 +552,7 @@ tumbler_group_scheduler_thumbnailer_ready (TumblerThumbnailer *thumbnailer, TumblerScheduler * -tumbler_group_scheduler_new (const gchar *kind) +tumbler_group_scheduler_new (const gchar *name) { - return g_object_new (TUMBLER_TYPE_GROUP_SCHEDULER, "kind", kind, NULL); + return g_object_new (TUMBLER_TYPE_GROUP_SCHEDULER, "name", name, NULL); } diff --git a/tumblerd/tumbler-group-scheduler.h b/tumblerd/tumbler-group-scheduler.h index e45efab..741adec 100644 --- a/tumblerd/tumbler-group-scheduler.h +++ b/tumblerd/tumbler-group-scheduler.h @@ -39,7 +39,7 @@ typedef struct _TumblerGroupScheduler TumblerGroupScheduler; GType tumbler_group_scheduler_get_type (void) G_GNUC_CONST; -TumblerScheduler *tumbler_group_scheduler_new (const gchar *kind) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT; +TumblerScheduler *tumbler_group_scheduler_new (const gchar *name) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT; G_END_DECLS; diff --git a/tumblerd/tumbler-lifo-scheduler.c b/tumblerd/tumbler-lifo-scheduler.c index 832daab..31b9276 100644 --- a/tumblerd/tumbler-lifo-scheduler.c +++ b/tumblerd/tumbler-lifo-scheduler.c @@ -34,12 +34,11 @@ #include <tumblerd/tumbler-scheduler.h> - /* Property identifiers */ enum { PROP_0, - PROP_KIND, + PROP_NAME, }; static void tumbler_lifo_scheduler_iface_init (TumblerSchedulerIface *iface); @@ -86,7 +85,7 @@ struct _TumblerLifoScheduler GMutex *mutex; GList *requests; guint lifo; - gchar *kind; + gchar *name; }; @@ -102,7 +101,6 @@ G_DEFINE_TYPE_WITH_CODE (TumblerLifoScheduler, tumbler_lifo_scheduler_iface_init)); - static void tumbler_lifo_scheduler_class_init (TumblerLifoSchedulerClass *klass) { @@ -110,24 +108,12 @@ tumbler_lifo_scheduler_class_init (TumblerLifoSchedulerClass *klass) gobject_class = G_OBJECT_CLASS (klass); gobject_class->finalize = tumbler_lifo_scheduler_finalize; + gobject_class->get_property = tumbler_lifo_scheduler_get_property; gobject_class->set_property = tumbler_lifo_scheduler_set_property; - g_object_class_install_property (gobject_class, - PROP_KIND, - g_param_spec_string ("kind", - "kind", - "kind", - NULL, - G_PARAM_CONSTRUCT_ONLY | - G_PARAM_READWRITE)); -} + g_object_class_override_property (gobject_class, PROP_NAME, "name"); -static const gchar* -tumbler_lifo_scheduler_get_kind (TumblerScheduler *scheduler) -{ - TumblerLifoScheduler *s = TUMBLER_LIFO_SCHEDULER (scheduler); - return s->kind; } static void @@ -135,11 +121,9 @@ tumbler_lifo_scheduler_iface_init (TumblerSchedulerIface *iface) { iface->push = tumbler_lifo_scheduler_push; iface->unqueue = tumbler_lifo_scheduler_unqueue; - iface->get_kind = tumbler_lifo_scheduler_get_kind; } - static void tumbler_lifo_scheduler_init (TumblerLifoScheduler *scheduler) { @@ -171,6 +155,8 @@ tumbler_lifo_scheduler_finalize (GObject *object) /* destroy the request list */ g_list_free (scheduler->requests); + g_free (scheduler->name); + /* destroy the mutex */ g_mutex_free (scheduler->mutex); @@ -189,8 +175,8 @@ tumbler_lifo_scheduler_get_property (GObject *object, switch (prop_id) { - case PROP_KIND: - g_value_set_string (value, scheduler->kind); + case PROP_NAME: + g_value_set_string (value, scheduler->name); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -210,8 +196,8 @@ tumbler_lifo_scheduler_set_property (GObject *object, switch (prop_id) { - case PROP_KIND: - scheduler->kind = g_value_dup_string (value); + case PROP_NAME: + scheduler->name = g_value_dup_string (value); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -506,7 +492,7 @@ tumbler_lifo_scheduler_thumbnailer_ready (TumblerThumbnailer *thumbnailer, TumblerScheduler * -tumbler_lifo_scheduler_new (const gchar *kind) +tumbler_lifo_scheduler_new (const gchar *name) { - return g_object_new (TUMBLER_TYPE_LIFO_SCHEDULER, "kind", kind, NULL); + return g_object_new (TUMBLER_TYPE_LIFO_SCHEDULER, "name", name, NULL); } diff --git a/tumblerd/tumbler-lifo-scheduler.h b/tumblerd/tumbler-lifo-scheduler.h index badf925..1cbd84d 100644 --- a/tumblerd/tumbler-lifo-scheduler.h +++ b/tumblerd/tumbler-lifo-scheduler.h @@ -37,7 +37,7 @@ typedef struct _TumblerLifoScheduler TumblerLifoScheduler; GType tumbler_lifo_scheduler_get_type (void) G_GNUC_CONST; -TumblerScheduler *tumbler_lifo_scheduler_new (const gchar *kind) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT; +TumblerScheduler *tumbler_lifo_scheduler_new (const gchar *name) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT; G_END_DECLS; diff --git a/tumblerd/tumbler-scheduler.c b/tumblerd/tumbler-scheduler.c index 08b74c4..817270f 100644 --- a/tumblerd/tumbler-scheduler.c +++ b/tumblerd/tumbler-scheduler.c @@ -26,8 +26,6 @@ #include <tumblerd/tumbler-scheduler.h> - - /* signal identifiers */ enum { @@ -39,15 +37,9 @@ enum }; - static void tumbler_scheduler_class_init (TumblerSchedulerIface *klass); - - - static guint tumbler_scheduler_signals[LAST_SIGNAL]; - - GType tumbler_scheduler_get_type (void) { @@ -73,10 +65,17 @@ tumbler_scheduler_get_type (void) } - static void tumbler_scheduler_class_init (TumblerSchedulerIface *klass) { + g_object_interface_install_property (klass, + g_param_spec_string ("name", + "name", + "name", + NULL, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY)); + tumbler_scheduler_signals[SIGNAL_ERROR] = g_signal_new ("error", TUMBLER_TYPE_SCHEDULER, @@ -169,15 +168,16 @@ tumbler_scheduler_take_request (TumblerScheduler *scheduler, const gchar* -tumbler_scheduler_get_kind (TumblerScheduler *scheduler) +tumbler_scheduler_get_name (TumblerScheduler *scheduler) { + const gchar *name; + g_return_if_fail (TUMBLER_IS_SCHEDULER (scheduler)); - g_return_if_fail (TUMBLER_SCHEDULER_GET_IFACE (scheduler)->get_kind != NULL); + g_object_get (scheduler, "name", &name, NULL); - TUMBLER_SCHEDULER_GET_IFACE (scheduler)->get_kind (scheduler); + return name; } - void tumbler_scheduler_emit_uri_error (TumblerScheduler *scheduler, TumblerSchedulerRequest *request, diff --git a/tumblerd/tumbler-scheduler.h b/tumblerd/tumbler-scheduler.h index d1614c0..9305075 100644 --- a/tumblerd/tumbler-scheduler.h +++ b/tumblerd/tumbler-scheduler.h @@ -57,8 +57,6 @@ struct _TumblerSchedulerIface TumblerSchedulerRequest *request); void (*unqueue) (TumblerScheduler *scheduler, guint handle); - const gchar* - (*get_kind) (TumblerScheduler *scheduler); }; GType tumbler_scheduler_get_type (void) G_GNUC_CONST; @@ -67,7 +65,7 @@ void tumbler_scheduler_push (TumblerSchedul TumblerSchedulerRequest *request); void tumbler_scheduler_unqueue (TumblerScheduler *scheduler, guint handle); -const gchar* tumbler_scheduler_get_kind (TumblerScheduler *scheduler); +const gchar* tumbler_scheduler_get_name (TumblerScheduler *scheduler); void tumbler_scheduler_take_request (TumblerScheduler *scheduler, TumblerSchedulerRequest *request); void tumbler_scheduler_emit_uri_error (TumblerScheduler *scheduler, diff --git a/tumblerd/tumbler-service.c b/tumblerd/tumbler-service.c index eefd867..3f07f9b 100644 --- a/tumblerd/tumbler-service.c +++ b/tumblerd/tumbler-service.c @@ -451,7 +451,7 @@ tumbler_service_queue (TumblerService *service, for (i = 0; i < service->schedulers->len; i++) { TumblerScheduler *sched = g_ptr_array_index (service->schedulers, i); - const gchar *kind = tumbler_scheduler_get_kind (sched); + const gchar *kind = tumbler_scheduler_get_name (sched); /* unqueue the request with the given unqueue handle */ if (handle_to_unqueue != 0) |