diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/main.c | 4 | ||||
-rw-r--r-- | src/pixmaps/Makefile.am | 2 | ||||
-rw-r--r-- | src/pixmaps/stock_sylpheed.png | bin | 0 -> 2718 bytes | |||
-rw-r--r-- | src/stock_pixmap.c | 13 | ||||
-rw-r--r-- | src/stock_pixmap.h | 1 |
5 files changed, 14 insertions, 6 deletions
@@ -73,6 +73,7 @@ #include "utils.h" #include "gtkutils.h" #include "socket.h" +#include "stock_pixmap.h" #if USE_GPGME # include "rfc2015.h" @@ -145,6 +146,7 @@ int main(int argc, char *argv[]) gchar *userrc; MainWindow *mainwin; FolderView *folderview; + GdkPixbuf *icon; setlocale(LC_ALL, ""); bindtextdomain(PACKAGE, LOCALEDIR); @@ -300,6 +302,8 @@ int main(int argc, char *argv[]) prefs_display_header_read_config(); gtkut_widget_init(); + stock_pixbuf_gdk(NULL, STOCK_PIXMAP_SYLPHEED, &icon); + gtk_window_set_default_icon(icon); mainwin = main_window_create (prefs_common.sep_folder | prefs_common.sep_msg << 1); diff --git a/src/pixmaps/Makefile.am b/src/pixmaps/Makefile.am index 3092c8f2..3a4cca6c 100644 --- a/src/pixmaps/Makefile.am +++ b/src/pixmaps/Makefile.am @@ -18,6 +18,7 @@ BUILT_SOURCES = \ stock_mail_send_queue.h \ stock_outbox.h \ stock_spam.h \ + stock_sylpheed.h \ sylpheed-logo.h EXTRA_DIST = \ @@ -40,6 +41,7 @@ EXTRA_DIST = \ stock_mail_send_queue.png \ stock_outbox.png \ stock_spam.png \ + stock_sylpheed.png \ sylpheed-logo.png \ clip.xpm \ deleted.xpm \ diff --git a/src/pixmaps/stock_sylpheed.png b/src/pixmaps/stock_sylpheed.png Binary files differnew file mode 100644 index 00000000..e70a0e3f --- /dev/null +++ b/src/pixmaps/stock_sylpheed.png diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c index 91c84717..2e0a4fe7 100644 --- a/src/stock_pixmap.c +++ b/src/stock_pixmap.c @@ -46,6 +46,11 @@ #include "pixmaps/mark.xpm" #include "pixmaps/new.xpm" #include "pixmaps/replied.xpm" +#include "pixmaps/unread.xpm" +#include "pixmaps/vcard.xpm" +#include "pixmaps/online.xpm" +#include "pixmaps/offline.xpm" +#include "pixmaps/mail.xpm" #include "pixmaps/stock_inbox.h" #include "pixmaps/stock_outbox.h" #include "pixmaps/stock_mail.h" @@ -65,12 +70,8 @@ #include "pixmaps/stock_delete_16.h" #include "pixmaps/stock_spam.h" #include "pixmaps/stock_hand-signed.h" +#include "pixmaps/stock_sylpheed.h" #include "pixmaps/sylpheed-logo.h" -#include "pixmaps/unread.xpm" -#include "pixmaps/vcard.xpm" -#include "pixmaps/online.xpm" -#include "pixmaps/offline.xpm" -#include "pixmaps/mail.xpm" typedef struct _StockPixmapData StockPixmapData; @@ -133,6 +134,7 @@ static StockPixmapData pixmaps[] = {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_sylpheed, sizeof(stock_sylpheed), NULL, 0}, {NULL, NULL, NULL, NULL, sylpheed_logo, sizeof(sylpheed_logo), NULL, 0}, }; @@ -194,7 +196,6 @@ gint stock_pixbuf_gdk(GtkWidget *window, StockPixmap icon, GdkPixbuf **pixbuf) if (pixbuf) *pixbuf = NULL; - g_return_val_if_fail(window != NULL, -1); g_return_val_if_fail(icon >= 0 && icon < N_STOCK_PIXMAPS, -1); pix_d = &pixmaps[icon]; diff --git a/src/stock_pixmap.h b/src/stock_pixmap.h index d37bdb59..a3a3f419 100644 --- a/src/stock_pixmap.h +++ b/src/stock_pixmap.h @@ -70,6 +70,7 @@ typedef enum STOCK_PIXMAP_DELETE, STOCK_PIXMAP_SPAM, STOCK_PIXMAP_SIGN, + STOCK_PIXMAP_SYLPHEED, STOCK_PIXMAP_SYLPHEED_LOGO, N_STOCK_PIXMAPS |