Mercurial > pidgin

diff libpurple/mediamanager.c @ 24983:18b71033ea6e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove connection attribute from PurpleMedia.
author Mike Ruprecht <maiku@soc.pidgin.im>
date Tue, 16 Dec 2008 01:27:51 +0000
parents 431c59a6959d
children 0829a08038c6
line wrap: on
line diff
--- a/libpurple/mediamanager.c	Tue Dec 16 00:53:59 2008 +0000
+++ b/libpurple/mediamanager.c	Tue Dec 16 01:27:51 2008 +0000
@@ -102,8 +102,9 @@
 		G_TYPE_FROM_CLASS (klass),
 		G_SIGNAL_RUN_LAST,
 		0, NULL, NULL,
-		purple_smarshal_BOOLEAN__OBJECT,
-		G_TYPE_BOOLEAN, 1, PURPLE_TYPE_MEDIA);
+		purple_smarshal_BOOLEAN__OBJECT_POINTER_STRING,
+		G_TYPE_BOOLEAN, 3, PURPLE_TYPE_MEDIA,
+		G_TYPE_POINTER, G_TYPE_STRING);
 	g_type_class_add_private(klass, sizeof(PurpleMediaManagerPrivate));
 }
 
@@ -156,7 +157,6 @@
 
 	media = PURPLE_MEDIA(g_object_new(purple_media_get_type(),
 			     "screenname", remote_user,
-			     "connection", gc, 
 			     "farsight-conference", conference,
 			     NULL));
 
@@ -172,7 +172,7 @@
 	}
 
 	g_signal_emit(manager, purple_media_manager_signals[INIT_MEDIA], 0,
-			media, &signal_ret);
+			media, gc, remote_user, &signal_ret);
 
 	if (signal_ret == FALSE) {
 		g_object_unref(media);