2012-10-12 [mones] 3.8.1cvs98

[claws.git] / src / grouplistdialog.c

diff --git a/src/grouplistdialog.c b/src/grouplistdialog.c
index de0f3834bde1205cfd215b9fdd39515a11919f6f..83b0ea76be8ce48c94ef57fe7c86ff5126ff5018 100644 (file)
--- a/src/grouplistdialog.c
+++ b/src/grouplistdialog.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2011 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,6 +19,7 @@
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
+#include "claws-features.h"
 #endif
 
 #include "defs.h"
@@ -94,7 +95,7 @@ GSList *grouplist_dialog(Folder *folder)
        GNode *node;
        FolderItem *item;
 
-       if (dialog && gtkut_widget_get_visible(dialog)) return NULL;
+       if (dialog && gtk_widget_get_visible(dialog)) return NULL;
 
        if (!dialog)
                grouplist_dialog_create();
@@ -122,8 +123,7 @@ GSList *grouplist_dialog(Folder *folder)
        gtk_widget_hide(dialog);
 
        if (!ack) {
-               slist_free_strings(subscribed);
-               g_slist_free(subscribed);
+               slist_free_strings_full(subscribed);
                subscribed = NULL;
 
                for (node = folder->node->children; node != NULL;
@@ -211,15 +211,9 @@ static void grouplist_dialog_create(void)
        gtk_cmclist_set_column_auto_resize(GTK_CMCLIST(ctree), 0, TRUE);
        gtk_cmclist_set_selection_mode(GTK_CMCLIST(ctree), GTK_SELECTION_MULTIPLE);
        
-       if (prefs_common.enable_dotted_lines) { 
-               gtk_cmctree_set_line_style(GTK_CMCTREE(ctree), GTK_CMCTREE_LINES_DOTTED);
-               gtk_cmctree_set_expander_style(GTK_CMCTREE(ctree),
-                                       GTK_CMCTREE_EXPANDER_SQUARE);
-       } else {
-               gtk_cmctree_set_line_style(GTK_CMCTREE(ctree), GTK_CMCTREE_LINES_NONE);
-               gtk_cmctree_set_expander_style(GTK_CMCTREE(ctree),
-                                       GTK_CMCTREE_EXPANDER_TRIANGLE);
-       }
+       gtk_cmctree_set_line_style(GTK_CMCTREE(ctree), GTK_CMCTREE_LINES_NONE);
+       gtk_cmctree_set_expander_style(GTK_CMCTREE(ctree),
+                               GTK_CMCTREE_EXPANDER_TRIANGLE);
 
        for (i = 0; i < 3; i++)
                gtkut_widget_set_can_focus(GTK_CMCLIST(ctree)->column[i].button, FALSE);
@@ -360,7 +354,7 @@ static GtkCMCTreeNode *grouplist_create_branch(NewsGroupInfo *ginfo,
        parent = grouplist_create_parent(parent_name, pattern);
        node = grouplist_hash_get_branch_node(name);
        if (node) {
-               gtk_sctree_set_node_info(GTK_CMCTREE(ctree), node, cols[0], 0,
+               gtk_cmctree_set_node_info(GTK_CMCTREE(ctree), node, cols[0], 0,
                                        NULL, NULL, FALSE, FALSE);
                gtk_cmctree_node_set_text(GTK_CMCTREE(ctree), node, 1, cols[1]);
                gtk_cmctree_node_set_text(GTK_CMCTREE(ctree), node, 2, cols[2]);