evolution-rss r279 - in trunk: . src

[lucilanga svn gnome org]

Author: lucilanga
Date: Fri May 30 10:14:40 2008
New Revision: 279
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=279&view=rev

Log:
make cancel all work

Modified:
   trunk/ChangeLog
   trunk/TODO
   trunk/src/gecko-utils.cpp
   trunk/src/rss.c

Modified: trunk/TODO
==============================================================================
--- trunk/TODO	(original)
+++ trunk/TODO	Fri May 30 10:14:40 2008
@@ -29,7 +29,6 @@
 	* obey ttl entity
 	* make feed message forwardable/replayable
 	* check rename feed when evo 2.24 x86_64 
-	* make cancel all button work
 	* add debug points for showing steps of current operation (group operations)
 	* when adding a feed as opml file offer to import (file detection)
 	* possibly make network timeout customizable

Modified: trunk/src/gecko-utils.cpp
==============================================================================
--- trunk/src/gecko-utils.cpp	(original)
+++ trunk/src/gecko-utils.cpp	Fri May 30 10:14:40 2008
@@ -20,12 +20,21 @@
  *
  */
 
+#include "mozilla-config.h"
+#include "config.h"
+
 #include <stdlib.h>
 
 #include <nsStringAPI.h>
 
+#ifdef HAVE_GECKO_1_9
 #include <gtkmozembed.h>
 #include <gtkmozembed_internal.h>
+#else
+#include <gtkembedmoz/gtkmozembed.h>
+#include <gtkembedmoz/gtkmozembed_internal.h>
+#endif
+//#include <gtkmozembed.h>
 #include <nsCOMPtr.h>
 #include <nsIPrefService.h>
 #include <nsIServiceManager.h>

Modified: trunk/src/rss.c
==============================================================================
--- trunk/src/rss.c	(original)
+++ trunk/src/rss.c	Fri May 30 10:14:40 2008
@@ -1955,6 +1955,7 @@
        	camel_data_wrapper_construct_from_stream(dw, fstream);
        	camel_medium_set_content_object((CamelMedium *)part, dw);
 	em_format_format_text((EMFormat *)t->format, (CamelStream *)t->stream, (CamelDataWrapper *)part);
+//	gtk_html_select_all(t->format->message);
 	camel_object_unref(dw);
 	camel_object_unref(part);
 	camel_object_unref(fstream);
@@ -2918,6 +2919,13 @@
         set_send_status(info, what, pc);
 }
 
+static void
+dialog_response(GtkDialog *gd, int button, struct _send_data *data)
+{
+	g_print("ABORTING...\n");
+	abort_all_soup();
+}
+
 void
 #ifdef EVOLUTION_2_12
 org_gnome_cooly_rss(void *ep, EMEventTargetSendReceive *t);
@@ -2953,6 +2961,9 @@
 	struct _send_info *info;
 	struct _send_data *data = (struct _send_data *)t->data;
 
+
+	g_signal_connect(data->gd, "response", dialog_response, NULL);
+
         info = g_malloc0 (sizeof (*info));
 //        info->type = type;