adium 3046:611c703077f0: We need to init the glib thread system ...

commits at adium.im commits at adium.im
Thu Dec 10 16:59:06 UTC 2009


details:	http://hg.adium.im/adium/rev/611c703077f0
revision:	3046:611c703077f0
author:		Zachary West <zacw at adium.im>
date:		Thu Dec 10 11:57:50 2009 -0500

We need to init the glib thread system for gst.

diffs (51 lines):

diff -r 96c2441aa3a3 -r 611c703077f0 Plugins/Purple Service/adiumPurpleCore.m
--- a/Plugins/Purple Service/adiumPurpleCore.m	Thu Dec 10 11:49:08 2009 -0500
+++ b/Plugins/Purple Service/adiumPurpleCore.m	Thu Dec 10 11:57:50 2009 -0500
@@ -156,6 +156,8 @@
 /* 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 96c2441aa3a3 -r 611c703077f0 Plugins/Purple Service/adiumPurpleMedia.m
--- a/Plugins/Purple Service/adiumPurpleMedia.m	Thu Dec 10 11:49:08 2009 -0500
+++ b/Plugins/Purple Service/adiumPurpleMedia.m	Thu Dec 10 11:57:50 2009 -0500
@@ -94,7 +94,7 @@
 static void
 adium_media_state_changed_cb(PurpleMedia *media, PurpleMediaState state, gchar *sid, gchar *name, AIMedia *adiumMedia)
 {
-	AILog(@"state: %d sid: %s name: %s\n", state, sid ? sid : "(null)", name ? name : "(null)");
+	NSLog(@"state: %d sid: %s name: %s\n", state, sid ? sid : "(null)", name ? name : "(null)");
 	
 	adiumMedia.mediaState = state;
 	
@@ -110,6 +110,8 @@
 static void
 adium_media_stream_info_cb(PurpleMedia *media, PurpleMediaInfoType type, gchar *sid, gchar *name, gboolean local, AIMedia *adiumMedia)
 {
+	NSLog(@"Media stream info cb: %d", type);
+	
 	if (type == PURPLE_MEDIA_INFO_REJECT) {
 		adium_media_emit_message(adiumMedia, _("You have rejected the call."));
 	} else if (type == PURPLE_MEDIA_INFO_ACCEPT) {		
@@ -124,6 +126,8 @@
 adium_media_new_cb(PurpleMediaManager *manager, PurpleMedia *media,
 		PurpleAccount *account, gchar *screenname, gpointer nul)
 {
+	NSLog(@"Media new cb: %s", screenname);
+	
 	AIListContact *contact = contactLookupFromBuddy(purple_find_buddy(account, screenname));
 	AIAccount *adiumAccount = accountLookup(account);
 	
@@ -294,7 +298,7 @@
 			PURPLE_MEDIA_CAPS_VIDEO_SINGLE_DIRECTION |
 			PURPLE_MEDIA_CAPS_AUDIO_VIDEO);
 
-	AILog(@"Registering media element types");
+	NSLog(@"Registering media element types");
 	purple_media_manager_set_active_element(manager, default_video_src);
 	purple_media_manager_set_active_element(manager, default_video_sink);
 	purple_media_manager_set_active_element(manager, default_audio_src);




More information about the commits mailing list