rpms/evolution/F-8 .cvsignore, 1.79, 1.80 evolution-2.8.1-kill-ethread.patch, 1.15, 1.16 evolution.spec, 1.302, 1.303 sources, 1.79, 1.80

[Milan Crha (mcrha)]

Author: mcrha

Update of /cvs/pkgs/rpms/evolution/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16039

Modified Files:
	.cvsignore evolution-2.8.1-kill-ethread.patch evolution.spec 
	sources 
Log Message:
* Tue Nov 27 2007 Milan Crha <mcrha at redhat.com> - 2.12.2-1.fc8
- Update to 2.12.2




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-8/.cvsignore,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- .cvsignore	15 Oct 2007 18:26:48 -0000	1.79
+++ .cvsignore	27 Nov 2007 12:18:33 -0000	1.80
@@ -1 +1 @@
-evolution-2.12.1.tar.bz2
+evolution-2.12.2.tar.bz2

evolution-2.8.1-kill-ethread.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.15 -r 1.16 evolution-2.8.1-kill-ethread.patch
Index: evolution-2.8.1-kill-ethread.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-8/evolution-2.8.1-kill-ethread.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- evolution-2.8.1-kill-ethread.patch	15 Oct 2007 18:26:48 -0000	1.15
+++ evolution-2.8.1-kill-ethread.patch	27 Nov 2007 12:18:33 -0000	1.16
@@ -1,6 +1,6 @@
---- evolution-2.11.92/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread	2007-09-02 14:56:38.000000000 -0400
-+++ evolution-2.11.92/plugins/folder-unsubscribe/folder-unsubscribe.c	2007-09-04 00:19:08.000000000 -0400
-@@ -44,32 +44,30 @@
+--- evolution-2.12.2/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread	2007-10-12 08:55:23.000000000 +0200
++++ evolution-2.12.2/plugins/folder-unsubscribe/folder-unsubscribe.c	2007-11-27 12:06:04.000000000 +0100
+@@ -44,32 +44,30 @@ void org_gnome_mail_folder_unsubscribe (
  
  
  struct _folder_unsub_t {
@@ -41,7 +41,7 @@
  	if (((CamelService *) store)->provider->url_flags & CAMEL_URL_FRAGMENT_IS_PATH)
  		path = url->fragment;
  	else if (url->path && url->path[0])
-@@ -82,18 +80,17 @@
+@@ -82,18 +80,17 @@ folder_unsubscribe__unsub (struct _mail_
  }
  
  static void
@@ -68,7 +68,7 @@
  };
  
  
-@@ -105,8 +102,8 @@
+@@ -105,8 +102,8 @@ org_gnome_mail_folder_unsubscribe (EPlug
  	if (target->uri == NULL)
  		return;
  	
@@ -79,9 +79,9 @@
 -	e_thread_put (mail_thread_new, (EMsg *) unsub);
 +	mail_msg_unordered_push (unsub);
  }
---- evolution-2.11.92/plugins/mark-all-read/mark-all-read.c.kill-ethread	2007-09-02 14:56:39.000000000 -0400
-+++ evolution-2.11.92/plugins/mark-all-read/mark-all-read.c	2007-09-04 00:19:08.000000000 -0400
-@@ -44,7 +44,7 @@
+--- evolution-2.12.2/plugins/mark-all-read/mark-all-read.c.kill-ethread	2007-10-12 08:55:30.000000000 +0200
++++ evolution-2.12.2/plugins/mark-all-read/mark-all-read.c	2007-11-27 12:06:04.000000000 +0100
+@@ -44,7 +44,7 @@ org_gnome_mark_all_read (EPlugin *ep, EM
  		return;
  	}
  	
@@ -90,18 +90,18 @@
  }
  
  static void
