rpms/logjam/devel logjam-4.5.3-disable-threads.patch, 1.1, 1.2 logjam.spec, 1.43, 1.44

[Tom Callaway (spot)]

Author: spot

Update of /cvs/extras/rpms/logjam/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14956

Modified Files:
	logjam-4.5.3-disable-threads.patch logjam.spec 
Log Message:
re-enable threading only where we need it

logjam-4.5.3-disable-threads.patch:

Index: logjam-4.5.3-disable-threads.patch
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/logjam-4.5.3-disable-threads.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- logjam-4.5.3-disable-threads.patch	11 Mar 2008 20:00:04 -0000	1.1
+++ logjam-4.5.3-disable-threads.patch	18 Mar 2008 20:44:36 -0000	1.2
@@ -17,3 +17,31 @@
  
  	g_type_init();
  
+diff -up logjam-4.5.3/src/history.c.BAD logjam-4.5.3/src/history.c
+--- logjam-4.5.3/src/history.c.BAD	2008-03-18 16:02:18.000000000 -0400
++++ logjam-4.5.3/src/history.c	2008-03-18 16:02:36.000000000 -0400
+@@ -368,9 +368,13 @@ hc_show_current(history_calendar_dlg *hc
+ 
+ static gint
+ hc_list_click_idle_cb(gpointer d) {
++#if defined (G_OS_WIN32)
+ 	gdk_threads_enter();
++#endif
+ 	hc_show_current(d);
++#if defined (G_OS_WIN32)
+ 	gdk_threads_leave();
++#endif
+ 	return FALSE;
+ }
+ 	
+diff -up logjam-4.5.3/src/network-fork.c.hack logjam-4.5.3/src/network-fork.c
+--- logjam-4.5.3/src/network-fork.c.hack	2008-03-18 16:31:40.000000000 -0400
++++ logjam-4.5.3/src/network-fork.c	2008-03-18 16:32:06.000000000 -0400
+@@ -171,6 +171,7 @@ net_post_mainloop(const char *url, GSLis
+ 		GString *response;
+ 		GError *err = NULL;
+ 
++        	if (!g_thread_supported ()) g_thread_init (NULL);
+ 		response = net_post_blocking(url, headers, post, fork_cb, &forkdata, &err);
+ 		if (response == NULL) {
+ 			int len = strlen(err->message);


Index: logjam.spec
===================================================================
RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- logjam.spec	18 Mar 2008 19:44:57 -0000	1.43
+++ logjam.spec	18 Mar 2008 20:44:36 -0000	1.44
@@ -2,7 +2,7 @@
 
 Name:		logjam
 Version:	4.5.3
-Release:	20%{?dist}
+Release:	22%{?dist}
 Epoch:		1
 Summary:	GTK2 client for LiveJournal
 License:	GPLv2+
@@ -29,6 +29,7 @@
 Patch9:		http://people.freebsd.org/~novel/patches/non-freebsd/logjam_docklet_context_menu.diff
 Patch10:	logjam-4.5.3-rhythmbox-fix.patch
 Patch11:	logjam-libsoup24.diff
+Patch12:	logjam-4.5.3-disable-threads.patch
 Patch13:	logjam-title.patch
 Patch14:	logjam-4.5.3-tags.patch
 Patch15:	logjam-4.5.3-default-spelllang-en-US.patch
@@ -60,6 +61,7 @@
 %patch9 -p1 -b .docklet-context-menu
 %patch10 -p1 -b .rhythmboxfix
 %patch11 -p1 -b .libsoup
+%patch12 -p1 -b .disable-threads
 %patch13 -p1 -b .title
 %patch14 -p1 -b .tags
 %patch15 -p1 -b .default-spelllang-en-US
@@ -105,6 +107,12 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Mar 18 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-22
+- re-enable threading where we really need it only
+
+* Tue Mar 18 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-21
+- disable more threading
+
 * Tue Mar 18 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.5.3-20
 - revert disable-threading patch