pidgin.vv: a54c98ef: Make the sinks better default sizes and ...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: a54c98efd24c75ad9c5d515f23bfbb6f1782a388
Ancestor: 9f5fc8e9e2a37e98d2ee9cda84783f664fb34040
Author: maiku at soc.pidgin.im
Date: 2009-02-02T10:51:10
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/a54c98efd24c75ad9c5d515f23bfbb6f1782a388

Modified files:
        pidgin/gtkmedia.c

ChangeLog: 

Make the sinks better default sizes and display them immediately.

-------------- next part --------------
============================================================
--- pidgin/gtkmedia.c	3cb419ccde59e2a1d5af963c00f104d0ade10517
+++ pidgin/gtkmedia.c	8155fd0d6e2fdddbdd9167b3b90ff667981c8ce9
@@ -251,7 +251,7 @@ pidgin_media_init (PidginMedia *media)
 	gtk_widget_show_all(media->priv->accept);
 	gtk_widget_show_all(media->priv->reject);
 
-	media->priv->display = gtk_vbox_new(TRUE, PIDGIN_HIG_BOX_SPACE);
+	media->priv->display = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
 	gtk_box_pack_start(GTK_BOX(vbox), media->priv->display,
 			TRUE, TRUE, PIDGIN_HIG_BOX_SPACE);
 	gtk_widget_show(vbox);
@@ -495,7 +495,7 @@ pidgin_media_ready_cb(PurpleMedia *media
 		g_signal_connect(G_OBJECT(remote_video), "realize",
 				G_CALLBACK(realize_cb), data);
 		gtk_container_add(GTK_CONTAINER(plug), remote_video);
-		gtk_widget_set_size_request (GTK_WIDGET(remote_video), -1, 100);
+		gtk_widget_set_size_request (GTK_WIDGET(remote_video), 320, 240);
 		gtk_widget_show(remote_video);
 		gtk_widget_show(aspect);
 
@@ -536,7 +536,7 @@ pidgin_media_ready_cb(PurpleMedia *media
 		g_signal_connect(G_OBJECT(local_video), "realize",
 				G_CALLBACK(realize_cb), data);
 		gtk_container_add(GTK_CONTAINER(plug), local_video);
-		gtk_widget_set_size_request (GTK_WIDGET(local_video), -1, 100);
+		gtk_widget_set_size_request (GTK_WIDGET(local_video), 160, 120);
 
 		gtk_widget_show(local_video);
 		gtk_widget_show(aspect);
@@ -591,6 +591,8 @@ pidgin_media_ready_cb(PurpleMedia *media
 		pidgin_media_emit_message(gtkmedia, message);
 		g_free(message);
 	}
+
+	gtk_widget_show(gtkmedia->priv->display);
 }
 
 static void
@@ -613,15 +615,6 @@ pidgin_media_state_changed_cb(PurpleMedi
 	} else if (type == PURPLE_MEDIA_STATE_CHANGED_NEW &&
 			sid != NULL && name != NULL) {
 		pidgin_media_ready_cb(media, gtkmedia, sid);
-	} else if (type == PURPLE_MEDIA_STATE_CHANGED_CONNECTED) {
-		GstElement *audiosendbin = NULL, *audiorecvbin = NULL;
-		GstElement *videosendbin = NULL, *videorecvbin = NULL;
-
-		purple_media_get_elements(media, &audiosendbin, &audiorecvbin,
-					  &videosendbin, &videorecvbin);
-
-		if (audiorecvbin || audiosendbin || videorecvbin || videosendbin)
-			gtk_widget_show(gtkmedia->priv->display);
 	}
 }