pidgin.vv: 5d196493: Remove unneeded pidgin_media_get_display...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 5d196493caa916646453553a2491661e9caa182b
Ancestor: 337d72150b074af2403e7a2bd84b3e501de96e50
Author: maiku at soc.pidgin.im
Date: 2009-01-14T09:32:48
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/5d196493caa916646453553a2491661e9caa182b

Modified files:
        pidgin/gtkconv.c pidgin/gtkmedia.c pidgin/gtkmedia.h

ChangeLog: 

Remove unneeded pidgin_media_get_display_widget function.

-------------- next part --------------
============================================================
--- pidgin/gtkconv.c	41c7c90564312e3f7d85b06deb238c1dfb7ee1e7
+++ pidgin/gtkconv.c	5c151dae40ff47e875742381aeea81736470bd0a
@@ -7836,10 +7836,6 @@ pidgin_conv_new_media_cb(PurpleMediaMana
 	g_signal_connect(G_OBJECT(gtkmedia), "destroy", G_CALLBACK(
 			pidgin_conv_gtkmedia_destroyed), gtkconv);
 
-	gtk_box_pack_start(GTK_BOX(gtkmedia),
-			pidgin_media_get_display_widget(gtkmedia),
-			TRUE, TRUE, PIDGIN_HIG_BOX_SPACE);
-
 	pidgin_conv_update_buttons_by_protocol(conv);
 	return TRUE;
 }
============================================================
--- pidgin/gtkmedia.c	c6160446549a609cc01d85c835d4516add6bc79a
+++ pidgin/gtkmedia.c	cdc30ea6b47a669926a415a619e1705339a5189f
@@ -205,6 +205,8 @@ pidgin_media_init (PidginMedia *media)
 	gtk_widget_show_all(media->priv->reject);
 
 	media->priv->display = gtk_vbox_new(TRUE, PIDGIN_HIG_BOX_SPACE);
+	gtk_box_pack_start(GTK_BOX(media), media->priv->display,
+			TRUE, TRUE, PIDGIN_HIG_BOX_SPACE);
 }
 
 static gboolean
@@ -304,7 +306,7 @@ pidgin_media_finalize(GObject *media)
 static void
 pidgin_media_finalize(GObject *media)
 {
-	PidginMedia *gtkmedia = PIDGIN_MEDIA(media);
+	/* PidginMedia *gtkmedia = PIDGIN_MEDIA(media); */
 	purple_debug_info("gtkmedia", "pidgin_media_finalize\n");
 
 	G_OBJECT_CLASS(parent_class)->finalize(media);
@@ -316,12 +318,6 @@ pidgin_media_emit_message(PidginMedia *g
 	g_signal_emit(gtkmedia, pidgin_media_signals[MESSAGE], 0, msg);
 }
 
-GtkWidget *
-pidgin_media_get_display_widget(GtkWidget *gtkmedia)
-{
-	return PIDGIN_MEDIA_GET_PRIVATE(gtkmedia)->display;
-}
-
 static gboolean
 create_window (GstBus *bus, GstMessage *message, PidginMedia *gtkmedia)
 {
============================================================
--- pidgin/gtkmedia.h	2857089ab28c0737d1e4abf550249aec84c00cec
+++ pidgin/gtkmedia.h	2a37e04664bdb5a4dadc026f2d95b6a8aecc4db9
@@ -60,7 +60,6 @@ GtkWidget *pidgin_media_new(PurpleMedia 
 GType pidgin_media_get_type(void);
 
 GtkWidget *pidgin_media_new(PurpleMedia *media, const gchar *screenname);
-GtkWidget *pidgin_media_get_display_widget(GtkWidget *gtkmedia);
 
 G_END_DECLS