0.8.6claws75
authorChristoph Hohmann <reboot@gmx.ch>
Sun, 8 Dec 2002 13:37:37 +0000 (13:37 +0000)
committerChristoph Hohmann <reboot@gmx.ch>
Sun, 8 Dec 2002 13:37:37 +0000 (13:37 +0000)
* src/summaryview.c
        The function that is called when a color lable changes
        should not change the color lable again

ChangeLog.claws
configure.in
src/summaryview.c

index dba6b8c..a0a021f 100644 (file)
@@ -1,3 +1,9 @@
+2002-12-08 [christoph] 0.8.6claws75
+
+       * src/summaryview.c
+               The function that is called when a color lable changes
+               should not change the color lable again
+
 2002-12-08 [colin]     0.8.6claws74
 
        * src/gtk/sslcertwindow.c
index 2fbcdc0..905d020 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws74
+EXTRA_VERSION=claws75
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
@@ -226,25 +226,7 @@ else
 fi
 
 dnl Check for OpenSSL
-AC_ARG_ENABLE(ssl,
-       [  --enable-ssl            Enable SSL support using OpenSSL [default=no]],
-       [ac_cv_enable_ssl=$enableval], [ac_cv_enable_ssl=no])
-AC_MSG_CHECKING([whether to use OpenSSL])
-if test $ac_cv_enable_ssl = yes; then
-       AC_MSG_RESULT(yes)
-       AC_MSG_CHECKING([if openssl is available])
-       LIBS="$LIBS -lssl -lcrypto"
-       AC_TRY_LINK([
-#include <openssl/opensslv.h>
-],     [ return OPENSSL_VERSION_NUMBER; ],
-       [ AC_MSG_RESULT(yes)
-         AC_DEFINE(USE_SSL, 1, Define if you use OpenSSL to support SSL.) ],
-       [ AC_MSG_RESULT(no)
-         LIBS="$ac_save_LIBS"
-         ac_cv_enable_ssl=no ])
-else
-       AC_MSG_RESULT(no)
-fi
+AM_PATH_OPENSSL
 
 dnl Check for X-Face support
 AC_ARG_ENABLE(compface,
@@ -382,7 +364,7 @@ sylpheed.spec
 intl/Makefile
 ac/Makefile
 po/Makefile.in
-src/version.h
+src/common/version.h
 src/Makefile
 src/common/Makefile
 src/gtk/Makefile
@@ -417,7 +399,7 @@ fi
 echo "GnuPG         : $ac_cv_enable_gpgme"
 echo "JPilot        : $ac_cv_enable_jpilot"
 echo "LDAP          : $ac_cv_enable_ldap"
-echo "OpenSSL       : $ac_cv_enable_ssl"
+echo "OpenSSL       : $ac_cv_enable_openssl"
 echo "compface      : $ac_cv_enable_compface"
 echo "libjconv      : $ac_cv_enable_jconv"
 echo "IPv6          : $ac_cv_enable_ipv6"
index 0f8e5c1..0b7310a 100644 (file)
@@ -4220,8 +4220,6 @@ void summary_set_colorlabel_color(GtkCTree *ctree, GtkCTreeNode *node,
        gint color_index;
 
        msginfo = gtk_ctree_node_get_row_data(ctree, node);
-       procmsg_msginfo_unset_flags(msginfo, MSG_CLABEL_FLAG_MASK, 0);
-       procmsg_msginfo_set_flags(msginfo, MSG_COLORLABEL_TO_FLAGS(labelcolor), 0);
 
        color_index = labelcolor == 0 ? -1 : (gint)labelcolor - 1;
        ctree_style = gtk_widget_get_style(GTK_WIDGET(ctree));
@@ -4251,16 +4249,26 @@ void summary_set_colorlabel_color(GtkCTree *ctree, GtkCTreeNode *node,
        gtk_ctree_node_set_row_style(ctree, node, style);
 }
 
+static void summary_set_row_colorlable(SummaryView *summaryview, GtkCTreeNode *row, guint labelcolor)
+{
+       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       MsgInfo *msginfo;
+
+       msginfo = gtk_ctree_node_get_row_data(ctree, row);
+
+       procmsg_msginfo_unset_flags(msginfo, MSG_CLABEL_FLAG_MASK, 0);
+       procmsg_msginfo_set_flags(msginfo, MSG_COLORLABEL_TO_FLAGS(labelcolor), 0);
+}
+
 void summary_set_colorlabel(SummaryView *summaryview, guint labelcolor,
                            GtkWidget *widget)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
-       GtkCList *clist = GTK_CLIST(summaryview->ctree);
        GList *cur;
 
-       for (cur = clist->selection; cur != NULL; cur = cur->next)
-               summary_set_colorlabel_color(ctree, GTK_CTREE_NODE(cur->data),
-                                            labelcolor);
+       for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
+               summary_set_row_colorlable(summaryview,
+                                          GTK_CTREE_NODE(cur->data), labelcolor);
 }
 
 static void summary_colorlabel_menu_item_activate_item_cb(GtkMenuItem *menu_item,