---- evolution-2.11.92/plugins/save-attachments/save-attachments.c.kill-ethread	2007-09-02 14:56:45.000000000 -0400
-+++ evolution-2.11.92/plugins/save-attachments/save-attachments.c	2007-09-04 00:19:08.000000000 -0400
-@@ -403,5 +403,5 @@
+--- evolution-2.12.2/plugins/save-attachments/save-attachments.c.kill-ethread	2007-10-12 08:55:35.000000000 +0200
++++ evolution-2.12.2/plugins/save-attachments/save-attachments.c	2007-11-27 12:06:04.000000000 +0100
+@@ -403,5 +403,5 @@ org_gnome_save_attachments_save(EPlugin 
  	camel_object_ref(data->folder);
  	data->uid = g_strdup(target->uids->pdata[0]);
  
 -	mail_get_message(data->folder, data->uid, save_got_message, data, mail_thread_new);
 +	mail_get_message(data->folder, data->uid, save_got_message, data, mail_msg_unordered_push);
  }
---- evolution-2.11.92/plugins/groupwise-features/share-folder-common.c.kill-ethread	2007-09-02 14:56:38.000000000 -0400
-+++ evolution-2.11.92/plugins/groupwise-features/share-folder-common.c	2007-09-04 00:19:08.000000000 -0400
-@@ -121,7 +121,7 @@
+--- evolution-2.12.2/plugins/groupwise-features/share-folder-common.c.kill-ethread	2007-10-12 08:55:25.000000000 +0200
++++ evolution-2.12.2/plugins/groupwise-features/share-folder-common.c	2007-11-27 12:06:04.000000000 +0100
+@@ -121,7 +121,7 @@ shared_folder_abort (EPlugin *ep, EConfi
  }
  
  struct _EMCreateFolder {
@@ -110,7 +110,7 @@
  	
  	/* input data */
  	CamelStore *store;
-@@ -137,31 +137,26 @@
+@@ -137,31 +137,26 @@ struct _EMCreateFolder {
  	void *user_data;
  };
  	
@@ -148,7 +148,7 @@
  	struct ShareInfo *ssi = (struct ShareInfo *) m->user_data;
  	CamelStore *store = CAMEL_STORE (m->store) ;
  	EGwConnection *ccnc;
-@@ -180,10 +175,8 @@
+@@ -180,10 +175,8 @@ create_folder__created (struct _mail_msg
  }
  	
  static void
@@ -160,7 +160,7 @@
  	camel_store_free_folder_info (m->store, m->fi);
  	camel_object_unref (m->store);
  	g_free (m->full_name);
-@@ -191,11 +184,12 @@
+@@ -191,11 +184,12 @@ create_folder__free (struct _mail_msg *m
  	g_free (m->name);
  }
  
@@ -178,7 +178,7 @@
  };
  
  static void
-@@ -229,7 +223,7 @@
+@@ -229,7 +223,7 @@ create_folder (CamelStore *store, const 
  		parent = namebuf;
  	}
  	
@@ -187,7 +187,7 @@
  	camel_object_ref (store);
  	m->store = store;
  	m->full_name = g_strdup (full_name);
-@@ -238,8 +232,8 @@
+@@ -238,8 +232,8 @@ create_folder (CamelStore *store, const 
  	m->user_data = (struct ShareInfo *) user_data;
  	m->done = done;
  	g_free (namebuf);
@@ -198,9 +198,9 @@
  		
  	return id;
  }
---- evolution-2.11.92/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread	2007-07-05 02:09:24.000000000 -0400
-+++ evolution-2.11.92/plugins/mailing-list-actions/mailing-list-actions.c	2007-09-04 00:19:08.000000000 -0400
-@@ -89,7 +89,7 @@
+--- evolution-2.12.2/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread	2007-10-12 08:55:34.000000000 +0200
++++ evolution-2.12.2/plugins/mailing-list-actions/mailing-list-actions.c	2007-11-27 12:06:04.000000000 +0100
+@@ -89,7 +89,7 @@ void emla_list_action (EPlugin *item, EM
  	data->uri = strdup (sel->uri);
  
  	mail_get_message (sel->folder, (const char*) g_ptr_array_index (sel->uids, 0),
@@ -209,9 +209,9 @@
  }
  	
  void emla_list_action_do (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data)
---- evolution-2.11.92/plugins/exchange-operations/exchange-folder.c.kill-ethread	2007-09-02 14:56:39.000000000 -0400
-+++ evolution-2.11.92/plugins/exchange-operations/exchange-folder.c	2007-09-04 00:19:08.000000000 -0400
-@@ -140,7 +140,7 @@
+--- evolution-2.12.2/plugins/exchange-operations/exchange-folder.c.kill-ethread	2007-10-12 08:55:27.000000000 +0200
++++ evolution-2.12.2/plugins/exchange-operations/exchange-folder.c	2007-11-27 12:06:04.000000000 +0100
+@@ -140,7 +140,7 @@ org_gnome_exchange_folder_inbox_unsubscr
  	inbox_physical_uri = e_folder_get_physical_uri (inbox);
  
  	/* To get the CamelStore/Folder */
@@ -220,9 +220,9 @@
  
  
  }
