diff options
author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-10-13 16:17:46 +0200 |
---|---|---|
committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-10-13 16:17:46 +0200 |
commit | dfd67822fc3069ff43ea586a6137ac50a37bc32d (patch) | |
tree | 695efa56e5a0c4d8d0b587fe15d4c18c1c835420 /telepathy-glib/capabilities.c | |
parent | 5b4070cf6985d28933195965fc1245b54b1809c8 (diff) | |
parent | 0e6ac1b857bd67cf69edd326ebec91fa1cfa6e43 (diff) | |
download | telepathy-glib-dfd67822fc3069ff43ea586a6137ac50a37bc32d.tar.gz |
Merge branch 'telepathy-glib-0.12'
Diffstat (limited to 'telepathy-glib/capabilities.c')
-rw-r--r-- | telepathy-glib/capabilities.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/telepathy-glib/capabilities.c b/telepathy-glib/capabilities.c index 7f2e6e3f9..2cf952389 100644 --- a/telepathy-glib/capabilities.c +++ b/telepathy-glib/capabilities.c @@ -59,7 +59,7 @@ struct _TpCapabilities { TpCapabilitiesPrivate *priv; }; -G_DEFINE_TYPE (TpCapabilities, tp_capabilities, G_TYPE_OBJECT); +G_DEFINE_TYPE (TpCapabilities, tp_capabilities, G_TYPE_OBJECT) enum { PROP_CHANNEL_CLASSES = 1, |