[gnac: 52/53] Merge branch 'devel'
- From: Benoît Dupasquier <bdupasqu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnac: 52/53] Merge branch 'devel'
- Date: Wed, 16 Mar 2011 08:54:36 +0000 (UTC)
commit c1efa4415747ce14f6b377701e398755e343b3ed
Merge: 2e988bd ee04f8c
Author: Benoît Dupasquier <bdupasqu src gnome org>
Date: Tue Mar 8 00:13:44 2011 +0000
Merge branch 'devel'
.gitignore | 2 +-
ChangeLog | 4 +-
NEWS | 10 +-
TODO | 1 -
configure.ac | 64 ++--
data/Makefile.am | 40 +--
data/gnac.desktop.in.in | 4 +-
data/gnac.schemas.in | 105 -----
data/ui/gnac-pref-window.xml | 2 -
data/ui/gnac.xml | 39 ++-
debian/control | 2 +-
debian/copyright | 6 +-
gnac.doap | 2 +-
libgnac/libgnac-converter.c | 84 +++--
libgnac/libgnac-converter.h | 7 +-
libgnac/libgnac-debug.c | 4 +-
libgnac/libgnac-debug.h | 4 +-
libgnac/libgnac-error.c | 4 +-
libgnac/libgnac-error.h | 4 +-
libgnac/libgnac-gst-utils.c | 61 ++--
libgnac/libgnac-gst-utils.h | 4 +-
libgnac/libgnac-gst.c | 20 +-
libgnac/libgnac-gst.h | 4 +-
libgnac/libgnac-marshallers.c | 4 +-
libgnac/libgnac-marshallers.h | 4 +-
libgnac/libgnac-media-item.c | 8 +-
libgnac/libgnac-media-item.h | 5 +-
libgnac/libgnac-metadata-tags.h | 24 +-
libgnac/libgnac-metadata.c | 45 ++-
libgnac/libgnac-metadata.h | 4 +-
libgnac/libgnac-output.c | 67 ++--
libgnac/libgnac-output.h | 4 +-
libgnac/libgnac-profile.h | 4 +-
m4/intltool.m4 | 2 +-
man/gnac.1 | 18 +-
po/POTFILES.in | 3 +-
src/Makefile.am | 12 +-
src/gnac-bars.c | 213 +++++------
src/gnac-bars.h | 23 +-
src/gnac-file-list.c | 22 +-
src/gnac-file-list.h | 4 +-
src/gnac-gconf.c | 195 ---------
src/gnac-gconf.h | 85 ----
src/gnac-main.c | 425 +++++++--------------
src/gnac-main.h | 77 ++--
src/gnac-options.c | 57 +++-
src/gnac-options.h | 4 +-
src/gnac-playlist.c | 4 +-
src/gnac-playlist.h | 4 +-
src/gnac-prefs.c | 121 +++----
src/gnac-prefs.h | 12 +-
src/gnac-properties.c | 93 +++---
src/gnac-properties.h | 4 +-
src/gnac-stock-items.c | 6 +-
src/gnac-stock-items.h | 4 +-
src/gnac-ui.c | 540 ++++++++++++++++++++++----
src/gnac-ui.h | 71 +++-
src/gnac-utils.c | 23 +-
src/gnac-utils.h | 7 +-
src/profiles/formats/gnac-profiles-aac.c | 4 +-
src/profiles/formats/gnac-profiles-aac.h | 4 +-
src/profiles/formats/gnac-profiles-flac.c | 4 +-
src/profiles/formats/gnac-profiles-flac.h | 4 +-
src/profiles/formats/gnac-profiles-lame.c | 4 +-
src/profiles/formats/gnac-profiles-lame.h | 4 +-
src/profiles/formats/gnac-profiles-speex.c | 4 +-
src/profiles/formats/gnac-profiles-speex.h | 4 +-
src/profiles/formats/gnac-profiles-unknown.c | 7 +-
src/profiles/formats/gnac-profiles-unknown.h | 4 +-
src/profiles/formats/gnac-profiles-vorbis.c | 4 +-
src/profiles/formats/gnac-profiles-vorbis.h | 4 +-
src/profiles/formats/gnac-profiles-wav.c | 4 +-
src/profiles/formats/gnac-profiles-wav.h | 4 +-
src/profiles/formats/gnac-profiles-wavpack.c | 4 +-
src/profiles/formats/gnac-profiles-wavpack.h | 4 +-
src/profiles/gnac-profiles-default.c | 13 +-
src/profiles/gnac-profiles-default.h | 4 +-
src/profiles/gnac-profiles-manager.c | 152 +++++++-
src/profiles/gnac-profiles-manager.h | 7 +-
src/profiles/gnac-profiles-properties.c | 20 +-
src/profiles/gnac-profiles-properties.h | 4 +-
src/profiles/gnac-profiles-utils.c | 22 +-
src/profiles/gnac-profiles-utils.h | 4 +-
src/profiles/gnac-profiles-xml-engine.c | 4 +-
src/profiles/gnac-profiles-xml-engine.h | 4 +-
src/profiles/gnac-profiles.c | 4 +-
src/profiles/gnac-profiles.h | 4 +-
87 files changed, 1543 insertions(+), 1441 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
