[grilo/debian: 22/23] Merge commit 'grilo-0.1.10' into debian
- From: Juan A. Suarez Romero <jasuarez src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [grilo/debian: 22/23] Merge commit 'grilo-0.1.10' into debian
- Date: Sun, 6 Mar 2011 17:00:26 +0000 (UTC)
commit c2c7d8af94ba4d43b24ee8310bfef8f1091aecf3
Merge: 2448cf2 02a1245
Author: Juan A. Suarez Romero <jasuarez igalia com>
Date: Fri Mar 4 16:59:41 2011 +0000
Merge commit 'grilo-0.1.10' into debian
NEWS | 14 +
configure.ac | 22 ++-
src/Makefile.am | 2 +
src/data/grl-data.c | 713 ++++++++++++++++++++++++++++++++++------
src/data/grl-data.h | 27 ++-
src/data/grl-media-audio.c | 283 ++++++++++++++--
src/data/grl-media-audio.h | 40 ++-
src/data/grl-media-image.c | 150 ++++++++-
src/data/grl-media-image.h | 31 ++-
src/data/grl-media-video.c | 186 ++++++++++-
src/data/grl-media-video.h | 39 ++-
src/data/grl-media.c | 546 +++++++++++++++++++++++-------
src/data/grl-media.h | 110 ++++---
src/data/grl-related-keys.c | 616 ++++++++++++++++++++++++++++++++++
src/data/grl-related-keys.h | 153 +++++++++
src/grilo.h | 1 +
src/grl-media-source.c | 268 +++++++--------
src/grl-metadata-key.c | 17 +
src/grl-metadata-source-priv.h | 15 +-
src/grl-metadata-source.c | 467 ++++++++++++++++++--------
src/grl-metadata-source.h | 16 +-
src/grl-plugin-registry.c | 83 +++++
src/grl-plugin-registry.h | 7 +
tools/grilo-test-ui/main.c | 130 ++++++--
24 files changed, 3269 insertions(+), 667 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]