evolution-rss r147 - in trunk: . src

[lucilanga svn gnome org]

Author: lucilanga
Date: Wed Feb  6 13:58:13 2008
New Revision: 147
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=147&view=rev

Log:
spec updates

Modified:
   trunk/TODO
   trunk/evolution-rss.spec.in
   trunk/src/network-soup.c
   trunk/src/rss.c

Modified: trunk/TODO
==============================================================================
--- trunk/TODO	(original)
+++ trunk/TODO	Wed Feb  6 13:58:13 2008
@@ -40,4 +40,5 @@
 	* when importing through dbus notify in status bar
 	* check mycall resize, verify data is valid widget -> generates crash
 	* check taskbar op when removing a feed
+	* crash (mail_append_message) if folder contains .lock file ? or ibex crashes
 	* check when adding feeds through dbus to pop for authentication if it's needed

Modified: trunk/evolution-rss.spec.in
==============================================================================
--- trunk/evolution-rss.spec.in	(original)
+++ trunk/evolution-rss.spec.in	Wed Feb  6 13:58:13 2008
@@ -13,7 +13,6 @@
 URL: http://mips.edu.ms/evo/index.php/Evolution_RSS_Reader_Plugin
 #Patch: evolution-rss-%{version}.patch
 Requires: evolution
-Requires: firefox-devel
 
 Requires(pre): GConf2
 Requires(post): GConf2
@@ -52,11 +51,12 @@
 	export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 	gconftool-2 --makefile-uninstall-rule \
 		%{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
+fi
 
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
-	%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null ||| :
+	%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
 /sbin/ldconfig
 
 %preun

Modified: trunk/src/network-soup.c
==============================================================================
--- trunk/src/network-soup.c	(original)
+++ trunk/src/network-soup.c	Wed Feb  6 13:58:13 2008
@@ -426,6 +426,7 @@
 	{
 		g_set_error(err, NET_ERROR, NET_ERROR_GENERIC,
 				soup_status_get_phrase(2));			//invalid url
+		g_print("status:%s\n", soup_status_get_phrase(2));		//invalid url
 		return -1;
 	}
 	g_hash_table_insert(rf->session, soup_sess, msg);

Modified: trunk/src/rss.c
==============================================================================
--- trunk/src/rss.c	(original)
+++ trunk/src/rss.c	Wed Feb  6 13:58:13 2008
@@ -2921,6 +2921,7 @@
 		g_print("data:%p\n", data);
 		g_print("is_widget:%d\n", GTK_IS_WIDGET(widget));
 		g_print("is_data:%p\n", data);
+		g_print("is_is_data:%d\n", GTK_IS_WIDGET(gtk_bin_get_child(data)));
 		g_print("is_is_data:%d\n", GTK_IS_WIDGET(data));
 //		if (GTK_IS_MOZ_EMBED(data))
 //		{
@@ -3152,6 +3153,7 @@
 		gtk_moz_embed_stop_load(GTK_MOZ_EMBED(rf->mozembed));
 //		gtk_moz_embed_pop_startup();
 #endif
+	g_signal_stop_emission_by_name(po->format->html, "size_allocate");
 	if (rf->mozembed)
 	{
 		g_print("call pfree() for controls2\n");
@@ -3235,6 +3237,7 @@
 		pobj = (struct _org_gnome_rss_controls_pobject *) em_format_html_add_pobject ((EMFormatHTML *) t->format, sizeof(*pobj), classid, message, (EMFormatHTMLPObjectFunc)org_gnome_rss_controls2);
 		pobj->website = g_strstrip(g_strdup((gchar *)website));
 		pobj->is_html = GPOINTER_TO_INT(is_html);
+		pobj->format = (EMFormatHTML *)t->format;
 		pobj->object.free = pfree;
         	camel_stream_printf (t->stream, "<table><tr><td width=100%% valign=top><object classid=%s></object></td></tr></table>\n", classid);
 		goto out;
@@ -3630,6 +3633,7 @@
               rf->progress_bar = NULL;
         }
 #else
+		g_print("shtatus:%d\n", msg->status_code);
 	if(rf->label && rf->feed_queue == 0 && rf->info)
 	{
                         gtk_label_set_markup (GTK_LABEL (rf->label), _("Canceled"));
@@ -3637,7 +3641,7 @@
                         gtk_widget_set_sensitive(rf->info->cancel_button, FALSE);
 
                 g_hash_table_remove(rf->info->data->active, rf->info->uri);
-                rf->info->data->infos = g_list_remove(rf->info->data->infos, rf->info);
+//                rf->info->data->infos = g_list_remove(rf->info->data->infos, rf->info);
 
                 if (g_hash_table_size(rf->info->data->active) == 0) {
                         if (rf->info->data->gd)
@@ -3723,6 +3727,7 @@
 		if (!user_data || !lookup_key(user_data))
 			goto out;
 		r->uri =  g_hash_table_lookup(rf->hr, lookup_key(user_data));
+	
         	chn_name = display_doc (r);
 
 		if (chn_name)
@@ -4525,6 +4530,7 @@
 	CamelMimeMessage *new = camel_mime_message_new();
 	CamelInternetAddress *addr;
 	CamelMessageInfo *info;
+	CamelException *ex;
 	struct tm tm;
 	time_t time;
 	CamelDataWrapper *rtext;
@@ -4612,7 +4618,9 @@
         else
 		camel_medium_set_content_object(CAMEL_MEDIUM(new), CAMEL_DATA_WRAPPER(rtext));
 
-	camel_folder_append_message(mail_folder, new, info, NULL, NULL);
+	g_print("date:%s\n", CF->date);
+	camel_folder_append_message(mail_folder, new, info, NULL, ex);
+	g_print("date:%s\n", CF->date);
 	camel_folder_sync(mail_folder, FALSE, NULL);
         camel_folder_thaw(mail_folder);
         camel_operation_end(NULL);