summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Ruprecht <maiku@pidgin.im>2009-03-30 04:15:52 +0000
committerMichael Ruprecht <maiku@pidgin.im>2009-03-30 04:15:52 +0000
commit7cfc51a4b2b567846905ffe84c9a06b01b075c9b (patch)
tree48e3c2442299a1b9c10e715e047d477bbef5ed10
parent2153b5909ce918e24f169a0acb2663251d144668 (diff)
parent766b741414662067bebae8554b5ac20b9a4e9278 (diff)
downloadpidgin-7cfc51a4b2b567846905ffe84c9a06b01b075c9b.tar.gz
merge of '5f8ab0b75892591263d36ba483eac02b33cd87d9'
and '629bdcfe9516c3f35e386485542d1b3ace8fc33b'
-rw-r--r--finch/gntmedia.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/finch/gntmedia.c b/finch/gntmedia.c
index fc9d12e425..0c264aa615 100644
--- a/finch/gntmedia.c
+++ b/finch/gntmedia.c
@@ -101,7 +101,7 @@ enum {
PROP_MEDIA,
};
-GType
+static GType
finch_media_get_type(void)
{
static GType type = 0;
@@ -342,7 +342,7 @@ finch_media_get_property (GObject *object, guint prop_id, GValue *value, GParamS
}
}
-GntWidget *
+static GntWidget *
finch_media_new(PurpleMedia *media)
{
return GNT_WIDGET(g_object_new(finch_media_get_type(),