2007-07-14 [colin] 2.10.0cvs24

	* src/prefs_common.c
		Maemo: hide statusbar by default
	* src/Makefile.am
	* src/stock_pixmap.c
	* src/stock_pixmap.h
	* src/toolbar.c
	* src/pixmaps/go_folders.xpm
		Maemo: Add a specific icon to go back to
		folder list

diff --git a/ChangeLog b/ChangeLog
index 6210b4ed39265da19077e2cfbbf007364ece93ab..9f8e4b18d60becb2d8b70c6066ad39efd561a63c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2007-07-14 [colin]     2.10.0cvs24
+
+       * src/prefs_common.c
+               Maemo: hide statusbar by default
+       * src/Makefile.am
+       * src/stock_pixmap.c
+       * src/stock_pixmap.h
+       * src/toolbar.c
+       * src/pixmaps/go_folders.xpm
+               Maemo: Add a specific icon to go back to
+               folder list
+
 2007-07-14 [colin]     2.10.0cvs23
 
        * src/toolbar.c

diff --git a/PATCHSETS b/PATCHSETS
index 75e2f8daad4c2a9d9d9e8aa8b1658eeb1d3cc80e..e2e72bd642a151ff35b140df32507575d5076668 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2677,3 +2677,4 @@
 ( cvs diff -u -r 1.43.2.69 -r 1.43.2.70 src/toolbar.c;  ) > 2.10.0cvs21.patchset
 ( cvs diff -u -r 1.43.2.70 -r 1.43.2.71 src/toolbar.c;  ) > 2.10.0cvs22.patchset
 ( cvs diff -u -r 1.43.2.71 -r 1.43.2.72 src/toolbar.c;  ) > 2.10.0cvs23.patchset
+( cvs diff -u -r 1.155.2.68 -r 1.155.2.69 src/Makefile.am;  cvs diff -u -r 1.204.2.139 -r 1.204.2.140 src/prefs_common.c;  cvs diff -u -r 1.25.2.40 -r 1.25.2.41 src/stock_pixmap.c;  cvs diff -u -r 1.18.2.29 -r 1.18.2.30 src/stock_pixmap.h;  cvs diff -u -r 1.43.2.72 -r 1.43.2.73 src/toolbar.c;  diff -u /dev/null src/pixmaps/go_folders.xpm;  ) > 2.10.0cvs24.patchset

diff --git a/configure.ac b/configure.ac
index aa721e97aa680ef17e26c41dbd2ead7ab39255dc..ccd5b04c1c2590c0ec9064cb355d212fc2ef5e0e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=23
+EXTRA_VERSION=24
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/Makefile.am b/src/Makefile.am
index f7ae184589b6d3ca3a8a3807d4896794ce2c87f9..f313a1ca8e5563e4d284aeced15e4c405fd1415b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -337,6 +337,7 @@ EXTRA_DIST = \
        pixmaps/exec.xpm \
        pixmaps/forwarded.xpm \
        pixmaps/gpg_signed.xpm \
+       pixmaps/go_folders.xpm \
        pixmaps/group.xpm \
        pixmaps/ham_btn.xpm \
        pixmaps/ignorethread.xpm \

diff --git a/src/pixmaps/go_folders.xpm b/src/pixmaps/go_folders.xpm
new file mode 100644 (file)
index 0000000..7753661
--- /dev/null
+++ b/src/pixmaps/go_folders.xpm
@@ -0,0 +1,114 @@
+/* XPM */
+static char * go_folders_xpm[] = {
+"24 24 87 1",
+"      c None",
+".     c #000000",
+"+     c #5695E8",
+"@     c #6FAAF5",
+"#     c #74AEF6",
+"$     c #4C89E6",
+"%     c #4B89E7",
+"&     c #5A98F0",
+"*     c #68A7F5",
+"=     c #67A6F4",
+"-     c #5593EE",
+";     c #4681E6",
+">     c #79AEF8",
+",     c #5F9DF4",
+"'     c #65A2F6",
+")     c #609DF4",
+"!     c #63A0F4",
+"~     c #5591F1",
+"{     c #67A2F4",
+"]     c #538FEF",
+"^     c #4780EC",
+"/     c #4C88ED",
+"(     c #5792F1",
+"_     c #224AA4",
+":     c #2957BE",
+"<     c #346ADB",
+"[     c #D2EAFD",
+"}     c #CFEAFD",
+"|     c #C6E6FD",
+"1     c #C4E5FD",
+"2     c #C4E4FD",
+"3     c #C2E3FD",
+"4     c #B8DDFB",
+"5     c #80BBF1",
+"6     c #1D3E8C",
+"7     c #2650B0",
+"8     c #ACD7FB",
+"9     c #A8D5FB",
+"0     c #A7D4FA",
+"a     c #9ECEF9",
+"b     c #67A7EB",
+"c     c #1C3A80",
+"d     c #204396",
+"e     c #EAC0BA",
+"f     c #9BCCF9",
+"g     c #98CBF9",
+"h     c #92C7F8",
+"i     c #71AEEF",
+"j     c #3470CA",
+"k     c #1D3D88",
+"l     c #DF9E95",
+"m     c #93C8F8",
+"n     c #80BDF5",
+"o     c #6BACEB",
+"p     c #1B3781",
+"q     c #E0A198",
+"r     c #E1A59D",
+"s     c #E2A79E",
+"t     c #E3ABA3",
+"u     c #E3AAA2",
+"v     c #CC6253",
+"w     c #86BEF7",
+"x     c #84BEF7",
+"y     c #7FBAF6",
+"z     c #5E9EEA",
+"A     c #3064BF",
+"B     c #DD978D",
+"C     c #DF9F97",
+"D     c #DE9A90",
+"E     c #DD968C",
+"F     c #DD948A",
+"G     c #B14334",
+"H     c #70AEF4",
+"I     c #6FADF4",
+"J     c #67A7F1",
+"K     c #64A4EF",
+"L     c #498BE7",
+"M     c #431913",
+"N     c #EAC2BC",
+"O     c #DF9C92",
+"P     c #DD998F",
+"Q     c #B54535",
+"R     c #65261D",
+"S     c #983A2C",
+"T     c #7C2F24",
+"U     c #63251D",
+"V     c #6C291F",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"        ....            ",
+"       .+@#$.           ",
+"      .%&*=-;......     ",
+"      .>,')!~{]^^/(.    ",
+"     ..........._:<.    ",
+"    .[}|11212345.67.    ",
+"    ...8909090ab.cd.    ",
+"    .e.ffggggghij.k.    ",
+"   .el.......mhno.p.    ",
+"  .eqrstsulv.wxyzA..    ",
+" .eBClDEEDFG.HIJKL..    ",
+"MNDOPPBDDDDQ.......     ",
+" .RSSSSSSSST.           ",
+"  .RSSUUUUUV.           ",
+"   .RS.......           ",
+"    .R.                 ",
+"     ..                 ",
+"      .                 ",
+"                        ",
+"                        "};

