[Gaim-commits] SF.net SVN: gaim: [16943] trunk/gtk

[<the...@us...>]

Revision: 16943
Author:   thekingant
Date:     2006-08-20 22:07:42 -0700 (Sun, 20 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16943&view=rev

Log Message:
-----------
Get rid of this thread stuff.  You can read the whole saga at
http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=201791

Basically we were working around some complicated library
interactions between d-bus and newer, threaded versions of
gnome-vfs.  But the d-bus guys were awesome enough to make
our working around unnecessary

I'm seeing the following error printed to the console when
I click on on the Send To menu in conversation windows, but
I get this error with or without these threading changes.
I'm not sure what's up with that.  I should point out that
our dnsquery.c stuff is calling g_thread_init() for both
Unix and Windows now (it didn't used to do that on Unix)

The error is:
GLib-GObject: gsignal.c:1713: handler `982' of instance `0xc6d960' is not blocked

Modified Paths:
--------------
    trunk/gtk/gtkmain.c
    trunk/libgaim/dbus-server.c
Modified: trunk/gtk/gtkmain.c
===================================================================
--- trunk/gtk/gtkmain.c	2006-08-21 04:54:11 UTC (rev 16942)
+++ trunk/gtk/gtkmain.c	2006-08-21 05:07:42 UTC (rev 16943)
@@ -640,18 +640,6 @@
 	gtk_rc_add_default_file(search_path);
 	g_free(search_path);
 
-#if (defined(G_THREADS_ENABLED) && !defined(G_THREADS_IMPL_NONE))
-	/* Since threads can be yanked in all unawares by other libraries,
-	 * and some libraries aren't smart enough to initialize the thread
-	 * subsystem when they need it, we need to do this here.  We also
-	 * threadify dbus when that gets initialized.  Ugh. */
-	if (!g_thread_supported())
-		g_thread_init(NULL);
-#ifndef _WIN32
-	gdk_threads_init();
-#endif
-#endif /* Glib has threads */
-
 	gui_check = gtk_init_check(&argc, &argv);
 	if (!gui_check) {
 		char *display = gdk_get_display();

Modified: trunk/libgaim/dbus-server.c
===================================================================
--- trunk/libgaim/dbus-server.c	2006-08-21 04:54:11 UTC (rev 16942)
+++ trunk/libgaim/dbus-server.c	2006-08-21 05:07:42 UTC (rev 16943)
@@ -757,9 +757,6 @@
 void
 gaim_dbus_init(void)
 {
-	if (g_thread_supported())
-		dbus_g_thread_init();
-
 	gaim_dbus_init_ids();
 
 	g_free(init_error);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.