[gthumb/ext: 18/18] Merge branch 'gstreamer' into ext
- From: Paolo Bacchilega <paobac src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gthumb/ext: 18/18] Merge branch 'gstreamer' into ext
- Date: Fri, 6 Nov 2009 00:17:07 +0000 (UTC)
commit fcf55c97c008bb814311331a1a00eab683de2c84
Merge: 977ff06... e22ba0b...
Author: Paolo Bacchilega <paobac src gnome org>
Date: Fri Nov 6 01:12:00 2009 +0100
Merge branch 'gstreamer' into ext
configure.ac | 22 +
extensions/Makefile.am | 1 +
extensions/gstreamer/Makefile.am | 41 +
extensions/gstreamer/data/Makefile.am | 18 +
.../gstreamer/data/gthumb-gstreamer.schemas.in | 17 +
extensions/gstreamer/data/ui/Makefile.am | 5 +
extensions/gstreamer/data/ui/mediabar.ui | 228 ++++
extensions/gstreamer/data/ui/save-screenshot.ui | 171 +++
extensions/gstreamer/gstreamer-utils.c | 790 +++++++++++++
extensions/gstreamer/gstreamer-utils.h | 47 +
extensions/gstreamer/gstreamer.extension.in.in | 10 +
extensions/gstreamer/gstscreenshot.c | 259 +++++
extensions/gstreamer/gstscreenshot.h | 36 +
extensions/gstreamer/gth-media-viewer-page.c | 1180 ++++++++++++++++++++
extensions/gstreamer/gth-media-viewer-page.h | 54 +
.../gstreamer/gth-metadata-provider-gstreamer.c | 135 +++
.../gstreamer/gth-metadata-provider-gstreamer.h | 54 +
extensions/gstreamer/main.c | 85 ++
extensions/gstreamer/preferences.h | 28 +
extensions/image_viewer/gth-image-viewer-page.c | 160 +---
.../image_viewer/gth-metadata-provider-image.c | 6 +-
extensions/image_viewer/main.c | 15 -
extensions/image_viewer/preferences.h | 2 +-
gthumb/Makefile.am | 3 +
gthumb/glib-utils.c | 59 +
gthumb/glib-utils.h | 5 +
gthumb/gth-browser-ui.h | 1 +
gthumb/gth-browser.c | 49 +-
gthumb/gth-browser.h | 3 +
gthumb/gth-file-chooser-dialog.c | 276 +++++
gthumb/gth-file-chooser-dialog.h | 61 +
gthumb/gth-image-viewer.c | 2 -
gthumb/gth-main-default-metadata.c | 5 +
gthumb/gth-main.c | 41 +-
gthumb/gtk-utils.c | 7 +-
35 files changed, 3693 insertions(+), 183 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]