File evolution-rss-0.2.0-nocamelexception.patch of Package mingw32-evolution-rss

Overview Repositories Revisions Requests Users Attributes Meta

File evolution-rss-0.2.0-nocamelexception.patch of Package mingw32-evolution-rss (Revision 6093a4759f5c4de73cd14d0a2eed379b)

Currently displaying revision 6093a4759f5c4de73cd14d0a2eed379b , Show latest

--- src/rss-config-factory.c
+++ src/rss-config-factory.c
@@ -976,7 +976,7 @@ destroy_delete(GtkWidget *selector, gpointer user_data)
 //this function resembles emfu_delete_rec in mail/em-folder-utils.c
 //which is not exported ?
 static void
-rss_delete_rec (CamelStore *store, CamelFolderInfo *fi, CamelException *ex)
+rss_delete_rec (CamelStore *store, CamelFolderInfo *fi, GError **error)
 {
 	int i;
 	GPtrArray *uids;
@@ -986,7 +986,7 @@ rss_delete_rec (CamelStore *store, CamelFolderInfo *fi, CamelException *ex)
 
 		d("deleting folder '%s'\n", fi->full_name);
 
-		if (!(folder = camel_store_get_folder (store, fi->full_name, 0, ex)))
+		if (!(folder = camel_store_get_folder (store, fi->full_name, 0, error)))
 			return;
 
 			uids = camel_folder_get_uids (folder);
@@ -1004,8 +1004,8 @@ rss_delete_rec (CamelStore *store, CamelFolderInfo *fi, CamelException *ex)
 
 		d("do camel_store_delete_folder()\n");
 
-		camel_store_delete_folder (store, fi->full_name, ex);
-		if (camel_exception_is_set (ex))
+		camel_store_delete_folder (store, fi->full_name, error);
+		if (error != NULL)
 			return;
 
 		fi = fi->next;
@@ -1013,8 +1013,9 @@ rss_delete_rec (CamelStore *store, CamelFolderInfo *fi, CamelException *ex)
 }
 
 void
-rss_delete_folders (
-	CamelStore *store, const char *full_name, CamelException *ex)
+rss_delete_folders (CamelStore *store,
+		const char *full_name,
+		GError **error)
 {
 	guint32 flags = CAMEL_STORE_FOLDER_INFO_RECURSIVE
 		| CAMEL_STORE_FOLDER_INFO_FAST
@@ -1025,12 +1026,12 @@ rss_delete_folders (
 	fi = camel_store_get_folder_info (
 		store,
 		full_name,
-		flags, ex);
-	if (!fi || camel_exception_is_set (ex))
+		flags, error);
+	if (!fi || error != NULL)
 		return;
 
 	d("call rss_delete_rec()\n");
-	rss_delete_rec (store, fi, ex);
+	rss_delete_rec (store, fi, error);
 	camel_store_free_folder_info (store, fi);
 }
 
@@ -1407,7 +1408,7 @@ process_dialog_edit(add_feed *feed, gchar *url, gchar *feed_name)
 	gpointer key = lookup_key(feed_name);
 	gchar *prefix = NULL;
 	hrfeed *saved_feed;
-	CamelException ex;
+	GError *error = NULL;
 	CamelStore *store = rss_component_peek_local_store();
 	GtkWidget *msg_feeds, *progress;
 
@@ -1516,21 +1517,13 @@ process_dialog_edit(add_feed *feed, gchar *url, gchar *feed_name)
 				gchar *b = g_build_path(
 						G_DIR_SEPARATOR_S,
 						dir, feed->feed_name, NULL);
