[gthumb/ext: 3/3] Merge branch 'slideshow' into ext
- From: Paolo Bacchilega <paobac src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gthumb/ext: 3/3] Merge branch 'slideshow' into ext
- Date: Tue, 1 Sep 2009 19:42:57 +0000 (UTC)
commit 64313d6d1c6a3b0a07b6e01bf0f6595d415fbb9f
Merge: c498deb... 7dd53c5...
Author: Paolo Bacchilega <paobac src gnome org>
Date: Tue Sep 1 21:39:23 2009 +0200
Merge branch 'slideshow' into ext
configure.ac | 26 +-
extensions/Makefile.am | 3 +-
extensions/comments/main.c | 39 +-
extensions/file_viewer/gth-file-viewer-page.c | 2 +-
extensions/file_viewer/main.c | 2 +-
extensions/image_viewer/main.c | 2 +-
extensions/image_viewer/preferences.h | 14 +-
extensions/photo_importer/dlg-photo-importer.c | 6 +-
extensions/slideshow/Makefile.am | 42 ++
extensions/slideshow/actions.c | 75 +++
extensions/slideshow/actions.h | 32 ++
extensions/slideshow/callbacks.c | 120 +++++
extensions/slideshow/callbacks.h | 31 ++
extensions/slideshow/data/Makefile.am | 18 +
.../slideshow/data/gthumb-slideshow.schemas.in | 57 +++
extensions/slideshow/data/ui/Makefile.am | 5 +
.../slideshow/data/ui/slideshow-preferences.ui | 105 +++++
extensions/slideshow/gth-slideshow.c | 471 ++++++++++++++++++++
extensions/slideshow/gth-slideshow.h | 74 +++
extensions/slideshow/gth-transition.c | 213 +++++++++
extensions/slideshow/gth-transition.h | 68 +++
extensions/slideshow/main.c | 178 ++++++++
extensions/slideshow/preferences.c | 189 ++++++++
extensions/slideshow/preferences.h | 39 ++
extensions/slideshow/slideshow.extension.in.in | 10 +
gthumb/Makefile.am | 2 +
gthumb/dlg-personalize-filters.c | 4 +-
gthumb/gth-browser-ui.h | 1 +
gthumb/gth-browser.c | 15 +-
gthumb/gth-filter-file.c | 2 +-
gthumb/gth-hook.c | 4 +-
gthumb/gth-main-default-tests.c | 108 +++--
gthumb/gth-main.c | 233 +++++-----
gthumb/gth-main.h | 18 +-
gthumb/gth-test-chain.c | 2 +-
gthumb/gth-test-selector.c | 8 +-
gthumb/main.c | 9 +
37 files changed, 2005 insertions(+), 222 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]