evolution-rss r166 - in trunk: . src

[lucilanga svn gnome org]

Author: lucilanga
Date: Mon Feb 25 20:08:09 2008
New Revision: 166
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=166&view=rev

Log:
prevent currently readed article to be deleted

Modified:
   trunk/ChangeLog
   trunk/src/rss.c
   trunk/src/rss.h

Modified: trunk/src/rss.c
==============================================================================
--- trunk/src/rss.c	(original)
+++ trunk/src/rss.c	Mon Feb 25 20:08:09 2008
@@ -835,7 +835,7 @@
 	g_free(real_name);
 }
 
-void
+/*void
 get_selected_mail(void)
 {
 	MailComponent *mail_component = mail_component_peek();
@@ -849,7 +849,7 @@
 	uids = message_list_get_selected(emfv->list);
 	g_print("%d", uids->len);
 	
-}
+}*/
 
 static void
 enable_html_cb(GtkCellRendererToggle *cell,
@@ -1991,11 +1991,13 @@
 	return;
 }
 
-void org_gnome_cooly_article_show(void *ep, EMPopupTargetSelect *t);
+void org_gnome_cooly_article_show(void *ep, EMEventTargetMessage *t);
 
-void org_gnome_cooly_article_show(void *ep, EMPopupTargetSelect *t)
+void org_gnome_cooly_article_show(void *ep, EMEventTargetMessage *t)
 {
-	g_print("(l)user is reading mail\n");
+	if (rf)
+		rf->current_uid = t->uid;
+	g_print("uid:%s\n", t->uid);
 }
 
 gboolean
@@ -2380,7 +2382,6 @@
 	if (!deleted)
 		if (g_hash_table_lookup(rf->hrdel_feed, lookup_key(user_data)))
 			get_feed_age(user_data, lookup_key(user_data));
-//	get_selected_mail();
 //tout:	
 
 #ifdef EVOLUTION_2_12
@@ -4068,7 +4069,7 @@
        	for (i = 0; i < uids->len; i++)
 	{
 		info = camel_folder_get_message_info(folder, uids->pdata[i]);
-               	if (info) {
+               	if (info && rf->current_uid != uids->pdata[i]) {
 			date = camel_message_info_date_sent(info);
 			flags = camel_message_info_flags(info);
        			if (flags & CAMEL_MESSAGE_SEEN)
@@ -4147,7 +4148,7 @@
         	for (i = 0; i < uids->len; i++)
 		{
 			info = camel_folder_get_message_info(folder, uids->pdata[i]);
-                	if (info) {
+                	if (info && rf->current_uid != uids->pdata[i]) {
 				date = camel_message_info_date_sent(info);
 				if (date < now - del_days * 86400)
 				{

Modified: trunk/src/rss.h
==============================================================================
--- trunk/src/rss.h	(original)
+++ trunk/src/rss.h	Mon Feb 25 20:08:09 2008
@@ -102,6 +102,7 @@
 	GHashTable	*activity;
 	GHashTable	*error_hash;
 	guint		test;
+	char 		*current_uid;		// currently read article	
 #if HAVE_DBUS
 	DBusConnection	*bus;			// DBUS
 #endif