[totem: 20/20] Merge branch 'introspection'
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [totem: 20/20] Merge branch 'introspection'
- Date: Wed, 30 Jun 2010 18:24:59 +0000 (UTC)
commit bd9fd4fff3960ed9ba48bb42f69da33f263981e5
Merge: b87d5fa e5394da
Author: Philip Withnall <philip tecnocode co uk>
Date: Wed Jun 30 18:55:02 2010 +0100
Merge branch 'introspection'
Makefile.am | 5 +-
bindings/Makefile.am | 9 -
bindings/python/Makefile.am | 65 ---
bindings/python/__init__.py | 50 --
bindings/python/override_common.c | 189 --------
bindings/python/override_common.h | 50 --
bindings/python/totem.defs | 537 ----------------------
bindings/python/totem.override | 117 -----
bindings/python/totemmodule.c | 230 ---------
bindings/vala/Makefile.am | 3 -
bindings/vala/totem.deps | 1 -
bindings/vala/totem.vapi | 127 -----
configure.in | 85 +---
data/Makefile.am | 4 +
data/totem.pc.in | 11 +
docs/reference/Makefile.am | 2 +-
docs/reference/totem-sections.txt | 60 ++--
src/Makefile.am | 89 +++-
src/plugins/Makefile.am | 42 --
src/plugins/coherence_upnp/coherence_upnp.py | 19 +-
src/plugins/dbus-service/dbus-service.py | 33 +-
src/plugins/iplayer/iplayer.py | 24 +-
src/plugins/iplayer/iplayer2.py | 10 +-
src/plugins/jamendo/jamendo.py | 90 ++--
src/plugins/opensubtitles/opensubtitles.py | 84 ++--
src/plugins/pythonconsole/console.py | 59 ++--
src/plugins/pythonconsole/pythonconsole.py | 50 ++-
src/plugins/sample-python/sample-python.py | 15 +-
src/plugins/screenshot/totem-screenshot-plugin.c | 4 +-
src/plugins/totem-plugins-engine.c | 6 +-
src/totem-object.c | 498 ++++++++++-----------
src/totem-playlist.c | 11 +-
src/totem.h | 143 ++++---
33 files changed, 667 insertions(+), 2055 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]