---- evolution-2.11.92/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread	2007-09-02 14:57:09.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/alarm-notify/alarm-notify.c	2007-09-04 00:19:08.000000000 -0400
-@@ -45,10 +45,6 @@
+--- evolution-2.12.2/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread	2007-10-12 09:04:07.000000000 +0200
++++ evolution-2.12.2/calendar/gui/alarm-notify/alarm-notify.c	2007-11-27 12:06:04.000000000 +0100
+@@ -45,10 +45,6 @@ struct _AlarmNotifyPrivate {
          GMutex *mutex;
  };
  
@@ -233,7 +233,7 @@
  #define d(x) x
  
  
-@@ -286,72 +282,12 @@
+@@ -286,72 +282,12 @@ alarm_notify_finalize (GObject *object)
  	g_mutex_free (priv->mutex);
  	g_free (priv);
  
@@ -306,7 +306,7 @@
  /**
   * alarm_notify_new:
   * 
-@@ -363,23 +299,10 @@
+@@ -363,23 +299,10 @@ alarm_msg_received(EThread *e, EMsg *msg
  AlarmNotify *
  alarm_notify_new (void)
  {
@@ -334,9 +334,9 @@
  }
  
  static void
---- evolution-2.11.92/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread	2007-09-02 14:57:09.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/alarm-notify/alarm-notify.h	2007-09-04 00:19:08.000000000 -0400
-@@ -39,19 +39,6 @@
+--- evolution-2.12.2/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread	2007-10-12 09:04:07.000000000 +0200
++++ evolution-2.12.2/calendar/gui/alarm-notify/alarm-notify.h	2007-11-27 12:06:04.000000000 +0100
+@@ -39,19 +39,6 @@ typedef struct _AlarmNotifyClass AlarmNo
  
  typedef struct _AlarmNotifyPrivate AlarmNotifyPrivate;
  
@@ -356,9 +356,9 @@
  struct _AlarmNotify {
  	BonoboObject object;
  
---- evolution-2.11.92/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread	2007-09-02 14:57:09.000000000 -0400
-+++ evolution-2.11.92/calendar/gui/alarm-notify/alarm-queue.c	2007-09-04 00:19:08.000000000 -0400
-@@ -97,9 +97,6 @@
+--- evolution-2.12.2/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread	2007-10-12 09:04:07.000000000 +0200
++++ evolution-2.12.2/calendar/gui/alarm-notify/alarm-queue.c	2007-11-27 12:06:04.000000000 +0100
+@@ -97,9 +97,6 @@ static int tray_blink_id = -1;
  static int tray_blink_state = FALSE;
[...2647 lines suppressed...]
-+
+ 
+-	g_io_channel_unref(mail_gui_channel);
+-	g_io_channel_unref(mail_gui_reply_channel);
 +void
 +mail_msg_unordered_push (gpointer msg)
 +{
 +	static GOnce once = G_ONCE_INIT;
- 
--	g_io_channel_unref(mail_gui_channel);
--	g_io_channel_unref(mail_gui_reply_channel);
++
 +	g_once (&once, (GThreadFunc) create_thread_pool, GINT_TO_POINTER (10));
  
 -	e_msgport_destroy(mail_gui_port);
@@ -6849,11 +6849,11 @@
 -	e_thread_set_reply_port(mail_thread_new, mail_gui_reply_port);
 -	e_thread_set_queue_limit(mail_thread_new, 10);
 +	static GOnce once = G_ONCE_INIT;
-+
-+	g_once (&once, (GThreadFunc) create_thread_pool, GINT_TO_POINTER (1));
  
 -	mail_msg_active_table = g_hash_table_new(NULL, NULL);
 -	mail_gui_thread = pthread_self();
++	g_once (&once, (GThreadFunc) create_thread_pool, GINT_TO_POINTER (1));
++
 +	g_thread_pool_push ((GThreadPool *) once.retval, msg, NULL);
 +}
  
@@ -6865,7 +6865,7 @@
  }
  
  /* ********************************************************************** */
