add the locked pixmap thing I missed in the sync with Hiro (which reorganized the...

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 07d206178743b264eb0c4fb30461fa12187577d2..1ed561689755fbea3954540ddc85c990155285ce 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2001-12-23 [alfons]    0.6.6claws15
+
+       * src/stock_pixmap.[ch]
+       * src/summaryview.c
+               add the forgotten Claws' locked pixmap
+

 2001-12-23 [alfons]    0.6.6claws14
 
        * src/filesel.c
 2001-12-23 [alfons]    0.6.6claws14
 
        * src/filesel.c

diff --git a/configure.in b/configure.in
index 32b8bc625bfba2cad69168332983a3027b91d529..c647b7bd6d20c2e2ec567b5c08172ecf3d242f18 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws14
+EXTRA_VERSION=claws15

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

diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index 032ad86905dc7b4656b5d27122bb7dfcf594dda7..91bf85649a7d87218d3780121527082b928cf692 100644 (file)
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -44,6 +44,7 @@
 #include "pixmaps/ldap.xpm"
 #include "pixmaps/linewrap.xpm"
 #include "pixmaps/mark.xpm"
 #include "pixmaps/ldap.xpm"
 #include "pixmaps/linewrap.xpm"
 #include "pixmaps/mark.xpm"

+#include "pixmaps/locked.xpm"

 #include "pixmaps/new.xpm"
 #include "pixmaps/outbox.xpm"
 #include "pixmaps/replied.xpm"
 #include "pixmaps/new.xpm"
 #include "pixmaps/outbox.xpm"
 #include "pixmaps/replied.xpm"


@@ -102,6 +103,7 @@ static StockPixmapData pixmaps[] =
        {ldap_xpm                       , NULL, NULL},
        {linewrap_xpm                   , NULL, NULL},
        {mark_xpm                       , NULL, NULL},
        {ldap_xpm                       , NULL, NULL},
        {linewrap_xpm                   , NULL, NULL},
        {mark_xpm                       , NULL, NULL},

+       {locked_xpm                     , NULL, NULL},

        {new_xpm                        , NULL, NULL},
        {outbox_xpm                     , NULL, NULL},
        {replied_xpm                    , NULL, NULL},
        {new_xpm                        , NULL, NULL},
        {outbox_xpm                     , NULL, NULL},
        {replied_xpm                    , NULL, NULL},

diff --git a/src/stock_pixmap.h b/src/stock_pixmap.h
index b483843a7d9dde414bab6deb0aadcd0adcd9b526..c7ef09801af04168580e040e1ea971a5def48b45 100644 (file)
--- a/src/stock_pixmap.h
+++ b/src/stock_pixmap.h
@@ -45,6 +45,7 @@ typedef enum
        STOCK_PIXMAP_LDAP,
        STOCK_PIXMAP_LINEWRAP,
        STOCK_PIXMAP_MARK,
        STOCK_PIXMAP_LDAP,
        STOCK_PIXMAP_LINEWRAP,
        STOCK_PIXMAP_MARK,

+       STOCK_PIXMAP_LOCKED,

        STOCK_PIXMAP_NEW,
        STOCK_PIXMAP_OUTBOX,
        STOCK_PIXMAP_REPLIED,
        STOCK_PIXMAP_NEW,
        STOCK_PIXMAP_OUTBOX,
        STOCK_PIXMAP_REPLIED,

diff --git a/src/summaryview.c b/src/summaryview.c
index f40a31ecfce38668acf0fab242cd93318ea3fb79..548da4672d6e6152a698105a3ff94e40f1a445ab 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -539,6 +539,8 @@ void summary_init(SummaryView *summaryview)
                         &forwardedxpm, &forwardedxpmmask);
        stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_CLIP,
                         &clipxpm, &clipxpmmask);
                         &forwardedxpm, &forwardedxpmmask);
        stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_CLIP,
                         &clipxpm, &clipxpmmask);

+       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_LOCKED,
+                        &lockedxpm, &lockedxpmmask);

 
        if (!small_style) {
                small_style = gtk_style_copy
 
        if (!small_style) {
                small_style = gtk_style_copy