diff options
| -rw-r--r-- | plugins/desktop-thumbnailer/desktop-thumbnailer-provider.c | 5 | ||||
| -rw-r--r-- | tumblerd/tumbler-registry.c | 9 | ||||
| -rw-r--r-- | tumblerd/tumbler.rc | 4 |
3 files changed, 7 insertions, 11 deletions
diff --git a/plugins/desktop-thumbnailer/desktop-thumbnailer-provider.c b/plugins/desktop-thumbnailer/desktop-thumbnailer-provider.c index 6de3480..d33abc9 100644 --- a/plugins/desktop-thumbnailer/desktop-thumbnailer-provider.c +++ b/plugins/desktop-thumbnailer/desktop-thumbnailer-provider.c @@ -212,8 +212,7 @@ desktop_thumbnailer_get_thumbnailers_from_dir (GList *thumbnailers, if (thumbnailer) { - - thumbnailers = g_list_append (thumbnailers, thumbnailer); + thumbnailers = g_list_prepend (thumbnailers, thumbnailer); } } @@ -276,6 +275,8 @@ desktop_thumbnailer_provider_get_thumbnailers (TumblerThumbnailerProvider *provi * priority come first */ directories = g_list_reverse (directories); + /* thumbnailers end up in reverse order here, since they are prepended, but the list must + * not be reversed: this will happen during sorted insertion in tumbler_registry_add() */ for (iter = directories; iter != NULL; iter = iter->next) { thumbnailers = desktop_thumbnailer_get_thumbnailers_from_dir (thumbnailers, iter->data, uri_schemes); diff --git a/tumblerd/tumbler-registry.c b/tumblerd/tumbler-registry.c index 4e5fad1..d605190 100644 --- a/tumblerd/tumbler-registry.c +++ b/tumblerd/tumbler-registry.c @@ -179,7 +179,7 @@ tumbler_registry_compare (TumblerThumbnailer *a, /* sort by priority */ insert_a_before_b = tumbler_thumbnailer_get_priority (a) >= tumbler_thumbnailer_get_priority (b); } - else if (TUMBLER_IS_SPECIALIZED_THUMBNAILER (b)) + else { a_specialized = TUMBLER_SPECIALIZED_THUMBNAILER (a); b_specialized = TUMBLER_SPECIALIZED_THUMBNAILER (b); @@ -195,8 +195,8 @@ tumbler_registry_compare (TumblerThumbnailer *a, } else { - b_modified = tumbler_specialized_thumbnailer_get_modified (a_specialized); a_modified = tumbler_specialized_thumbnailer_get_modified (a_specialized); + b_modified = tumbler_specialized_thumbnailer_get_modified (b_specialized); if (a_modified > b_modified) { @@ -206,11 +206,6 @@ tumbler_registry_compare (TumblerThumbnailer *a, } } } - else - { - /* we have no other thumbnailer types at the moment */ - g_assert_not_reached (); - } return insert_a_before_b ? -1 : 1; } diff --git a/tumblerd/tumbler.rc b/tumblerd/tumbler.rc index 425e783..b13814d 100644 --- a/tumblerd/tumbler.rc +++ b/tumblerd/tumbler.rc @@ -37,7 +37,7 @@ MaxFileSize=209715200 # broken, hence the priority) [RawThumbnailer] Disabled=false -Priority=2 +Priority=3 Locations= Excludes= MaxFileSize=209715200 @@ -45,7 +45,7 @@ MaxFileSize=209715200 # Supports all type GdkPixbuf supports [PixbufThumbnailer] Disabled=false -Priority=1 +Priority=2 Locations= Excludes= MaxFileSize=209715200 |