comparison pidgin/gtkconv.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 0ad1b8e950d7
children 0829a08038c6
comparison
equal deleted inserted replaced
26058:0ad1b8e950d7 26059:18b71033ea6e
7812 gtk_widget_destroyed(widget, &(gtkconv->gtkmedia)); 7812 gtk_widget_destroyed(widget, &(gtkconv->gtkmedia));
7813 gray_stuff_out(gtkconv); 7813 gray_stuff_out(gtkconv);
7814 } 7814 }
7815 7815
7816 static gboolean 7816 static gboolean
7817 pidgin_conv_new_media_cb(PurpleMediaManager *manager, PurpleMedia *media, gpointer nul) 7817 pidgin_conv_new_media_cb(PurpleMediaManager *manager, PurpleMedia *media,
7818 PurpleConnection *gc, gchar *screenname, gpointer nul)
7818 { 7819 {
7819 GtkWidget *gtkmedia; 7820 GtkWidget *gtkmedia;
7820 PurpleConversation *conv; 7821 PurpleConversation *conv;
7821 PidginConversation *gtkconv; 7822 PidginConversation *gtkconv;
7822 gchar *name = purple_media_get_screenname(media);
7823 7823
7824 conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, 7824 conv = purple_conversation_new(PURPLE_CONV_TYPE_IM,
7825 purple_connection_get_account( 7825 purple_connection_get_account(gc), screenname);
7826 purple_media_get_connection(media)), name);
7827 g_free(name);
7828 7826
7829 gtkconv = PIDGIN_CONVERSATION(conv); 7827 gtkconv = PIDGIN_CONVERSATION(conv);
7830 7828
7831 if (gtkconv->gtkmedia) { 7829 if (gtkconv->gtkmedia) {
7832 purple_debug_info("gtkconv", "Media session exists for this conversation.\n"); 7830 purple_debug_info("gtkconv", "Media session exists for this conversation.\n");