projects / claws.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix parsing logic in RSSyl OPML import.
[claws.git] / src / plugins / rssyl / rssyl_cb_menu.c
diff --git a/src/plugins/rssyl/rssyl_cb_menu.c b/src/plugins/rssyl/rssyl_cb_menu.c
index 771791b1032b0ee1cd8372a327b606147a2b468b..3abf54d3083056bd389c836254d64c996b332682 100644 (file)
--- a/src/plugins/rssyl/rssyl_cb_menu.c
+++ b/src/plugins/rssyl/rssyl_cb_menu.c
@@ -51,7 +51,6 @@ void rssyl_new_feed_cb(GtkAction *action,
                gpointer data)
 {
        FolderView *folderview = (FolderView*)data;
-       GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
        FolderItem *item;
        gchar *url;
 
@@ -59,7 +58,7 @@ void rssyl_new_feed_cb(GtkAction *action,
 
        g_return_if_fail(folderview->selected != NULL);
 
-       item = gtk_cmctree_node_get_row_data(ctree, folderview->selected);
+       item = folderview_get_selected_item(folderview);
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
 
@@ -78,7 +77,6 @@ void rssyl_new_folder_cb(GtkAction *action,
                gpointer data)
 {
        FolderView *folderview = (FolderView*)data;
-       GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
        FolderItem *item;
        FolderItem *new_item;
        gchar *new_folder, *p, *tmp;
@@ -86,7 +84,7 @@ void rssyl_new_folder_cb(GtkAction *action,
 
        if (!folderview->selected) return;
 
-       item = gtk_cmctree_node_get_row_data(ctree, folderview->selected);
+       item = folderview_get_selected_item(folderview);
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
 
@@ -250,7 +248,7 @@ void rssyl_refresh_feed_cb(GtkAction *action,
        ritem = (RFolderItem *)item;
 
        /* Offline check */
-       if( prefs_common.work_offline &&
+       if( prefs_common_get_prefs()->work_offline &&
                        !inc_offline_should_override(TRUE,
                                        ngettext("Claws Mail needs network access in order "
                                        "to update the feed.",
@@ -330,7 +328,7 @@ void rssyl_remove_mailbox_cb(GtkAction *action, gpointer data)
 
        n = folder_item_get_path(item);
        if( remove_dir_recursive(n) < 0 ) {
-               g_warning("can't remove directory '%s'\n", n);
+               g_warning("can't remove directory '%s'", n);
                g_free(n);
                return;
        }
@@ -342,7 +340,6 @@ void rssyl_remove_mailbox_cb(GtkAction *action, gpointer data)
 void rssyl_import_feed_list_cb(GtkAction *action, gpointer data)
 {
        FolderView *folderview = (FolderView *)data;
-       GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
        FolderItem *item = NULL;
        gchar *path = NULL;
        OPMLImportCtx *ctx = NULL;
@@ -359,7 +356,7 @@ void rssyl_import_feed_list_cb(GtkAction *action, gpointer data)
 
        /* Find the destination folder for the import */
        g_return_if_fail(folderview->selected != NULL);
-       item = gtk_cmctree_node_get_row_data(ctree, folderview->selected);
+       item = folderview_get_selected_item(folderview);
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
 
@@ -368,7 +365,7 @@ void rssyl_import_feed_list_cb(GtkAction *action, gpointer data)
        /* This needs to be +2, since we will be comparing it to depth of
         * <outline> tag in OPML's XML structure. Topmost outlines are under
         * <opml> and <body>, hence 2. */
-       ctx->depth = rssyl_folder_depth(item) + 2;
+       ctx->depth = rssyl_folder_depth(item) + 1;
        ctx->current = NULL;
        ctx->current = g_slist_append(ctx->current, item);
 
Claws Mail