replaced sylpheed logo with new one.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@404 ee746299-78ed-0310-b773-934348b2243d

8 files changed, 19 insertions, 64 deletions

diff --git a/ChangeLog b/ChangeLog
index 1cd33234..37a8b127 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 2005-07-06
 
 	* src/stock_pixmap.[ch]
+	  src/sylpheed-logo.png: replaced Sylpheed logo with new one.
+
+2005-07-06
+
+	* src/stock_pixmap.[ch]
 	  src/pixmaps/*.xpm: removed unused images.
 
 2005-07-06
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 0ef837a1..334bc8f0 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,6 +1,11 @@
 2005-07-06
 
 	* src/stock_pixmap.[ch]
+	  src/sylpheed-logo.png: Sylpheed のロゴを新しいものに置き換えた。
+
+2005-07-06
+
+	* src/stock_pixmap.[ch]
 	  src/pixmaps/*.xpm: 未使用の画像を削除。
 
 2005-07-06
diff --git a/src/compose.c b/src/compose.c
index ccfd393b..ee02ac50 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -4384,7 +4384,7 @@ static void compose_toolbar_create(Compose *compose, GtkWidget *container)
 
 	gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
 
-	icon_wid = stock_pixbuf_widget(container, STOCK_PIXMAP_PASTE);
+	icon_wid = stock_pixbuf_widget(container, STOCK_PIXMAP_INSERT_FILE);
 	insert_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
 					     _("Insert"),
 					     _("Insert file"),
diff --git a/src/pixmaps/Makefile.am b/src/pixmaps/Makefile.am
index 426f0601..3092c8f2 100644
--- a/src/pixmaps/Makefile.am
+++ b/src/pixmaps/Makefile.am
@@ -17,7 +17,8 @@ BUILT_SOURCES = \
 	stock_mail_receive_all.h \
 	stock_mail_send_queue.h \
 	stock_outbox.h \
-	stock_spam.h
+	stock_spam.h \
+	sylpheed-logo.h
 
 EXTRA_DIST = \
 	stock_addressbook.png \
@@ -39,6 +40,7 @@ EXTRA_DIST = \
 	stock_mail_send_queue.png \
 	stock_outbox.png \
 	stock_spam.png \
+	sylpheed-logo.png \
 	clip.xpm \
 	deleted.xpm \
 	dir-close.xpm \
@@ -56,10 +58,6 @@ EXTRA_DIST = \
 	continue.xpm \
 	complete.xpm \
 	error.xpm \
-	stock_close.xpm \
-	stock_exec.xpm \
-	stock_down_arrow.xpm \
-	sylpheed-logo.xpm \
 	address.xpm \
 	book.xpm \
 	category.xpm \
diff --git a/src/pixmaps/sylpheed-logo.png b/src/pixmaps/sylpheed-logo.png
new file mode 100644
index 00000000..1423da50
--- /dev/null
+++ b/src/pixmaps/sylpheed-logo.png
diff --git a/src/pixmaps/sylpheed-logo.xpm b/src/pixmaps/sylpheed-logo.xpm
deleted file mode 100644
index d727c392..00000000
--- a/src/pixmaps/sylpheed-logo.xpm
+++ /dev/null
@@ -1,53 +0,0 @@
-/* XPM */
-static char * sylpheed_logo_xpm[] = {
-"128 40 10 1",
-" 	c None",
-".	c #969696",
-"+	c #808080",
-"@	c #404040",
-"#	c #565656",
-"$	c #ABABAB",
-"%	c #000000",
-"&	c #161616",
-"*	c #2B2B2B",
-"=	c #6B6B6B",
-"               .+@@@#++$        $                                                                                               ",
-"            $#%%%%%%%%%%%&@@@@@&$                                                                                               ",
-"           #%%*@@@@%%%%%%%%%&@+                                                                                                 ",
-"         $&@.                                                                                                                 ..",
-"         *+                                         +                      +=                                                +%$",
-"        =#                                        $@*                    $=%=                                             $#*%@ ",
-"        @                                       .*%%+                  .&%%&                                               $%%. ",
-"        @                                        $%&                     %%=                                               +%*  ",
-"        +                                        =%=                    .%&                                                @%+  ",
-"        +        ++@++                           *%$                    *%=                                                %&   ",
-"        #      =#+.+#%&=                        .%#                    .%&                                                =%=   ",
-"        #$   $+      $&%@                       *%.                    *%=                                                *%    ",
-"         #   $        $&%#                     .%*                    $%%$                                               .%#    ",
-"         $#      .$    =%%.                    *%.                    #%#                                                *%$    ",
-"           ==++==$     $%%@                   $%*                    $%%$                                               .%#     ",
-"                        %%%     $$       $    #%=           .+.      #%@               +.           +.               $+$*%.     ",
-"                        %%%    #%@     =%#   $%&    $*@   =&%%%+    $%%.  $=&%#     .=@@&%=      .=@@&%=          +#=. .%*      ",
-"                        %%%  .@%%.     &%.   #%=   +&%@ $&%@@&%@    #%* $##.&%=    +$   $&%=    +$   $&%=      $#*.    *%.      ",
-"                       +%%% $..%*     =%*   $%&  .+ @%+$*=   @%@   $%%.=#$ $%%   $#      +%%  $#      +%%     +&+     .%*       ",
-"    ++++$              =%%@   *%.     &%.   #%=     %&$#$    %%=   #%&#$   #%#  $*$       %% $*$       %%    #&$      *%=       ",
-"  =%%%%%%*=            *%%+  .%*     =%*   $%%$    +%#=     .%%$   &%@     %%$  *=       =%# *=       =%#   @%$      +%&        ",
-" @%&=+++#*%&=         .%%&   *%.     &%+   #%#     @%@$     #%@   =%*     =%#  =%      =*#$ =%      =*#$   +%=      $&%=        ",
-"+%&$       +@&.       *%%+  =%*     =%&    &%$     %%.     $%%$   &%.     &%$  **   .=#.    **   .=#.     $%*       @%&         ",
-"+%$          $##     #%%#   &%+     &%=   =%#     +%@      *%+   =%*     #%#   %@  $$       %@  $$        #%=      #&%#         ",
-".@             +#   +%%@   =%&    $&%&    &%.     *%$     @%+    &%.    $%%$   %&           %&           $%%$     #+%%$         ",
-" #$             $# @%%+    &%=   .#&%=   =%*     $%#     @%+    =%*     @%@    %%.          %%.          =%%     @+*%# $        ",
-"  #$             #%%*$    +%&   +=.%&    &%.$=   #%.   $**$     &%.    .%%.$+  #%&      +$  #%&      +$  @%%$  =&+$%%$+.        ",
-"   =#$        .#&%@=      +%* +@+ *%=   +%%@#   $%*  $#*.      +%*     @%%@+   $&%&+$.==$   $&%&+$.==$   #%%*@%&$ +%%*$         ",
-"     +##@+@@@&@@=$ +      $#%&#$ .%&    +%&+  .+@%##@=.        @%.     @%*$     $@%%%*.      $@%%%*.     $&%%*=   +%#           ",
-"                    +            *%=     +     +%*+$                                                                            ",
-"                    .           .%&            .%=                                                                              ",
-"                                *%=            *&                                                                               ",
-"                               .%&            .%=                                                                               ",
-"                        .#@*@#=%%#            *&                                                                                ",
-"                      .*%=$   .%&$+$         .%#                                                                                ",
-"                     .%&$     &%.            &%$                                                                                ",
-"                     *%.     @%+            =%#                                                                                 ",
-"                     %%     @&+             &%$                                                                                 ",
-"                     @%+  =&#$             =%*                                                                                  ",
-"                      +=@=+               $%%.                                                                                  "};
diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index 4d3e0c6e..91c84717 100644
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -65,7 +65,7 @@
 #include "pixmaps/stock_delete_16.h"
 #include "pixmaps/stock_spam.h"
 #include "pixmaps/stock_hand-signed.h"
