# HG changeset patch
# User Mike Ruprecht <maiku@soc.pidgin.im>
# Date 1219817853 0
# Node ID 441492fb6b61344a8cb109757024b49f44b7f5c4
# Parent  4b8c64deac5e846b99e252960aa5f7d0277b96f3
Fix up video preview error handling.

diff -r 4b8c64deac5e -r 441492fb6b61 pidgin/gtkprefs.c
--- a/pidgin/gtkprefs.c	Wed Aug 27 05:52:14 2008 +0000
+++ b/pidgin/gtkprefs.c	Wed Aug 27 06:17:33 2008 +0000
@@ -2069,7 +2069,7 @@
 
 	gst_element_set_state(pipeline, GST_STATE_NULL);
 	gst_object_unref(GST_PIPELINE(pipeline));
-	return TRUE;
+	return FALSE;
 }
 
 static void
@@ -2081,7 +2081,7 @@
 
 	/* create a preview window... */
 	GstElement *pipeline = NULL;
-	GError *p_err;
+	GError *p_err = NULL;
 
 	gchar *test_pipeline_str = NULL;
 
@@ -2098,6 +2098,13 @@
 
 	g_free(test_pipeline_str);
 
+	if (pipeline == NULL) {
+		purple_debug_error("gtkprefs",
+			"Error starting preview: %s\n", p_err->message);
+		g_error_free(p_err);
+		return;
+	}
+
 	bus = gst_pipeline_get_bus(GST_PIPELINE(pipeline));
 	gst_bus_add_watch(bus, preview_video_bus_call, pipeline);
 	gst_object_unref(bus);