diff --git a/src/prefs_common.c b/src/prefs_common.c
index 69299ea91c30a4c817797f3cda2f0b5ed26b3539..9c0907cc706b03663077815fb9e3dfd72a6765f6 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -425,12 +425,14 @@ static PrefParam param[] = {
 #endif
        {"toolbar_detachable", "FALSE", &prefs_common.toolbar_detachable, P_BOOL,
         NULL, NULL, NULL},
+#ifndef MAEMO
        {"show_statusbar", "TRUE", &prefs_common.show_statusbar, P_BOOL,
         NULL, NULL, NULL},
-#ifndef MAEMO
        {"show_searchbar", "TRUE", &prefs_common.show_searchbar, P_BOOL,
         NULL, NULL, NULL},
 #else
+       {"show_statusbar", "FALSE", &prefs_common.show_statusbar, P_BOOL,
+        NULL, NULL, NULL},
        {"show_searchbar", "FALSE", &prefs_common.show_searchbar, P_BOOL,
         NULL, NULL, NULL},
 #endif

diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index aa8135dcade449077fe02d5e5cc2735cca467fde..4a28da9fd248a2865000815d656d3666329f7127 100644 (file)
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -95,6 +95,7 @@
 #include "pixmaps/quicksearch.xpm"
 #include "pixmaps/clip_gpg_signed.xpm"
 #include "pixmaps/gpg_signed.xpm"
+#include "pixmaps/go_folders.xpm"
 #include "pixmaps/mime_text_plain.xpm"
 #include "pixmaps/mime_text_html.xpm"
 #include "pixmaps/mime_application.xpm"
@@ -303,6 +304,7 @@ static StockPixmapData pixmaps[] =
        {notice_note_xpm                        , NULL, NULL, "notice_note",  NULL},
        {quicksearch_xpm                        , NULL, NULL, "quicksearch",  NULL},
        {gpg_signed_xpm                         , NULL, NULL, "gpg_signed", NULL},
+       {go_folders_xpm                         , NULL, NULL, "go_folders", NULL},
        {drafts_close_xpm                       , NULL, NULL, "drafts_close", NULL},
        {drafts_open_xpm                        , NULL, NULL, "drafts_open", NULL},
        {drafts_close_mark_xpm                  , NULL, NULL, "drafts_close_mark", NULL},

diff --git a/src/stock_pixmap.h b/src/stock_pixmap.h
index 785a80a840aa271a7b85cd5b4f4185dd6dc66090..e5e0d7202d8754fda7f91e4ee66061e133b332e9 100644 (file)
--- a/src/stock_pixmap.h
+++ b/src/stock_pixmap.h
@@ -127,6 +127,7 @@ typedef enum
        STOCK_PIXMAP_NOTICE_NOTE,               /* small message */
        STOCK_PIXMAP_QUICKSEARCH,               /* quicksearch pixmap */
        STOCK_PIXMAP_GPG_SIGNED,
+       STOCK_PIXMAP_GO_FOLDERS,
        STOCK_PIXMAP_DRAFTS_CLOSE,
        STOCK_PIXMAP_DRAFTS_OPEN,
        STOCK_PIXMAP_DRAFTS_CLOSE_MARK,

diff --git a/src/toolbar.c b/src/toolbar.c
index c27a2291157e950bd720270e66226afad9178215..ed9130bfdafd312a78366a38feeeafa250f088b2 100644 (file)
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -407,7 +407,7 @@ static void toolbar_set_default_main(void)
                gchar *text;
        } default_toolbar[] = {
 #ifdef MAEMO
-               { A_GO_FOLDERS,    STOCK_PIXMAP_DIR_OPEN,             _("Folders") },
+               { A_GO_FOLDERS,    STOCK_PIXMAP_GO_FOLDERS,             _("Folders") },
                { A_SEPARATOR,     0,                                 ("")         }, 
 #endif
                { A_RECEIVE_ALL,   STOCK_PIXMAP_MAIL_RECEIVE_ALL,     _("Get Mail")},