pidgin/gtkconv.c

changeset 33077
32318963e724
parent 33076
b0f6d6dadb10
child 33082
cd284b4ca152
equal deleted inserted replaced
33076:b0f6d6dadb10 33077:32318963e724
1215 PurpleConversation *conv = pidgin_conv_window_get_active_conversation(win); 1215 PurpleConversation *conv = pidgin_conv_window_get_active_conversation(win);
1216 PurpleAccount *account = purple_conversation_get_account(conv); 1216 PurpleAccount *account = purple_conversation_get_account(conv);
1217 1217
1218 purple_prpl_initiate_media(account, 1218 purple_prpl_initiate_media(account,
1219 purple_conversation_get_name(conv), 1219 purple_conversation_get_name(conv),
1220 action == win->audio_call ? PURPLE_MEDIA_AUDIO : 1220 action == win->menu.audio_call ? PURPLE_MEDIA_AUDIO :
1221 action == win->video_call ? PURPLE_MEDIA_VIDEO : 1221 action == win->menu.video_call ? PURPLE_MEDIA_VIDEO :
1222 action == win->audio_video_call ? PURPLE_MEDIA_AUDIO | 1222 action == win->menu.audio_video_call ? PURPLE_MEDIA_AUDIO |
1223 PURPLE_MEDIA_VIDEO : PURPLE_MEDIA_NONE); 1223 PURPLE_MEDIA_VIDEO : PURPLE_MEDIA_NONE);
1224 } 1224 }
1225 #endif 1225 #endif
1226 1226
1227 static void 1227 static void
3360 == PURPLE_CONV_TYPE_IM) { 3360 == PURPLE_CONV_TYPE_IM) {
3361 PurpleMediaCaps caps = 3361 PurpleMediaCaps caps =
3362 purple_prpl_get_media_caps(account, 3362 purple_prpl_get_media_caps(account,
3363 purple_conversation_get_name(conv)); 3363 purple_conversation_get_name(conv));
3364 3364
3365 gtk_action_set_sensitive(win->audio_call, 3365 gtk_action_set_sensitive(win->menu.audio_call,
3366 caps & PURPLE_MEDIA_CAPS_AUDIO 3366 caps & PURPLE_MEDIA_CAPS_AUDIO
3367 ? TRUE : FALSE); 3367 ? TRUE : FALSE);
3368 gtk_action_set_sensitive(win->video_call, 3368 gtk_action_set_sensitive(win->menu.video_call,
3369 caps & PURPLE_MEDIA_CAPS_VIDEO 3369 caps & PURPLE_MEDIA_CAPS_VIDEO
3370 ? TRUE : FALSE); 3370 ? TRUE : FALSE);
3371 gtk_action_set_sensitive(win->audio_video_call, 3371 gtk_action_set_sensitive(win->menu.audio_video_call,
3372 caps & PURPLE_MEDIA_CAPS_AUDIO_VIDEO 3372 caps & PURPLE_MEDIA_CAPS_AUDIO_VIDEO
3373 ? TRUE : FALSE); 3373 ? TRUE : FALSE);
3374 } else if (purple_conversation_get_type(conv) 3374 } else if (purple_conversation_get_type(conv)
3375 == PURPLE_CONV_TYPE_CHAT) { 3375 == PURPLE_CONV_TYPE_CHAT) {
3376 /* for now, don't care about chats... */ 3376 /* for now, don't care about chats... */
3377 gtk_action_set_sensitive(win->audio_call, FALSE); 3377 gtk_action_set_sensitive(win->menu.audio_call, FALSE);
3378 gtk_action_set_sensitive(win->video_call, FALSE); 3378 gtk_action_set_sensitive(win->menu.video_call, FALSE);
3379 gtk_action_set_sensitive(win->audio_video_call, FALSE); 3379 gtk_action_set_sensitive(win->menu.audio_video_call, FALSE);
3380 } else { 3380 } else {
3381 gtk_action_set_sensitive(win->audio_call, FALSE); 3381 gtk_action_set_sensitive(win->menu.audio_call, FALSE);
3382 gtk_action_set_sensitive(win->video_call, FALSE); 3382 gtk_action_set_sensitive(win->menu.video_call, FALSE);
3383 gtk_action_set_sensitive(win->audio_video_call, FALSE); 3383 gtk_action_set_sensitive(win->menu.audio_video_call, FALSE);
3384 } 3384 }
3385 #endif 3385 #endif
3386 } 3386 }
3387 3387
3388 static void 3388 static void
3606 win->menu.view_log = 3606 win->menu.view_log =
3607 gtk_ui_manager_get_action(win->menu.ui, 3607 gtk_ui_manager_get_action(win->menu.ui,
3608 "/Conversation/ConversationMenu/ViewLog"); 3608 "/Conversation/ConversationMenu/ViewLog");
3609 3609
3610 #ifdef USE_VV 3610 #ifdef USE_VV
3611 win->audio_call = 3611 win->menu.audio_call =
3612 gtk_ui_manager_get_action(win->menu.ui, 3612 gtk_ui_manager_get_action(win->menu.ui,
3613 "/Conversation/ConversationMenu/MediaMenu/AudioCall"); 3613 "/Conversation/ConversationMenu/MediaMenu/AudioCall");
3614 win->video_call = 3614 win->menu.video_call =
3615 gtk_ui_manager_get_action(win->menu.ui, 3615 gtk_ui_manager_get_action(win->menu.ui,
3616 "/Conversation/ConversationMenu/MediaMenu/VideoCall"); 3616 "/Conversation/ConversationMenu/MediaMenu/VideoCall");
3617 win->audio_video_call = 3617 win->menu.audio_video_call =
3618 gtk_ui_manager_get_action(win->menu.ui, 3618 gtk_ui_manager_get_action(win->menu.ui,
3619 "/Conversation/ConversationMenu/MediaMenu/AudioVideoCall"); 3619 "/Conversation/ConversationMenu/MediaMenu/AudioVideoCall");
3620 #endif 3620 #endif
3621 3621
3622 /* --- */ 3622 /* --- */

mercurial