[evolution-rss] Bug 644100 - Crash when exporting feeds
- From: Lucian Langa <lucilanga src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-rss] Bug 644100 - Crash when exporting feeds
- Date: Mon, 7 Mar 2011 09:27:59 +0000 (UTC)
commit da329585c670f43ba35c7e2e246d427ed2a1afbb
Author: Lucian Langa <lucilanga gnome org>
Date: Mon Mar 7 10:49:44 2011 +0200
Bug 644100 - Crash when exporting feeds
src/rss-config-factory.c | 36 +++++++++++++++++++++---------------
1 files changed, 21 insertions(+), 15 deletions(-)
---
diff --git a/src/rss-config-factory.c b/src/rss-config-factory.c
index 511e83d..c2a6c56 100644
--- a/src/rss-config-factory.c
+++ b/src/rss-config-factory.c
@@ -2476,8 +2476,10 @@ gen_folder_list(gpointer key, gpointer value, gpointer user)
gchar *tmp = g_hash_table_lookup(
rf->reversed_feed_folders, key);
gchar *folder;
+ d("mf:%s\n", mf);
if (tmp) {
+ d("tmp:%s\n", tmp);
tmp = g_path_get_dirname(tmp);
if (tmp && *tmp != '.')
folder = g_build_path(G_DIR_SEPARATOR_S, mf, tmp, NULL);
@@ -2486,6 +2488,7 @@ gen_folder_list(gpointer key, gpointer value, gpointer user)
g_free(mf);
g_free(tmp);
if (!g_list_find_custom(flist, folder, (GCompareFunc)strcmp)) {
+ d("append folder:%s\n", folder);
flist = g_list_append(flist, folder);
}
}
@@ -2600,28 +2603,31 @@ create_xml(GtkWidget *progress)
rf->hrname,
gen_folder_list,
NULL);
- list = flist;
- tmp = list->data;
- //generate mssing parents
- while ((list = g_list_next(list))) {
- p = gen_folder_parents(p, list, tmp);
+ if (list) {
+ list = flist;
tmp = list->data;
- }
- list = flist;
- //get parents into main list
- for (p = g_list_first(p); p != NULL; p = g_list_next(p)) {
- if (!g_list_find_custom(list, p->data, (GCompareFunc)strcmp)) {
- list = g_list_append(list, p->data);
+ //generate mssing parents
+ while ((list = g_list_next(list))) {
+ p = gen_folder_parents(p, list, tmp);
+ tmp = list->data;
}
- }
- list = flist;
- list = flist = g_list_sort(list, (GCompareFunc)strcmp);
+ list = flist;
+ //get parents into main list
+ for (p = g_list_first(p); p != NULL; p = g_list_next(p)) {
+ if (!g_list_find_custom(list, p->data, (GCompareFunc)strcmp)) {
+ list = g_list_append(list, p->data);
+ }
+ }
+ list = flist;
+ list = flist = g_list_sort(list, (GCompareFunc)strcmp);
+ } else
+ flist = g_list_append(flist, get_main_folder());
list = flist;
tmp = list->data;
strbuf = g_strdup_printf(
- "<outline title=\"%s\" text=\"%s\" description=\"%s\" type=\"folder\">\n",
+ "<outline title=\"%s\" text=\"%s\" description=\"%s\" type=\"folder\">\n",
tmp, tmp, tmp);
result = append_buffer(result, strbuf);
strbuf = create_folder_feeds(tmp);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]