2007-04-24 [paul] 2.9.1cvs21
authorPaul Mangan <paul@claws-mail.org>
Tue, 24 Apr 2007 14:44:16 +0000 (14:44 +0000)
committerPaul Mangan <paul@claws-mail.org>
Tue, 24 Apr 2007 14:44:16 +0000 (14:44 +0000)
* src/Makefile.am
* src/stock_pixmap.c
* src/stock_pixmap.h
complete last commit

ChangeLog
PATCHSETS
configure.ac
src/Makefile.am
src/stock_pixmap.c
src/stock_pixmap.h

index 79256d4558195bd872a4af37dbf70cc304e28eff..b368f6f7fe0e0dc142b8e87d60df284826586457 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-04-24 [paul]      2.9.1cvs21
+
+       * src/Makefile.am
+       * src/stock_pixmap.c
+       * src/stock_pixmap.h
+               complete last commit
+
 2007-04-24 [paul]      2.9.1cvs20
 
        * src/gtk/about.c
index 7a9117adbd2cceeedb54a8b55e82e77e839c43ea..1b449d55eadb2f5246661dd38dd95dd189d6cd12 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.204.2.131 -r 1.204.2.132 src/prefs_common.c;  ) > 2.9.1cvs18.patchset
 ( cvs diff -u -r 1.96.2.169 -r 1.96.2.170 src/textview.c;  cvs diff -u -r 1.12.2.18 -r 1.12.2.19 src/textview.h;  ) > 2.9.1cvs19.patchset
 ( cvs diff -u -r 1.4.2.49 -r 1.4.2.50 src/gtk/about.c;  cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/pixmaps/active.xpm;  cvs diff -u -r 1.1.16.1 -r 1.1.16.2 src/pixmaps/checkbox_off.xpm;  cvs diff -u -r 1.1.16.1 -r 1.1.16.2 src/pixmaps/checkbox_on.xpm;  cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/pixmaps/inactive.xpm;  ) > 2.9.1cvs20.patchset
+( cvs diff -u -r 1.155.2.62 -r 1.155.2.63 src/Makefile.am;  cvs diff -u -r 1.25.2.37 -r 1.25.2.38 src/stock_pixmap.c;  cvs diff -u -r 1.18.2.26 -r 1.18.2.27 src/stock_pixmap.h;  ) > 2.9.1cvs21.patchset
index 15d812277c0c03d33a1ef98c1a5edb217e0e6348..4ee457cb23606897bbd3187a95c272df7d86147d 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=20
+EXTRA_VERSION=21
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 1d48e9b7dd623ff2bae2e468283eda53e6d5ff57..b9c4323a31b2067055660e297feeccdb2b3c93af 100644 (file)
@@ -299,7 +299,6 @@ BUILT_SOURCES = \
        quote_fmt_parse.h
 
 EXTRA_DIST = \
-       pixmaps/active.xpm \
        pixmaps/addr_one.xpm \
        pixmaps/addr_two.xpm \
        pixmaps/address_book.xpm \
@@ -335,7 +334,6 @@ EXTRA_DIST = \
        pixmaps/group.xpm \
        pixmaps/ham_btn.xpm \
        pixmaps/ignorethread.xpm \
-       pixmaps/inactive.xpm \
        pixmaps/inbox_open_hrm.xpm \
        pixmaps/inbox_open.xpm \
        pixmaps/inbox_close_hrm.xpm \
index 4cb034d50df7681059d8fc9bdfbad64a98e6f6a4..8664a3e699a088ff8b09cd66a434113561e92baa 100644 (file)
 #include "pixmaps/ham_btn.xpm"
 #include "pixmaps/moved.xpm"
 #include "pixmaps/copied.xpm"
-#include "pixmaps/active.xpm"
-#include "pixmaps/inactive.xpm"
 #include "pixmaps/selection.xpm"
 #include "pixmaps/empty.xpm"
 
@@ -341,8 +339,6 @@ static StockPixmapData pixmaps[] =
         {ham_btn_xpm                            , NULL, NULL, "ham_btn" , NULL},
        {moved_xpm                              , NULL, NULL, "moved", NULL},
        {copied_xpm                             , NULL, NULL, "copied", NULL},
-       {active_xpm                             , NULL, NULL, "active", NULL},
-       {inactive_xpm                           , NULL, NULL, "inactive", NULL},
        {selection_xpm                          , NULL, NULL, "selection", NULL},
         {empty_xpm                              , NULL, NULL, "empty" , NULL}
 };
index a0046340ee1cd59e2ae26c2f4e28beae26be47b3..cbeeef40ba0134b7d6dca86c86e98ac235dab891 100644 (file)
@@ -164,8 +164,6 @@ typedef enum
        STOCK_PIXMAP_HAM_BTN,
        STOCK_PIXMAP_MOVED,
        STOCK_PIXMAP_COPIED,
-       STOCK_PIXMAP_ACTIVE,
-       STOCK_PIXMAP_INACTIVE,
        STOCK_PIXMAP_SELECTION,
        STOCK_PIXMAP_EMPTY,              /* last entry */
        N_STOCK_PIXMAPS