Mercurial > pidgin.yaz
comparison libpurple/mediamanager.c @ 26059:18b71033ea6e
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 |
comparison
equal
deleted
inserted
replaced
26058:0ad1b8e950d7 | 26059:18b71033ea6e |
---|---|
100 | 100 |
101 purple_media_manager_signals[INIT_MEDIA] = g_signal_new ("init-media", | 101 purple_media_manager_signals[INIT_MEDIA] = g_signal_new ("init-media", |
102 G_TYPE_FROM_CLASS (klass), | 102 G_TYPE_FROM_CLASS (klass), |
103 G_SIGNAL_RUN_LAST, | 103 G_SIGNAL_RUN_LAST, |
104 0, NULL, NULL, | 104 0, NULL, NULL, |
105 purple_smarshal_BOOLEAN__OBJECT, | 105 purple_smarshal_BOOLEAN__OBJECT_POINTER_STRING, |
106 G_TYPE_BOOLEAN, 1, PURPLE_TYPE_MEDIA); | 106 G_TYPE_BOOLEAN, 3, PURPLE_TYPE_MEDIA, |
107 G_TYPE_POINTER, G_TYPE_STRING); | |
107 g_type_class_add_private(klass, sizeof(PurpleMediaManagerPrivate)); | 108 g_type_class_add_private(klass, sizeof(PurpleMediaManagerPrivate)); |
108 } | 109 } |
109 | 110 |
110 static void | 111 static void |
111 purple_media_manager_init (PurpleMediaManager *media) | 112 purple_media_manager_init (PurpleMediaManager *media) |
154 return NULL; | 155 return NULL; |
155 } | 156 } |
156 | 157 |
157 media = PURPLE_MEDIA(g_object_new(purple_media_get_type(), | 158 media = PURPLE_MEDIA(g_object_new(purple_media_get_type(), |
158 "screenname", remote_user, | 159 "screenname", remote_user, |
159 "connection", gc, | |
160 "farsight-conference", conference, | 160 "farsight-conference", conference, |
161 NULL)); | 161 NULL)); |
162 | 162 |
163 ret = gst_element_set_state(purple_media_get_pipeline(media), GST_STATE_PLAYING); | 163 ret = gst_element_set_state(purple_media_get_pipeline(media), GST_STATE_PLAYING); |
164 | 164 |
170 g_object_unref(media); | 170 g_object_unref(media); |
171 return NULL; | 171 return NULL; |
172 } | 172 } |
173 | 173 |
174 g_signal_emit(manager, purple_media_manager_signals[INIT_MEDIA], 0, | 174 g_signal_emit(manager, purple_media_manager_signals[INIT_MEDIA], 0, |
175 media, &signal_ret); | 175 media, gc, remote_user, &signal_ret); |
176 | 176 |
177 if (signal_ret == FALSE) { | 177 if (signal_ret == FALSE) { |
178 g_object_unref(media); | 178 g_object_unref(media); |
179 return NULL; | 179 return NULL; |
180 } | 180 } |