Mercurial > pidgin
changeset 26379:cdce3db4e09f
merge of '09e919e395cff260ab58aee3aec04058c5f128b9'
and '19dc1175b3648701e3d873038fbd2bb955afea8f'
| author | Mike Ruprecht <maiku@soc.pidgin.im> |
|---|---|
| date | Mon, 30 Mar 2009 04:15:52 +0000 |
| parents | e9e9ec08e87c (diff) 452be048bded (current diff) |
| children | b0a9c48b5f69 |
| files | finch/gntmedia.c |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/finch/gntmedia.c Mon Mar 30 03:54:48 2009 +0000 +++ b/finch/gntmedia.c Mon Mar 30 04:15:52 2009 +0000 @@ -101,7 +101,7 @@ PROP_MEDIA, }; -GType +static GType finch_media_get_type(void) { static GType type = 0; @@ -342,7 +342,7 @@ } } -GntWidget * +static GntWidget * finch_media_new(PurpleMedia *media) { return GNT_WIDGET(g_object_new(finch_media_get_type(),