Mercurial > pidgin.yaz
comparison pidgin/gtkconv.c @ 26122:5d9a97a23d6e
Remove some of the deprecated API.
author | Mike Ruprecht <maiku@soc.pidgin.im> |
---|---|
date | Tue, 13 Jan 2009 13:43:13 +0000 |
parents | ba22c9420221 |
children | 525aa65805b9 |
comparison
equal
deleted
inserted
replaced
26121:4ae228cf119f | 26122:5d9a97a23d6e |
---|---|
7763 { | 7763 { |
7764 PidginWindow *win = (PidginWindow *)data; | 7764 PidginWindow *win = (PidginWindow *)data; |
7765 PurpleConversation *conv = pidgin_conv_window_get_active_conversation(win); | 7765 PurpleConversation *conv = pidgin_conv_window_get_active_conversation(win); |
7766 PurpleAccount *account = purple_conversation_get_account(conv); | 7766 PurpleAccount *account = purple_conversation_get_account(conv); |
7767 | 7767 |
7768 PurpleMedia *media = | 7768 purple_prpl_initiate_media(account, |
7769 purple_prpl_initiate_media(account, | 7769 purple_conversation_get_name(conv), |
7770 purple_conversation_get_name(conv), | 7770 PURPLE_MEDIA_AUDIO); |
7771 PURPLE_MEDIA_AUDIO); | |
7772 | |
7773 if (media) | |
7774 purple_media_wait(media); | |
7775 } | 7771 } |
7776 | 7772 |
7777 static void | 7773 static void |
7778 menu_initiate_video_call_cb(gpointer data, guint action, GtkWidget *widget) | 7774 menu_initiate_video_call_cb(gpointer data, guint action, GtkWidget *widget) |
7779 { | 7775 { |
7780 PidginWindow *win = (PidginWindow *)data; | 7776 PidginWindow *win = (PidginWindow *)data; |
7781 PurpleConversation *conv = pidgin_conv_window_get_active_conversation(win); | 7777 PurpleConversation *conv = pidgin_conv_window_get_active_conversation(win); |
7782 PurpleAccount *account = purple_conversation_get_account(conv); | 7778 PurpleAccount *account = purple_conversation_get_account(conv); |
7783 | 7779 |
7784 PurpleMedia *media = | 7780 purple_prpl_initiate_media(account, |
7785 purple_prpl_initiate_media(account, | 7781 purple_conversation_get_name(conv), |
7786 purple_conversation_get_name(conv), | 7782 PURPLE_MEDIA_VIDEO); |
7787 PURPLE_MEDIA_VIDEO); | |
7788 | |
7789 if (media) | |
7790 purple_media_wait(media); | |
7791 } | 7783 } |
7792 | 7784 |
7793 static void | 7785 static void |
7794 menu_initiate_audio_video_call_cb(gpointer data, guint action, GtkWidget *widget) | 7786 menu_initiate_audio_video_call_cb(gpointer data, guint action, GtkWidget *widget) |
7795 { | 7787 { |
7796 PidginWindow *win = (PidginWindow *)data; | 7788 PidginWindow *win = (PidginWindow *)data; |
7797 PurpleConversation *conv = pidgin_conv_window_get_active_conversation(win); | 7789 PurpleConversation *conv = pidgin_conv_window_get_active_conversation(win); |
7798 PurpleAccount *account = purple_conversation_get_account(conv); | 7790 PurpleAccount *account = purple_conversation_get_account(conv); |
7799 | 7791 |
7800 PurpleMedia *media = | 7792 purple_prpl_initiate_media(account, |
7801 purple_prpl_initiate_media(account, | 7793 purple_conversation_get_name(conv), |
7802 purple_conversation_get_name(conv), | 7794 PURPLE_MEDIA_AUDIO | PURPLE_MEDIA_VIDEO); |
7803 PURPLE_MEDIA_AUDIO | PURPLE_MEDIA_VIDEO); | |
7804 | |
7805 if (media) | |
7806 purple_media_wait(media); | |
7807 } | 7795 } |
7808 | 7796 |
7809 static void | 7797 static void |
7810 pidgin_conv_gtkmedia_destroyed(GtkWidget *widget, PidginConversation *gtkconv) | 7798 pidgin_conv_gtkmedia_destroyed(GtkWidget *widget, PidginConversation *gtkconv) |
7811 { | 7799 { |