evolution-rss r241 - in trunk: . src

[lucilanga svn gnome org]

Author: lucilanga
Date: Mon Apr 21 17:35:55 2008
New Revision: 241
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=241&view=rev

Log:
fix sendreceive dialog

Modified:
   trunk/ChangeLog
   trunk/TODO
   trunk/src/network-soup.c
   trunk/src/rss.c
   trunk/src/rss.h

Modified: trunk/TODO
==============================================================================
--- trunk/TODO	(original)
+++ trunk/TODO	Mon Apr 21 17:35:55 2008
@@ -37,3 +37,4 @@
 	* search in the content of page for feed
 	* obey ttl entity
 	* check rename feed when evo 2.24 x86_64 
+	* make send receive dialog remember its size

Modified: trunk/src/network-soup.c
==============================================================================
--- trunk/src/network-soup.c	(original)
+++ trunk/src/network-soup.c	Mon Apr 21 17:35:55 2008
@@ -217,8 +217,7 @@
 	g_free(tmp);
 	guint res = 0;
 
-	gchar *feed_dir = g_strdup_printf("%s/mail/rss",
-            mail_component_peek_base_directory (mail_component_peek ()));
+	gchar *feed_dir = rss_component_peek_base_directory(mail_component_peek());
 	if (!g_file_test(feed_dir, G_FILE_TEST_EXISTS))
             g_mkdir_with_parents (feed_dir, 0755);
 
@@ -248,8 +247,7 @@
 	g_free(tmp);
 	guint res = 0;
 
-	gchar *feed_dir = g_strdup_printf("%s/mail/rss",
-            mail_component_peek_base_directory (mail_component_peek ()));
+	gchar *feed_dir = rss_component_peek_base_directory(mail_component_peek());
 	if (!g_file_test(feed_dir, G_FILE_TEST_EXISTS))
             g_mkdir_with_parents (feed_dir, 0755);
 
@@ -278,8 +276,7 @@
 	gchar *tmp = gen_md5(data);
 	gchar *buf = g_strconcat(tmp, ".rec", NULL);
 	g_free(tmp);
-	gchar *feed_dir = g_strdup_printf("%s/mail/rss",
-            mail_component_peek_base_directory (mail_component_peek ()));
+	gchar *feed_dir = rss_component_peek_base_directory(mail_component_peek());
 	if (!g_file_test(feed_dir, G_FILE_TEST_EXISTS))
             g_mkdir_with_parents (feed_dir, 0755);
 

Modified: trunk/src/rss.c
==============================================================================
--- trunk/src/rss.c	(original)
+++ trunk/src/rss.c	Mon Apr 21 17:35:55 2008
@@ -1147,8 +1147,7 @@
 {
 	guint res = 0;
 	//contruct feeds
-	gchar *feed_dir = g_strdup_printf("%s/mail/rss", 
-	    mail_component_peek_base_directory (mail_component_peek ()));
+	gchar *feed_dir = rss_component_peek_base_directory(mail_component_peek());
 	if (!g_file_test(feed_dir, G_FILE_TEST_EXISTS))
 	    g_mkdir_with_parents (feed_dir, 0755);
 	gchar *feed_file = g_strdup_printf("%s/evolution-feeds", feed_dir);
@@ -2241,10 +2240,10 @@
                 if (rf->info->cancel_button)
                         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);
+                g_hash_table_steal(rf->info->data->active, rf->info->uri);
+                rf->info->data->infos = g_list_remove(rf->info->data->infos, rf->info);
 
