changeset 26462:b0a9c48b5f69

merge of '2d0e977ba883c0b9d24d52360839cfed7cf1f2a6' and 'e9514d92cd62759a80a75f93b308e4fd05afe673'
author Mike Ruprecht <maiku@soc.pidgin.im>
date Mon, 30 Mar 2009 04:15:53 +0000
parents aa85cf759b98 (diff) cdce3db4e09f (current diff)
children 6bcf5ad967ea
files pidgin/gtkmedia.c
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gtkmedia.c	Mon Mar 30 04:15:52 2009 +0000
+++ b/pidgin/gtkmedia.c	Mon Mar 30 04:15:53 2009 +0000
@@ -128,7 +128,7 @@
 	PROP_RECV_LEVEL
 };
 
-GType
+static GType
 pidgin_media_get_type(void)
 {
 	static GType type = 0;