Mercurial > pidgin.yaz
diff pidgin/gtkconv.c @ 25709:eb8c8a926589
Convert serv_* media functions to purple_prpl_* functions.
| author | Mike Ruprecht <maiku@soc.pidgin.im> |
|---|---|
| date | Sat, 19 Jul 2008 03:10:00 +0000 |
| parents | 13936e4405b7 |
| children | aaf11cffe2b2 |
line wrap: on
line diff
--- a/pidgin/gtkconv.c Thu Jul 17 23:09:58 2008 +0000 +++ b/pidgin/gtkconv.c Sat Jul 19 03:10:00 2008 +0000 @@ -6380,13 +6380,17 @@ #ifdef USE_VV /* check if account support voice calls, and if the current buddy supports it */ - if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) { - gboolean audio = serv_can_do_media(gc, purple_conversation_get_name(conv), - PURPLE_MEDIA_AUDIO); - gboolean video = serv_can_do_media(gc, purple_conversation_get_name(conv), - PURPLE_MEDIA_VIDEO); - gboolean av = serv_can_do_media(gc, purple_conversation_get_name(conv), - PURPLE_MEDIA_AUDIO | PURPLE_MEDIA_VIDEO); + if (account != NULL && purple_conversation_get_type(conv) + == PURPLE_CONV_TYPE_IM) { + gboolean audio = purple_prpl_can_do_media(account, + purple_conversation_get_name(conv), + PURPLE_MEDIA_AUDIO); + gboolean video = purple_prpl_can_do_media(account, + purple_conversation_get_name(conv), + PURPLE_MEDIA_VIDEO); + gboolean av = purple_prpl_can_do_media(account, + purple_conversation_get_name(conv), + PURPLE_MEDIA_AUDIO | PURPLE_MEDIA_VIDEO); gtk_widget_set_sensitive(win->menu.audio_call, audio ? TRUE : FALSE); gtk_widget_set_sensitive(win->menu.video_call, video ? TRUE : FALSE); @@ -7684,12 +7688,12 @@ { PidginWindow *win = (PidginWindow *)data; PurpleConversation *conv = pidgin_conv_window_get_active_conversation(win); - PurpleConnection *gc = purple_conversation_get_gc(conv); + PurpleAccount *account = purple_conversation_get_account(conv); PurpleMedia *media = - serv_initiate_media(gc, - purple_conversation_get_name(conv), - PURPLE_MEDIA_AUDIO); + purple_prpl_initiate_media(account, + purple_conversation_get_name(conv), + PURPLE_MEDIA_AUDIO); if (media) purple_media_wait(media); @@ -7700,12 +7704,12 @@ { PidginWindow *win = (PidginWindow *)data; PurpleConversation *conv = pidgin_conv_window_get_active_conversation(win); - PurpleConnection *gc = purple_conversation_get_gc(conv); + PurpleAccount *account = purple_conversation_get_account(conv); PurpleMedia *media = - serv_initiate_media(gc, - purple_conversation_get_name(conv), - PURPLE_MEDIA_VIDEO); + purple_prpl_initiate_media(account, + purple_conversation_get_name(conv), + PURPLE_MEDIA_VIDEO); if (media) purple_media_wait(media); @@ -7716,12 +7720,12 @@ { PidginWindow *win = (PidginWindow *)data; PurpleConversation *conv = pidgin_conv_window_get_active_conversation(win); - PurpleConnection *gc = purple_conversation_get_gc(conv); + PurpleAccount *account = purple_conversation_get_account(conv); PurpleMedia *media = - serv_initiate_media(gc, - purple_conversation_get_name(conv), - PURPLE_MEDIA_AUDIO | PURPLE_MEDIA_VIDEO); + purple_prpl_initiate_media(account, + purple_conversation_get_name(conv), + PURPLE_MEDIA_AUDIO | PURPLE_MEDIA_VIDEO); if (media) purple_media_wait(media);