-				camel_exception_init (&ex);
-				camel_store_rename_folder (store, a, b, &ex);
-				if (camel_exception_is_set (&ex)) {
-#if EVOLUTION_VERSION < 22904
-					e_error_run(GTK_WINDOW(
-						rf->preferences),
-						"mail:no-rename-folder",
-						a, b, ex.desc, NULL);
-#else
+				camel_store_rename_folder (store, a, b, &error);
+				if (error != NULL) {
 					e_alert_run_dialog_for_args(
 						GTK_WINDOW(rf->preferences),
 						"mail:no-rename-folder",
-						a, b, ex.desc, NULL);
-#endif
-					camel_exception_clear (&ex);
+						a, b, error->message, NULL);
+					g_clear_error(&error);
 				}
 				g_free(dir);
 				g_free(b);
--- src/rss-config-factory.h
+++ src/rss-config-factory.h
@@ -33,7 +33,7 @@ void delete_feed_folder_alloc(gchar *old_name);
 void rss_delete_folders (
 	CamelStore *store,
 	const char *full_name,
-	CamelException *ex);
+	GError **error);
 
 void remove_feed_hash(gpointer name);
 void init_rss_prefs(void);
--- src/rss-image.c
+++ src/rss-image.c
@@ -84,7 +84,7 @@ update_feed_image(RDF *r)
 	if (!g_file_test(feed_file, G_FILE_TEST_EXISTS)) {
 	if (image) {		//we need to validate image here with load_pixbuf
 		CamelStream *feed_fs = camel_stream_fs_new_with_name(feed_file,
-			O_RDWR|O_CREAT, 0666);
+			O_RDWR|O_CREAT, 0666, NULL);
 		dup_auth_data(r->uri, image);
 		fi->feed_fs = feed_fs;
 		fi->key = g_strdup(key);
@@ -313,9 +313,10 @@ finish_image (SoupSession *soup_sess, SoupMessage *msg, CamelStream *user_data)
 		if (msg->response_body->data) {
 			camel_stream_write(user_data,
 				msg->response_body->data,
-				msg->response_body->length);
+				msg->response_body->length,
+				NULL);
 #endif
-			camel_stream_close(user_data);
+			camel_stream_close(user_data, NULL);
 #if (DATASERVER_VERSION >= 2031001)
 			g_object_unref(user_data);
 #else
@@ -323,8 +324,8 @@ finish_image (SoupSession *soup_sess, SoupMessage *msg, CamelStream *user_data)
 #endif
 		}
 	} else {
-		camel_stream_write(user_data, pixfilebuf, pixfilelen);
-		camel_stream_close(user_data);
+		camel_stream_write(user_data, pixfilebuf, pixfilelen, NULL);
+		camel_stream_close(user_data, NULL);
 #if (DATASERVER_VERSION >= 2031001)
 		g_object_unref(user_data);
 #else
@@ -340,10 +341,12 @@ finish_create_icon (SoupMessage *msg, FEED_IMAGE *user_data)
 finish_create_icon (SoupSession *soup_sess, SoupMessage *msg, FEED_IMAGE *user_data)
 #endif
 {
-	d("finish_image(): status:%d, user_data:%s\n", msg->status_code, user_data->img_file);
+	d("finish_image(): status:%d, user_data:%s\n",
+		msg->status_code, user_data->img_file);
 	if (404 != msg->status_code) {
-		CamelStream *feed_fs = camel_stream_fs_new_with_name(user_data->img_file,
-			O_RDWR|O_CREAT, 0666);
+		CamelStream *feed_fs = camel_stream_fs_new_with_name(
+					user_data->img_file,
+					O_RDWR|O_CREAT, 0666, NULL);
 		finish_image(soup_sess, msg, feed_fs);
 #if (EVOLUTION_VERSION >= 22703)
 		display_folder_icon(evolution_store, user_data->key);
@@ -470,6 +473,9 @@ decode_image_cache_filename(gchar *name)
 gboolean image_is_valid(gchar *image);
 
 gboolean
+file_is_image(gchar *image);
+
+gboolean
 file_is_image(gchar *image)
 {
 	gchar *mime_type, *contents;
--- src/rss.c
+++ src/rss.c
@@ -492,7 +492,7 @@ browser_stream_write(CamelStream *stream, gchar *base)
 	GString *str = g_string_new(NULL);
 	gchar *line;
 	CamelStream *in = camel_stream_buffer_new(stream, CAMEL_STREAM_BUFFER_READ);
-	while ((line = camel_stream_buffer_read_line((CamelStreamBuffer *)in))) {
+	while ((line = camel_stream_buffer_read_line((CamelStreamBuffer *)in, NULL))) {
 		gchar *tmp = line;
 		g_string_append(str, line);
 		g_free(tmp);
@@ -1101,7 +1101,7 @@ rss_browser_update_content (
 						d("cache read\n");
 						fi->create = 0;
 						browser_stream_write(stream, po->website);
-						camel_stream_close(stream);
+						camel_stream_close(stream, NULL);
 #if (DATASERVER_VERSION >= 2031001)
 						g_object_unref(stream);
 #else
@@ -1149,13 +1149,16 @@ webkit_set_preferences(void)
 	g_object_set (settings, "enable-page-cache", TRUE, NULL);
 	//g_object_set (settings, "auto-resize-window", TRUE, NULL);
 	g_object_set (settings, "enable-plugins",
-		gconf_client_get_bool(rss_gconf, GCONF_KEY_EMBED_PLUGIN, NULL),
+		gconf_client_get_bool(rss_gconf,
+			GCONF_KEY_EMBED_PLUGIN, NULL),
 		NULL);
 	g_object_set (settings, "enable-java-applet",
-		gconf_client_get_bool(rss_gconf, GCONF_KEY_HTML_JAVA, NULL),
+		gconf_client_get_bool(rss_gconf,
+			GCONF_KEY_HTML_JAVA, NULL),
 		NULL);
 	g_object_set (settings, "enable-scripts",
-		gconf_client_get_bool(rss_gconf, GCONF_KEY_HTML_JS, NULL),
+		gconf_client_get_bool(rss_gconf,
+			GCONF_KEY_HTML_JS, NULL),
 		NULL);
 #endif
 	webkit_web_view_set_full_content_zoom(
@@ -2288,7 +2292,8 @@ void org_gnome_cooly_format_rss(void *ep, EMFormatHookTarget *t)	//camelmimepart
 #endif
 		camel_data_wrapper_write_to_stream(
 			mcontent,
-			(CamelStream *)stream);
+			(CamelStream *)stream,
+			NULL);
 		g_byte_array_append (buffer, (unsigned char *)"", 1);
 //#ifdef EVOLUTION_2_12	//aparently this ("?" char parsing) is fixed in 2.12
 //		//then again this does not work in evo > 2.12 perhaps is gtkhtml related
@@ -2484,7 +2489,7 @@ render_body:	if (category)
 	}
 
 	//this is required for proper charset rendering when html
-	camel_data_wrapper_construct_from_stream(dw, fstream);
+	camel_data_wrapper_construct_from_stream(dw, fstream, NULL);
 #if EVOLUTION_VERSION >= 23100
 	camel_medium_set_content((CamelMedium *)part, dw);
 #else
@@ -3633,7 +3638,7 @@ finish_website (SoupSession *soup_sess, SoupMessage *msg, gpointer user_data)
 		g_free(tmsg);
 		if (ub->create) {
 			//stream remove
-			camel_stream_close(ub->stream);
+			camel_stream_close(ub->stream, NULL);
 #if (DATASERVER_VERSION >= 2031001)
 			g_object_unref(ub->stream);
 #else
@@ -3642,8 +3647,8 @@ finish_website (SoupSession *soup_sess, SoupMessage *msg, gpointer user_data)
 		}
 	} else {
 		if (ub->create) {
-			camel_stream_write(ub->stream, response->str, strlen(response->str));
-			camel_stream_close(ub->stream);
+			camel_stream_write(ub->stream, response->str, strlen(response->str), NULL);
+			camel_stream_close(ub->stream, NULL);
 #if (DATASERVER_VERSION >= 2031001)
 			g_object_unref(ub->stream);
 #else
@@ -4101,7 +4106,7 @@ check_feed_folder(gchar *folder_name)
 void
 rss_delete_feed(gchar *full_path, gboolean folder)
 {
-	CamelException ex;
+	GError *error = NULL;
 	gchar *tmp, *tkey, *url;
 	CamelStore *store;
 	gchar *name, *real_name, *buf, *feed_dir, *feed_name;
@@ -4114,24 +4119,15 @@ rss_delete_feed(gchar *full_path, gboolean folder)
 	real_name = g_hash_table_lookup(rf->feed_folders, name);
 	if (!real_name)
 		real_name = name;
-	camel_exception_init (&ex);
-	rss_delete_folders (store, full_path, &ex);
-	if (camel_exception_is_set (&ex)) {
-#if EVOLUTION_VERSION < 22904
-		e_error_run(NULL,
-			"mail:no-delete-folder",
-			full_path,
-			ex.desc,
-			NULL);
-#else
+	rss_delete_folders (store, full_path, &error);
+	if (error != NULL) {
 		e_alert_run_dialog_for_args(
 			e_shell_get_active_window (NULL),
 			"mail:no-delete-folder",
 			full_path,
-			ex.desc,
+			error->message,
 			NULL);
-#endif
-		camel_exception_clear (&ex);
+		g_clear_error(&error);
 	}
 	//also remove status file
 	tkey = g_hash_table_lookup(rf->hrname,
@@ -4172,33 +4168,69 @@ store_folder_deleted(CamelObject *o, void *event_data, void *data)
 	rss_delete_feed(info->full_name, 1);
 }
 
+
+#if (DATASERVER_VERSION < 2031001)
 typedef struct {
-	gchar *old_base;
-	CamelFolderInfo *new;
+       gchar *old_base;
+       CamelFolderInfo *new;
 } RenameInfo;
+#endif
 
-static void
+ static void
+#if (DATASERVER_VERSION < 2031001)
 store_folder_renamed(CamelObject *o, void *event_data, void *data)
+#else
+store_folder_renamed(CamelStore *store,
+			const gchar *old_name,
+			CamelFolderInfo *info)
+#endif
 {
+#if (DATASERVER_VERSION < 2031001)
 	RenameInfo *info = event_data;
+#endif
 
 	gchar *main_folder = lookup_main_folder();
-	if (!g_ascii_strncasecmp(info->old_base, main_folder, strlen(main_folder))
-		|| !g_ascii_strncasecmp(info->old_base, OLD_FEEDS_FOLDER, strlen(OLD_FEEDS_FOLDER))) {
+#if (DATASERVER_VERSION < 2031001)
+       if (!g_ascii_strncasecmp(info->old_base, main_folder, strlen(main_folder))
+               || !g_ascii_strncasecmp(info->old_base, OLD_FEEDS_FOLDER, strlen(OLD_FEEDS_FOLDER))) {
+#else
+       if (!g_ascii_strncasecmp(old_name, main_folder, strlen(main_folder))
+               || !g_ascii_strncasecmp(old_name, OLD_FEEDS_FOLDER, strlen(OLD_FEEDS_FOLDER))) {
+#endif
+
 		d("Folder renamed to '%s' from '%s'\n",
+#if (DATASERVER_VERSION < 2031001)
 			info->new->full_name, info->old_base);
-		if (!g_ascii_strncasecmp(main_folder, info->old_base, strlen(info->old_base))
-		|| !g_ascii_strncasecmp(OLD_FEEDS_FOLDER, info->old_base, strlen(info->old_base)))
+#else
+			info->full_name, old_name);
+#endif
+#if (DATASERVER_VERSION < 2031001)
+	if (!g_ascii_strncasecmp(main_folder, info->old_base, strlen(info->old_base))
+	|| !g_ascii_strncasecmp(OLD_FEEDS_FOLDER, info->old_base, strlen(info->old_base)))
 			update_main_folder(info->new->full_name);
+#else
+		if (!g_ascii_strncasecmp(main_folder, old_name, strlen(old_name))
+		|| !g_ascii_strncasecmp(OLD_FEEDS_FOLDER, old_name, strlen(old_name)))
+			update_main_folder(info->full_name);
+#endif
 		else
+#if (DATASERVER_VERSION < 2031001)
 			if (0 == update_feed_folder(info->old_base, info->new->full_name, 1)) {
 				d("info->old_base:%s\n", info->old_base);
 				d("info->new->full_name:%s\n",
 					info->new->full_name);
+#else
+			if (0 == update_feed_folder((gchar *)old_name, info->full_name, 1)) {
+				d("old_name:%s\n", old_name);
+				d("info->full_name:%s\n",
+					info->full_name);
+#endif
 				d("this is not a feed!!\n");
-				rebase_feeds(
-					info->old_base,
-					info->new->full_name);
+#if (DATASERVER_VERSION < 2031001)
+				rebase_feeds(info->old_base, info->new->full_name);
+#else
+				rebase_feeds((gchar *)old_name, info->full_name);
+#endif
 			}
 		g_idle_add(
 			(GSourceFunc)store_redraw,
@@ -4557,7 +4589,6 @@ void org_gnome_cooly_rss_startup(void *ep, ESEventTargetUpgrade *t)
 void
 check_folders(void)
 {
-	CamelException ex;
 	CamelStore *store = rss_component_peek_local_store();
 	CamelFolder *mail_folder, *old_folder;
 
@@ -4572,7 +4603,7 @@ check_folders(void)
 	} else if (mail_folder == NULL) {
 		camel_store_create_folder (
 			store, NULL,
-			lookup_main_folder(), &ex);
+			lookup_main_folder(), NULL);
 		return;
 	}
 #if (DATASERVER_VERSION >= 2031001)
@@ -5099,7 +5130,6 @@ create_mail(create_feed *CF)
 	CamelMimeMessage *new = camel_mime_message_new();
 	CamelInternetAddress *addr;
 	CamelMessageInfo *info;
-	CamelException *ex = NULL;
 	struct tm tm;
 	time_t time, actual_time;
 	CamelDataWrapper *rtext;
@@ -5219,7 +5249,7 @@ create_mail(create_feed *CF)
 	stream = camel_stream_mem_new ();
 	// w/out an format argument this throws and seg fault
 	camel_stream_printf (stream, "%s", CF->body);
-	camel_data_wrapper_construct_from_stream (rtext, stream);
+	camel_data_wrapper_construct_from_stream (rtext, stream, NULL);
 #if (DATASERVER_VERSION >= 2031001)
 	g_object_unref (stream);
 #else
@@ -5310,7 +5340,7 @@ create_mail(create_feed *CF)
 		camel_medium_set_content_object(CAMEL_MEDIUM(new), CAMEL_DATA_WRAPPER(rtext));
 #endif
 
-	camel_folder_append_message(mail_folder, new, info, &appended_uid, ex);
+	camel_folder_append_message(mail_folder, new, info, &appended_uid, NULL);
 
 	/* no point in filtering mails at import time as it just
 	 * wastes time, user can setup his own afterwards
@@ -5371,12 +5401,13 @@ file_to_message(const char *filename)
 	file = (CamelStreamFs *)
 			camel_stream_fs_new_with_name(filename,
 				O_RDWR|O_CREAT,
-				0666);
+				0666,
+				NULL);
 
 	if (!file)
 		return NULL;
 
-	camel_data_wrapper_construct_from_stream(content, (CamelStream *)file);
+	camel_data_wrapper_construct_from_stream(content, (CamelStream *)file, NULL);
 #if (DATASERVER_VERSION >= 2031001)
 	g_object_unref((CamelObject *)file);
 #else

Places

File evolution-rss-0.2.0-nocamelexception.patch of Package mingw32-evolution-rss (Revision 6093a4759f5c4de73cd14d0a2eed379b)

Places