Mercurial > pidgin.yaz
diff pidgin/gtkconv.c @ 25659:7d2e5f57dbca
propagate from branch 'im.pidgin.pidgin.vv' (head 9443004596a4fc55992da8548ef5b438de22c8ef)
to branch 'im.pidgin.soc.2008.vv' (head 99d72a9b9b6887865627081565f052f29516d19b)
| author | Mike Ruprecht <maiku@soc.pidgin.im> |
|---|---|
| date | Tue, 27 May 2008 16:30:26 +0000 |
| parents | ff29208e03ef 43b3b9ff6028 |
| children | 10f5a529d2a6 |
line wrap: on
line diff
--- a/pidgin/gtkconv.c Tue May 27 06:51:21 2008 +0000 +++ b/pidgin/gtkconv.c Tue May 27 16:30:26 2008 +0000 @@ -7652,7 +7652,8 @@ purple_conversation_get_name(conv), PURPLE_MEDIA_RECV_AUDIO & PURPLE_MEDIA_SEND_AUDIO); - purple_media_wait(media); + if (media) + purple_media_wait(media); } static void @@ -7789,9 +7790,10 @@ show_protocol_icons_pref_cb, NULL); purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/conversations/im/hide_new", hide_new_pref_cb, NULL); - +#ifdef USE_FARSIGHT g_signal_connect(G_OBJECT(purple_media_manager_get()), "init-media", G_CALLBACK(pidgin_conv_new_media_cb), NULL); +#endif /**********************************************************************