-                if (g_hash_table_size(rf->info->data->active) == 0) {
+		if (g_hash_table_size(rf->info->data->active) == 0) {
                         if (rf->info->data->gd)
                                 gtk_widget_destroy((GtkWidget *)rf->info->data->gd);
                 }
@@ -2278,7 +2277,7 @@
                 if (rf->info->cancel_button)
                         gtk_widget_set_sensitive(rf->info->cancel_button, FALSE);
 
-                g_hash_table_remove(rf->info->data->active, rf->info->uri);
+                g_hash_table_steal(rf->info->data->active, rf->info->uri);
                 rf->info->data->infos = g_list_remove(rf->info->data->infos, rf->info);
 
                 if (g_hash_table_size(rf->info->data->active) == 0) {
@@ -2384,7 +2383,7 @@
         	if (rf->info->cancel_button)
                 	gtk_widget_set_sensitive(rf->info->cancel_button, FALSE);
 
-        	g_hash_table_remove(rf->info->data->active, rf->info->uri);
+        	g_hash_table_steal(rf->info->data->active, rf->info->uri);
         	rf->info->data->infos = g_list_remove(rf->info->data->infos, rf->info);
 
         	if (g_hash_table_size(rf->info->data->active) == 0) {
@@ -2487,15 +2486,28 @@
 }
 
 gchar *
+rss_component_peek_base_directory(MailComponent *component)
+{
+/* http://bugzilla.gnome.org/show_bug.cgi?id=513951 */
+#if (EVOLUTION_VERSION >= 22400)
+	return g_strdup_printf("%s/rss",
+            mail_component_peek_base_directory (component));
+#else
+	return g_strdup_printf("%s/mail/rss",
+            mail_component_peek_base_directory (component));
+#endif
+}
+
+gchar *
 get_main_folder(void)
 {
 	gchar mf[512];
-	gchar *feed_dir = g_strdup_printf("%s/mail/rss",
-            mail_component_peek_base_directory (mail_component_peek ()));
+	gchar *feed_dir = rss_component_peek_base_directory(mail_component_peek());
         if (!g_file_test(feed_dir, G_FILE_TEST_EXISTS))
             g_mkdir_with_parents (feed_dir, 0755);
         gchar *feed_file = g_strdup_printf("%s/main_folder", feed_dir);
         g_free(feed_dir);
+	g_print("feed_file:%s\n", feed_file);
         if (g_file_test(feed_file, G_FILE_TEST_EXISTS))
 	{
 		FILE *f = fopen(feed_file, "r");
@@ -2521,8 +2533,7 @@
 	
 	rf->feed_folders = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
 	rf->reversed_feed_folders = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
-	gchar *feed_dir = g_strdup_printf("%s/mail/rss",
-            mail_component_peek_base_directory (mail_component_peek ()));
+	gchar *feed_dir = rss_component_peek_base_directory(mail_component_peek());
         if (!g_file_test(feed_dir, G_FILE_TEST_EXISTS))
             g_mkdir_with_parents (feed_dir, 0755);
         gchar *feed_file = g_strdup_printf("%s/feed_folders", feed_dir);
@@ -2587,8 +2598,7 @@
 		g_free(rf->main_folder);
 	rf->main_folder = g_strdup(new_name);
 	
-	gchar *feed_dir = g_strdup_printf("%s/mail/rss",
-            mail_component_peek_base_directory (mail_component_peek ()));
+	gchar *feed_dir = rss_component_peek_base_directory(mail_component_peek());
         if (!g_file_test(feed_dir, G_FILE_TEST_EXISTS))
             g_mkdir_with_parents (feed_dir, 0755);
         gchar *feed_file = g_strdup_printf("%s/main_folder", feed_dir);
@@ -2629,8 +2639,7 @@
 	gchar *oname = g_path_get_basename(old_name);
 	gchar *nname = g_path_get_basename(new_name);
 	FILE *f;
-	gchar *feed_dir = g_strdup_printf("%s/mail/rss",
-            mail_component_peek_base_directory (mail_component_peek ()));
+	gchar *feed_dir = rss_component_peek_base_directory(mail_component_peek());
         if (!g_file_test(feed_dir, G_FILE_TEST_EXISTS))
             g_mkdir_with_parents (feed_dir, 0755);
         gchar *feed_file = g_strdup_printf("%s/feed_folders", feed_dir);
@@ -3788,8 +3797,7 @@
 	u_int32_t crc2 = gen_crc(url);
 	gchar *md5 = gen_md5(url);
 
-	gchar *feed_dir = g_strdup_printf("%s/mail/rss", 
-	    mail_component_peek_base_directory (mail_component_peek ()));
+	gchar *feed_dir = rss_component_peek_base_directory(mail_component_peek());
 	if (!g_file_test(feed_dir, G_FILE_TEST_EXISTS))
 	    g_mkdir_with_parents (feed_dir, 0755);
 
@@ -3889,8 +3897,7 @@
 
 	gchar *buf = gen_md5(url);
 
-	gchar *feed_dir = g_strdup_printf("%s/mail/rss", 
-	    mail_component_peek_base_directory (mail_component_peek ()));
+	gchar *feed_dir = rss_component_peek_base_directory(mail_component_peek());
 	if (!g_file_test(feed_dir, G_FILE_TEST_EXISTS))
 	    g_mkdir_with_parents (feed_dir, 0755);
 

Modified: trunk/src/rss.h
==============================================================================
--- trunk/src/rss.h	(original)
+++ trunk/src/rss.h	Mon Apr 21 17:35:55 2008
@@ -276,6 +276,7 @@
 void taskbar_pop_message(void);
 void write_feeds_folder_line(gpointer key, gpointer value, FILE *file);
 void populate_reversed(gpointer key, gpointer value, GHashTable *hash);
+gchar *rss_component_peek_base_directory(MailComponent *component);