-#include "pixmaps/sylpheed-logo.xpm"
+#include "pixmaps/sylpheed-logo.h"
 #include "pixmaps/unread.xpm"
 #include "pixmaps/vcard.xpm"
 #include "pixmaps/online.xpm"
@@ -129,11 +129,11 @@ static StockPixmapData pixmaps[] =
 	{NULL, NULL, NULL, NULL, stock_mail_send, sizeof(stock_mail_send), "stock_mail-send", 24},
 	{NULL, NULL, NULL, NULL, stock_mail_send_queue, sizeof(stock_mail_send_queue), NULL, 0},
 	{NULL, NULL, NULL, NULL, stock_insert_file, sizeof(stock_insert_file), "stock_insert-file", 24},
-	{sylpheed_logo_xpm, NULL, NULL},
 	{NULL, NULL, NULL, NULL, stock_addressbook, sizeof(stock_addressbook), "stock_addressbook", 24},
 	{NULL, NULL, NULL, NULL, stock_delete, sizeof(stock_delete), GTK_STOCK_DELETE, 24},
 	{NULL, NULL, NULL, NULL, stock_spam, sizeof(stock_spam), "stock_spam", 24},
-	{NULL, NULL, NULL, NULL, stock_hand_signed, sizeof(stock_hand_signed), "stock_hand-signed", 24}
+	{NULL, NULL, NULL, NULL, stock_hand_signed, sizeof(stock_hand_signed), "stock_hand-signed", 24},
+	{NULL, NULL, NULL, NULL, sylpheed_logo, sizeof(sylpheed_logo), NULL, 0},
 };
 
 /* return newly constructed GtkPixmap from GdkPixmap */
diff --git a/src/stock_pixmap.h b/src/stock_pixmap.h
index 23ca26d3..d37bdb59 100644
--- a/src/stock_pixmap.h
+++ b/src/stock_pixmap.h
@@ -65,12 +65,12 @@ typedef enum
 	STOCK_PIXMAP_MAIL_REPLY_TO_ALL,
 	STOCK_PIXMAP_MAIL_SEND,
 	STOCK_PIXMAP_MAIL_SEND_QUEUE,
-	STOCK_PIXMAP_PASTE,
-	STOCK_PIXMAP_SYLPHEED_LOGO,
+	STOCK_PIXMAP_INSERT_FILE,
 	STOCK_PIXMAP_ADDRESS_BOOK,
 	STOCK_PIXMAP_DELETE,
 	STOCK_PIXMAP_SPAM,
 	STOCK_PIXMAP_SIGN,
+	STOCK_PIXMAP_SYLPHEED_LOGO,
 
 	N_STOCK_PIXMAPS
 } StockPixmap;