Index: src/totem-mozilla-plugin.cpp
===================================================================
RCS file: /cvs/gnome/totem/src/totem-mozilla-plugin.cpp,v
retrieving revision 1.38
diff -u -r1.38 totem-mozilla-plugin.cpp
--- src/totem-mozilla-plugin.cpp	10 Jan 2006 19:46:16 -0000	1.38
+++ src/totem-mozilla-plugin.cpp	16 Jan 2006 21:43:24 -0000
@@ -26,6 +26,7 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <unistd.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <sys/wait.h>
 #include <string.h>
@@ -480,11 +481,26 @@
 	if (plugin->send_fd < 0)
 		return -1;
 
-//	g_message ("write %d %p %d", plugin->send_fd, buffer, len);
-	ret = write (plugin->send_fd, buffer, len);
-	if (ret < 0) {
-		g_message ("ret %d", ret);
-	}
+#ifdef TOTEM_DEBUG
+	g_message ("write %d %p %d", plugin->send_fd, buffer, len);
+#endif
+
+	do {
+	  ret = write (plugin->send_fd, buffer, len);
+	  if (ret < 0) {
+		if (errno == EINTR)
+		  continue;
+	       	if (errno == EAGAIN)
+		  return 0;
+	  }
+	  
+	  break;
+	} while (1);
+
+#ifdef TOTEM_DEBUG
+	if (ret < 0) 
+	  g_message ("ret %d errno %d", ret, errno);
+#endif
 
 	return ret;
 }
Index: src/totem-mozilla-viewer.c
===================================================================
RCS file: /cvs/gnome/totem/src/totem-mozilla-viewer.c,v
retrieving revision 1.28
diff -u -r1.28 totem-mozilla-viewer.c
--- src/totem-mozilla-viewer.c	28 Nov 2005 18:36:44 -0000	1.28
+++ src/totem-mozilla-viewer.c	16 Jan 2006 21:43:28 -0000
@@ -166,10 +166,11 @@
 		//disp = gnome_vfs_unescape_string_for_display (totem->mrl);
 		msg = g_strdup_printf(_("Totem could not play '%s'."), disp);
 		g_free (disp);
-		if (err != NULL)
+		if (err != NULL) {
 			g_message ("error: %s", err->message);
-		totem_interface_error_blocking (msg, err->message,
+			totem_interface_error_blocking (msg, err->message,
 				GTK_WINDOW (emb->window));
+		}
 
 		g_free (msg);
 
@@ -410,7 +411,8 @@
 			G_CALLBACK (on_tick), emb);
 
 	container = glade_xml_get_widget (emb->xml, "hbox4");
-	gtk_container_add (GTK_CONTAINER (container), GTK_WIDGET (emb->bvw));
+	gtk_box_pack_start (GTK_BOX (container), GTK_WIDGET (emb->bvw), TRUE,
+	    TRUE, 0);
 	gtk_widget_realize (GTK_WIDGET (emb->bvw));
 	gtk_widget_show (GTK_WIDGET (emb->bvw));