Don't use UI stuff in folder.h

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 9de62ff89ffb3635566d139bb2f2c2cc4fdcefd7..68369569155b2bc24fca411e262005826da8a003 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2002-08-20 [darko]     0.8.1claws82
+
+       * src/folder.h
+       * src/folderview.c
+       * src/prefs_folder_item.[hc]
+               don't use UI stuff in folder.h
+

 2002-08-20 [darko]     0.8.1claws81
 
        * src/folder.h
 2002-08-20 [darko]     0.8.1claws81
 
        * src/folder.h

diff --git a/configure.in b/configure.in
index 6bacd529d34b0f9dbfeb59f6188c3781dc55f2ed..67cbdb1a5422b9c3c16aebcbdf043f60013bcf0d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws81
+EXTRA_VERSION=claws82

 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/folder.h b/src/folder.h
index 53caa1a74b65f6152109b708e86cd221c9f2d62b..9dececed38f5b86454b82f106181cce41cf8b67f 100644 (file)
--- a/src/folder.h
+++ b/src/folder.h
@@ -240,8 +240,6 @@ struct _FolderItem
        gint op_count;
        guint opened    : 1; /* opened by summary view */
 
        gint op_count;
        guint opened    : 1; /* opened by summary view */
 

-       GtkStyle *color_style; /* used for folder color */
-

        FolderSortKey sort_key;
        FolderSortType sort_type;
 
        FolderSortKey sort_key;
        FolderSortType sort_type;
 

diff --git a/src/folderview.c b/src/folderview.c
index 574b55b8ccd1310211b046aa816609aeb0ebe323..83363b2e5a733dec2378ea2db108d37673b8cf48 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -1013,6 +1013,7 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        GtkStyle *style = NULL;
 {
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        GtkStyle *style = NULL;

+       GtkStyle *color_style = NULL;

        FolderItem *item;
        GdkPixmap *xpm, *openxpm;
        GdkBitmap *mask, *openmask;
        FolderItem *item;
        GdkPixmap *xpm, *openxpm;
        GdkBitmap *mask, *openmask;


@@ -1214,7 +1215,12 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
        } else if (item->op_count > 0) {
                style = bold_tgtfold_style;
        } else if (item->prefs->color > 0) {
        } else if (item->op_count > 0) {
                style = bold_tgtfold_style;
        } else if (item->prefs->color > 0) {

-               style = item->color_style;
+               GdkColor gdk_color;
+
+               gtkut_convert_int_to_gdk_color(item->prefs->color, &gdk_color);
+               color_style = gtk_style_copy(gtk_widget_get_default_style());
+               color_style->fg[GTK_STATE_NORMAL] = gdk_color;
+               style = color_style;

        } else {
                style = normal_style;
        }
        } else {
                style = normal_style;
        }

diff --git a/src/prefs_folder_item.c b/src/prefs_folder_item.c
index 3fdcab1ecf84bcad682f6912de39046e1c067afc..bd9a9fc261d7361a5bcc3736cd3815d2dd3c518b 100644 (file)
--- a/src/prefs_folder_item.c
+++ b/src/prefs_folder_item.c
@@ -161,15 +161,6 @@ void prefs_folder_item_read_config(FolderItem * item)
                                                                 SORT_BY_NONE);
                item->sort_type = tmp_prefs.sort_descending ? SORT_DESCENDING : SORT_ASCENDING;
        }                                                               
                                                                 SORT_BY_NONE);
                item->sort_type = tmp_prefs.sort_descending ? SORT_DESCENDING : SORT_ASCENDING;
        }                                                               

-
-       /* create style for folder color */
-       if (tmp_prefs.color > 0) {
-               GdkColor gdk_color;
-
-               gtkut_convert_int_to_gdk_color(tmp_prefs.color, &gdk_color);
-               item->color_style = gtk_style_copy(gtk_widget_get_default_style());
-               item->color_style->fg[GTK_STATE_NORMAL] = gdk_color;
-       }

 }
 
 void prefs_folder_item_save_config(FolderItem * item)
 }
 
 void prefs_folder_item_save_config(FolderItem * item)


@@ -581,15 +572,9 @@ void prefs_folder_item_ok_cb(GtkWidget *widget,
        prefs->default_account = GPOINTER_TO_INT(gtk_object_get_user_data(GTK_OBJECT(menuitem)));
 
        prefs->color = dialog->item->prefs->color;
        prefs->default_account = GPOINTER_TO_INT(gtk_object_get_user_data(GTK_OBJECT(menuitem)));
 
        prefs->color = dialog->item->prefs->color;

-       if (prefs->color > 0) {
-               GdkColor gdk_color;
-
-               dialog->item->color_style = gtk_style_copy(gtk_widget_get_default_style());
-               dialog->item->color_style->fg[GTK_STATE_NORMAL] = gdk_color;
-
-               /* update folder view */
+       /* update folder view */
+       if (prefs->color > 0)

                folderview_update_item(dialog->item, FALSE);
                folderview_update_item(dialog->item, FALSE);

-       }

 
        prefs_folder_item_save_config(dialog->item);
        prefs_folder_item_destroy(dialog);
 
        prefs_folder_item_save_config(dialog->item);
        prefs_folder_item_destroy(dialog);

diff --git a/src/prefs_folder_item.h b/src/prefs_folder_item.h
index 27347a923ecd5be0121ea91788b2987ef15ae213..e6d8101c872fb1ce870fe0bb924245c938cbfad9 100644 (file)
--- a/src/prefs_folder_item.h
+++ b/src/prefs_folder_item.h
@@ -23,7 +23,6 @@
 
 #include "folder.h"
 #include <glib.h>
 
 #include "folder.h"
 #include <glib.h>

-#include <gtk/gtk.h>

 #include <sys/types.h>
 
 struct _PrefsFolderItem {
 #include <sys/types.h>
 
 struct _PrefsFolderItem {