adium 3054:b2062c21f7b5: Move gst and new gtype init to before l...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/b2062c21f7b5
revision:	3054:b2062c21f7b5
author:		Zachary West <zacw at adium.im>
date:		Fri Dec 11 00:07:44 2009 -0500

Move gst and new gtype init to before libpurple init. Still infinite looping.

diffs (62 lines):

diff -r 5fc8fb730536 -r b2062c21f7b5 Plugins/Purple Service/SLPurpleCocoaAdapter.m
--- a/Plugins/Purple Service/SLPurpleCocoaAdapter.m	Thu Dec 10 23:53:44 2009 -0500
+++ b/Plugins/Purple Service/SLPurpleCocoaAdapter.m	Fri Dec 11 00:07:44 2009 -0500
@@ -163,6 +163,21 @@
 
 - (void)initLibPurple
 {
+	// Init the glib type system (used by GObjects)
+	g_type_init();
+	
+	// Don't fork!
+	gst_registry_fork_set_enabled (FALSE);
+	
+	GError *error = NULL;
+	if (gst_init_check(NULL, NULL, &error)) {
+		NSLog(@"Failed to init GStreamer: %s", error ? error->message : "no error message.");
+		if (error) {
+			g_error_free(error);
+			error = NULL;
+		}
+	}
+	
 	//Set the gaim user directory to be within this user's directory
 	if (![[NSUserDefaults standardUserDefaults] boolForKey:@"Adium 1.0.3 moved to libpurple"]) {
 		//Remove old icons cache
diff -r 5fc8fb730536 -r b2062c21f7b5 Plugins/Purple Service/adiumPurpleCore.m
--- a/Plugins/Purple Service/adiumPurpleCore.m	Thu Dec 10 23:53:44 2009 -0500
+++ b/Plugins/Purple Service/adiumPurpleCore.m	Fri Dec 11 00:07:44 2009 -0500
@@ -155,7 +155,7 @@
 
 /* The core is ready... finish configuring libpurple and its plugins */
 static void adiumPurpleCoreUiInit(void)
-{		
+{
 	bindtextdomain("pidgin", [[[NSBundle bundleWithIdentifier:@"im.pidgin.libpurple"] resourcePath] fileSystemRepresentation]);
 	bind_textdomain_codeset("pidgin", "UTF-8");
 	textdomain("pidgin");
diff -r 5fc8fb730536 -r b2062c21f7b5 Plugins/Purple Service/adiumPurpleMedia.m
--- a/Plugins/Purple Service/adiumPurpleMedia.m	Thu Dec 10 23:53:44 2009 -0500
+++ b/Plugins/Purple Service/adiumPurpleMedia.m	Fri Dec 11 00:07:44 2009 -0500
@@ -251,20 +251,7 @@
 	
 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,