adium 3047:f944851ae93c: Initialize gst, this currently fails on...

commits at adium.im commits at adium.im
Thu Dec 10 17:57:15 UTC 2009


details:	http://hg.adium.im/adium/rev/f944851ae93c
revision:	3047:f944851ae93c
author:		Zachary West <zacw at adium.im>
date:		Thu Dec 10 12:57:12 2009 -0500

Initialize gst, this currently fails on linker errors when loading plugins.

diffs (35 lines):

diff -r 611c703077f0 -r f944851ae93c Plugins/Purple Service/adiumPurpleCore.m
--- a/Plugins/Purple Service/adiumPurpleCore.m	Thu Dec 10 11:57:50 2009 -0500
+++ b/Plugins/Purple Service/adiumPurpleCore.m	Thu Dec 10 12:57:12 2009 -0500
@@ -156,8 +156,6 @@
 /* The core is ready... finish configuring libpurple and its plugins */
 static void adiumPurpleCoreUiInit(void)
 {		
-	g_thread_init(NULL);
-	
 	bindtextdomain("pidgin", [[[NSBundle bundleWithIdentifier:@"im.pidgin.libpurple"] resourcePath] fileSystemRepresentation]);
 	bind_textdomain_codeset("pidgin", "UTF-8");
 	textdomain("pidgin");
diff -r 611c703077f0 -r f944851ae93c Plugins/Purple Service/adiumPurpleMedia.m
--- a/Plugins/Purple Service/adiumPurpleMedia.m	Thu Dec 10 11:57:50 2009 -0500
+++ b/Plugins/Purple Service/adiumPurpleMedia.m	Thu Dec 10 12:57:12 2009 -0500
@@ -252,6 +252,19 @@
 void
 adiumPurpleMedia_init(void)
 {
+	gst_registry_fork_set_enabled (FALSE);
+	
+	GError *error = NULL;
+	if (gst_init_check(NULL, NULL, &error)) {
+		purple_notify_error(NULL, _("GStreamer Failure"),
+							_("GStreamer failed to initialize."),
+							error ? error->message : "");
+		if (error) {
+			g_error_free(error);
+			error = NULL;
+		}
+	}
+	
 	PurpleMediaManager *manager = purple_media_manager_get();
 	PurpleMediaElementInfo *default_video_src =
 			g_object_new(PURPLE_TYPE_MEDIA_ELEMENT_INFO,




More information about the commits mailing list