maiku.vv: 72eee5a8: Gracefully handle missing the fsrtpconfe...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 72eee5a8eb953a0288ff1c62f9d44f2110e0d227
Ancestor: b96d49fd610064cdc611a4e70497057429e44181
Author: maiku at soc.pidgin.im
Date: 2008-08-31T21:20:05
Branch: im.pidgin.maiku.vv
URL: http://d.pidgin.im/viewmtn/revision/info/72eee5a8eb953a0288ff1c62f9d44f2110e0d227

Modified files:
        libpurple/mediamanager.c

ChangeLog: 

Gracefully handle missing the fsrtpconference GStreamer plugin.

-------------- next part --------------
============================================================
--- libpurple/mediamanager.c	4d2863d6b937f313ed5d61674ffd09303cbc68de
+++ libpurple/mediamanager.c	96dc0d6b82d566b9efe7818a915f5babd0a24fff
@@ -27,6 +27,7 @@
 #include "internal.h"
 
 #include "connection.h"
+#include "debug.h"
 #include "marshallers.h"
 #include "mediamanager.h"
 #include "media.h"
@@ -145,6 +146,14 @@ purple_media_manager_create_media(Purple
 	GstStateChangeReturn ret;
 	gboolean signal_ret;
 
+	if (conference == NULL) {
+		purple_conv_present_error(remote_user,
+					  purple_connection_get_account(gc),
+					  _("Error creating conference."));
+		purple_debug_error("media", "Conference == NULL\n");
+		return NULL;
+	}
+
 	media = PURPLE_MEDIA(g_object_new(purple_media_get_type(),
 			     "screenname", remote_user,
 			     "connection", gc, 
@@ -157,6 +166,7 @@ purple_media_manager_create_media(Purple
 		purple_conv_present_error(remote_user,
 					  purple_connection_get_account(gc),
 					  _("Error creating conference."));
+		purple_debug_error("media", "Failed to start conference.\n");
 		g_object_unref(media);
 		return NULL;
 	}