[gthumb: 14/14] Merge branch 'find-duplicates'
- From: Paolo Bacchilega <paobac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gthumb: 14/14] Merge branch 'find-duplicates'
- Date: Fri, 28 Jan 2011 00:54:20 +0000 (UTC)
commit 24f76eafe132c8473fe67d0fd8c4795b70693730
Merge: 3ed17cd d4829a7
Author: Paolo Bacchilega <paobac src gnome org>
Date: Fri Jan 28 00:45:30 2011 +0100
Merge branch 'find-duplicates'
configure.ac | 3 +
extensions/Makefile.am | 46 +-
extensions/file_manager/actions.c | 28 +-
extensions/file_manager/actions.h | 3 +
extensions/file_manager/gth-copy-task.c | 9 +-
.../find_duplicates/.#gth-find-duplicates-task.c | 1 +
extensions/find_duplicates/Makefile.am | 33 +
extensions/find_duplicates/actions.c | 34 +
extensions/find_duplicates/actions.h | 31 +
extensions/find_duplicates/callbacks.c | 94 +++
extensions/find_duplicates/callbacks.h | 29 +
extensions/find_duplicates/data/Makefile.am | 2 +
extensions/find_duplicates/data/ui/Makefile.am | 5 +
.../data/ui/find-duplicates-dialog.ui | 511 ++++++++++++++
.../find_duplicates/data/ui/find-duplicates.ui | 186 +++++
extensions/find_duplicates/dlg-find-duplicates.c | 167 +++++
extensions/find_duplicates/dlg-find-duplicates.h | 31 +
.../find_duplicates.extension.in.in | 12 +
extensions/find_duplicates/gth-find-duplicates.c | 728 ++++++++++++++++++++
extensions/find_duplicates/gth-find-duplicates.h | 56 ++
extensions/find_duplicates/main.c | 52 ++
extensions/image_print/gth-image-print-job.c | 8 +-
extensions/image_print/gth-load-image-info-task.c | 8 +-
extensions/list_tools/gth-script-task.c | 8 +-
extensions/search/gth-search-task.c | 2 +-
gthumb/gio-utils.c | 25 +-
gthumb/gth-browser.c | 9 +-
gthumb/gth-file-source-vfs.c | 2 +
gthumb/gth-metadata-provider.c | 195 ++----
gthumb/gth-metadata-provider.h | 6 +-
30 files changed, 2143 insertions(+), 181 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]