# HG changeset patch
# User Mike Ruprecht <maiku@soc.pidgin.im>
# Date 1238983660 0
# Node ID 2a34a32047ba8f702912739fa3bec49c3d671a8a
# Parent  30c870ee4ec942f372c059a395fd71b4933bbfbf# Parent  7f92904b00d9ab8c6f516d542c3e18624caefab4
merge of '0f3cc5eaf6cb9aff180d63efb1dee828936078d1'
     and 'f917b4632a54553364f64ef2a02dfc4a6e015ea7'

diff -r 7f92904b00d9 -r 2a34a32047ba pidgin/gtkmedia.c
--- a/pidgin/gtkmedia.c	Sun Apr 05 23:20:42 2009 +0000
+++ b/pidgin/gtkmedia.c	Mon Apr 06 02:07:40 2009 +0000
@@ -495,25 +495,6 @@
 	gtk_widget_show(GTK_WIDGET(gtkmedia));
 }
 
-static gboolean
-plug_delete_event_cb(GtkWidget *widget, gpointer data)
-{
-	return TRUE;
-}
-
-static gboolean
-plug_removed_cb(GtkWidget *widget, gpointer data)
-{
-	return TRUE;
-}
-
-static void
-socket_realize_cb(GtkWidget *widget, gpointer data)
-{
-	gtk_socket_add_id(GTK_SOCKET(widget),
-			gtk_plug_get_id(GTK_PLUG(data)));
-}
-
 static void
 pidgin_media_accept_cb(PurpleMedia *media, int index)
 {
@@ -619,27 +600,12 @@
 		PidginMediaRealizeData *data;
 		GtkWidget *aspect;
 		GtkWidget *remote_video;
-		GtkWidget *plug;
-		GtkWidget *socket;
 		GdkColor color = {0, 0, 0, 0};
 
 		aspect = gtk_aspect_frame_new(NULL, 0.5, 0.5, 4.0/3.0, FALSE);
 		gtk_frame_set_shadow_type(GTK_FRAME(aspect), GTK_SHADOW_IN);
 		gtk_box_pack_start(GTK_BOX(recv_widget), aspect, TRUE, TRUE, 0);
 
-		plug = gtk_plug_new(0);
-		g_signal_connect(G_OBJECT(plug), "delete-event",
-				G_CALLBACK(plug_delete_event_cb), plug);
-		gtk_widget_show(plug);
-
-		socket = gtk_socket_new();
-		g_signal_connect(G_OBJECT(socket), "realize",
-				G_CALLBACK(socket_realize_cb), plug);
-		g_signal_connect(G_OBJECT(socket), "plug-removed",
-				G_CALLBACK(plug_removed_cb), NULL);
-		gtk_container_add(GTK_CONTAINER(aspect), socket);
-		gtk_widget_show(socket);
-
 		data = g_new0(PidginMediaRealizeData, 1);
 		data->gtkmedia = gtkmedia;
 		data->session_id = g_strdup(sid);
@@ -649,7 +615,7 @@
 		gtk_widget_modify_bg(remote_video, GTK_STATE_NORMAL, &color);
 		g_signal_connect(G_OBJECT(remote_video), "realize",
 				G_CALLBACK(realize_cb), data);
-		gtk_container_add(GTK_CONTAINER(plug), remote_video);
+		gtk_container_add(GTK_CONTAINER(aspect), remote_video);
 		gtk_widget_set_size_request (GTK_WIDGET(remote_video), 320, 240);
 		gtk_widget_show(remote_video);
 		gtk_widget_show(aspect);
@@ -660,27 +626,12 @@
 		PidginMediaRealizeData *data;
 		GtkWidget *aspect;
 		GtkWidget *local_video;
-		GtkWidget *plug;
-		GtkWidget *socket;
 		GdkColor color = {0, 0, 0, 0};
 
 		aspect = gtk_aspect_frame_new(NULL, 0.5, 0.5, 4.0/3.0, FALSE);
 		gtk_frame_set_shadow_type(GTK_FRAME(aspect), GTK_SHADOW_IN);
 		gtk_box_pack_start(GTK_BOX(send_widget), aspect, TRUE, TRUE, 0);
 
-		plug = gtk_plug_new(0);
-		g_signal_connect(G_OBJECT(plug), "delete-event",
-				G_CALLBACK(plug_delete_event_cb), plug);
-		gtk_widget_show(plug);
-
-		socket = gtk_socket_new();
-		g_signal_connect(G_OBJECT(socket), "realize",
-				G_CALLBACK(socket_realize_cb), plug);
-		g_signal_connect(G_OBJECT(socket), "plug-removed",
-				G_CALLBACK(plug_removed_cb), NULL);
-		gtk_container_add(GTK_CONTAINER(aspect), socket);
-		gtk_widget_show(socket);
-
 		data = g_new0(PidginMediaRealizeData, 1);
 		data->gtkmedia = gtkmedia;
 		data->session_id = g_strdup(sid);
@@ -690,7 +641,7 @@
 		gtk_widget_modify_bg(local_video, GTK_STATE_NORMAL, &color);
 		g_signal_connect(G_OBJECT(local_video), "realize",
 				G_CALLBACK(realize_cb), data);
-		gtk_container_add(GTK_CONTAINER(plug), local_video);
+		gtk_container_add(GTK_CONTAINER(aspect), local_video);
 		gtk_widget_set_size_request (GTK_WIDGET(local_video), 160, 120);
 
 		gtk_widget_show(local_video);