-@@ -665,7 +642,8 @@
+@@ -665,7 +642,8 @@ static pthread_mutex_t status_lock = PTH
  /* ********************************************************************** */
  
  struct _proxy_msg {
@@ -6875,7 +6875,7 @@
  	MailAsyncEvent *ea;
  	mail_async_event_t type;
  
-@@ -679,10 +657,8 @@
+@@ -679,10 +657,8 @@ struct _proxy_msg {
  };
  
  static void
@@ -6887,7 +6887,7 @@
  	m->thread = pthread_self();
  	m->have_thread = TRUE;
  	m->func(m->o, m->event_data, m->data);
-@@ -697,16 +673,17 @@
+@@ -697,16 +673,17 @@ static int
  idle_async_event(void *mm)
  {
  	do_async_event(mm);
@@ -6911,7 +6911,7 @@
  };
  
  MailAsyncEvent *mail_async_event_new(void)
-@@ -723,10 +700,9 @@
+@@ -723,10 +700,9 @@ int mail_async_event_emit(MailAsyncEvent
  {
  	struct _proxy_msg *m;
  	int id;
@@ -6923,7 +6923,7 @@
  	m->func = func;
  	m->o = o;
  	m->event_data = event_data;
-@@ -735,7 +711,7 @@
+@@ -735,7 +711,7 @@ int mail_async_event_emit(MailAsyncEvent
  	m->type = type;
  	m->have_thread = FALSE;
  	
@@ -6932,7 +6932,7 @@
  	g_mutex_lock(ea->lock);
  	ea->tasks = g_slist_prepend(ea->tasks, m);
  	g_mutex_unlock(ea->lock);
-@@ -743,12 +719,12 @@
+@@ -743,12 +719,12 @@ int mail_async_event_emit(MailAsyncEvent
  	/* We use an idle function instead of our own message port only because the
  	   gui message ports's notification buffer might overflow and deadlock us */
  	if (type == MAIL_ASYNC_GUI) {
@@ -6948,7 +6948,7 @@
  
  	return id;
  }
-@@ -762,7 +738,7 @@
+@@ -762,7 +738,7 @@ int mail_async_event_destroy(MailAsyncEv
  	g_mutex_lock(ea->lock);
  	while (ea->tasks) {
  		m = ea->tasks->data;
@@ -6957,7 +6957,7 @@
  		if (m->have_thread && pthread_equal(m->thread, thread)) {
  			g_warning("Destroying async event from inside an event, returning EDEADLK");
  			g_mutex_unlock(ea->lock);
-@@ -784,17 +760,18 @@
+@@ -784,17 +760,18 @@ int mail_async_event_destroy(MailAsyncEv
  /* ********************************************************************** */
  
  struct _call_msg {
@@ -6979,7 +6979,7 @@
  	void *p1, *p2, *p3, *p4, *p5;
  	int i1;
  	va_list ap;
-@@ -842,45 +819,47 @@
+@@ -842,45 +819,47 @@ do_call(struct _mail_msg *mm)
  		m->ret = m->func(p1, p2, i1, p3, p4, p5);
  		break;
  	}
@@ -7046,7 +7046,7 @@
  	
  	return ret;
  }
-@@ -889,40 +868,42 @@
+@@ -889,40 +868,42 @@ void *mail_call_main(mail_call_t type, M
  /* locked via status_lock */
  static int busy_state;
  
@@ -7101,7 +7101,7 @@
  	}
  	MAIL_MT_UNLOCK(status_lock);
  }
-@@ -930,7 +911,7 @@
+@@ -930,7 +911,7 @@ void mail_disable_stop(void)
  /* ******************************************************************************** */
  
  struct _op_status_msg {
@@ -7110,7 +7110,7 @@
  
  	struct _CamelOperation *op;
  	char *what;
-@@ -938,16 +919,16 @@
+@@ -938,16 +919,16 @@ struct _op_status_msg {
  	void *data;
  };
  
@@ -7132,7 +7132,7 @@
  	
  	MAIL_MT_LOCK (mail_msg_lock);
  	
-@@ -986,8 +967,8 @@
+@@ -986,8 +967,8 @@ static void do_op_status(struct _mail_ms
  				progress_icon = e_icon_factory_get_icon ("stock_mail-unread", E_ICON_SIZE_MENU);
  			
  			MAIL_MT_UNLOCK (mail_msg_lock);
@@ -7140,23 +7140,25 @@
 -				what = msg->ops->describe_msg (msg, FALSE);
 +			if (msg->info->desc)
 +				what = msg->info->desc (msg);
+ 			else if (m->what)
+ 				what = g_strdup (m->what);
  			/* uncommenting because message is not very useful for a user, see bug 271734*/
- 			else {
- 				what = g_strdup("");
-@@ -1001,11 +982,7 @@
- 			MAIL_MT_LOCK (mail_msg_lock);
- 			if (data->activity_state == 3) {
+@@ -1004,13 +985,7 @@ static void do_op_status(struct _mail_ms
+ 				int activity_id = data->activity_id;
+ 
  				MAIL_MT_UNLOCK (mail_msg_lock);
--				if (msg->cancel)
+-				if (msg->cancel) {
+-					camel_operation_mute (msg->cancel);
 -					camel_operation_unref (msg->cancel);
+-				}
 -				camel_exception_clear (&msg->ex);
 -				g_free (msg->priv);
 -				g_free (msg);
 +				mail_msg_free (msg);
- 			} else {
- 				data->activity_state = 2;
- 				MAIL_MT_UNLOCK (mail_msg_lock);
-@@ -1021,18 +998,17 @@
+ 				
+ 				if (activity_id != 0)
+ 					mail_async_event_emit (mail_async_event, MAIL_ASYNC_GUI, (MailAsyncFunc) end_event_callback,
+@@ -1030,18 +1005,17 @@ static void do_op_status(struct _mail_ms
  }
  
  static void
@@ -7182,7 +7184,7 @@
  };
  
  static void
-@@ -1042,7 +1018,7 @@
+@@ -1051,7 +1025,7 @@ mail_operation_status (struct _CamelOper
  	
  	d(printf("got operation statys: %s %d%%\n", what, pc));
  
@@ -7191,7 +7193,7 @@
  	m->op = op;
  	m->what = g_strdup(what);
  	switch (pc) {
-@@ -1055,7 +1031,7 @@
+@@ -1064,7 +1038,7 @@ mail_operation_status (struct _CamelOper
  	}
  	m->pc = pc;
  	m->data = data;


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-8/evolution.spec,v
retrieving revision 1.302
retrieving revision 1.303
diff -u -r1.302 -r1.303
--- evolution.spec	16 Nov 2007 18:36:19 -0000	1.302
+++ evolution.spec	27 Nov 2007 12:18:33 -0000	1.303
@@ -45,8 +45,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.12.1
-Release: 4%{?dist}
+Version: 2.12.2
+Release: 1%{?dist}
 License: GPLv2 and GFDL+
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -723,6 +723,9 @@
 %dir %{_datadir}/omf/evolution
 
 %changelog
+* Tue Nov 27 2007 Milan Crha <mcrha at redhat.com> - 2.12.2-1.fc8
+- Update to 2.12.2
+
 * Fri Nov 16 2007 Milan Crha <mcrha at redhat.com> - 2.12.1-4.fc8
 - Add patch for GNOME bug #454465 (fix Save button in task dialog)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-8/sources,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- sources	15 Oct 2007 18:26:48 -0000	1.79
+++ sources	27 Nov 2007 12:18:33 -0000	1.80
@@ -1 +1 @@
-392623efa9b79ede17ce90512f2c3c0a  evolution-2.12.1.tar.bz2
+085d4c3a4360ca8024e6c00a25dc38cf  evolution-2.12.2.tar.bz2