Make icons work

16 files changed, 50 insertions, 50 deletions

diff --git a/meson.build b/meson.build
index 6b0139f5..a4607185 100644
--- a/meson.build
+++ b/meson.build
@@ -179,24 +179,24 @@ plugin_marshal_ch = gnome.genmarshal('plugin-marshal',
 gdk_pixbuf_source = find_program('gdk-pixbuf-csource')
 
 gen_icon = generator(gdk_pixbuf_source,
-                     output : '@BASENAME@.h',
+                     output : 'icon_@BASENAME@.h',
                      arguments : ['--name=@BASENAME@', '@INPUT@'],
 		     capture : true)
 
-icons = gen_icon.process('src/icons/folder-close.png',
+icons = gen_icon.process('src/icons/folder_close.png',
                          'src/icons/stock_inbox.png',
                          'src/icons/stock_notspam.png',
-                         'src/icons/folder-noselect.png',
-                         'src/icons/stock_insert-file.png',
+                         'src/icons/folder_noselect.png',
+                         'src/icons/stock_insert_file.png',
                          'src/icons/stock_outbox.png',
-                         'src/icons/folder-open.png',
-                         'src/icons/stock_mail-compose_16.png',
+                         'src/icons/folder_open.png',
+                         'src/icons/stock_mail_compose_16.png',
                          'src/icons/stock_person.png',
-                         'src/icons/folder-search.png',
-                         'src/icons/stock_mail-compose.png',
+                         'src/icons/folder_search.png',
+                         'src/icons/stock_mail_compose.png',
                          'src/icons/stock_spam_16.png',
                          'src/icons/group.png',
-                         'src/icons/stock_mail-forward.png',
+                         'src/icons/stock_mail_forward.png',
                          'src/icons/stock_spam.png',
                          'src/icons/html.png',
                          'src/icons/stock_mail.png',
@@ -205,18 +205,18 @@ icons = gen_icon.process('src/icons/folder-close.png',
                          'src/icons/stock_mail_receive_all.png',
                          'src/icons/stock_sylpheed_32.png',
                          'src/icons/stock_attach.png',
-                         'src/icons/stock_mail-receive.png',
+                         'src/icons/stock_mail_receive.png',
                          'src/icons/stock_sylpheed_newmail_16.png',
                          'src/icons/stock_book.png',
-                         'src/icons/stock_mail-reply.png',
+                         'src/icons/stock_mail_reply.png',
                          'src/icons/stock_sylpheed_newmail.png',
                          'src/icons/stock_delete_16.png',
-                         'src/icons/stock_mail-reply-to-all.png',
+                         'src/icons/stock_mail_reply_to_all.png',
                          'src/icons/stock_sylpheed.png',
                          'src/icons/stock_delete.png',
-                         'src/icons/stock_mail-send.png',
-                         'src/icons/sylpheed-logo.png',
-                         'src/icons/stock_hand-signed.png',
+                         'src/icons/stock_mail_send.png',
+                         'src/icons/sylpheed_logo.png',
+                         'src/icons/stock_hand_signed.png',
                          'src/icons/stock_mail_send_queue.png')
 
 executable('sylpheed',
diff --git a/src/icons/folder-close.png b/src/icons/folder_close.png
index f764bdbd..f764bdbd 100644
--- a/src/icons/folder-close.png
+++ b/src/icons/folder_close.png
diff --git a/src/icons/folder-noselect.png b/src/icons/folder_noselect.png
index f5f3175b..f5f3175b 100644
--- a/src/icons/folder-noselect.png
+++ b/src/icons/folder_noselect.png
diff --git a/src/icons/folder-open.png b/src/icons/folder_open.png
index 809ecaca..809ecaca 100644
--- a/src/icons/folder-open.png
+++ b/src/icons/folder_open.png
diff --git a/src/icons/folder-search.png b/src/icons/folder_search.png
index e5d5abcf..e5d5abcf 100644
--- a/src/icons/folder-search.png
+++ b/src/icons/folder_search.png
diff --git a/src/icons/stock_hand-signed.png b/src/icons/stock_hand_signed.png
index 02774f24..02774f24 100644
--- a/src/icons/stock_hand-signed.png
+++ b/src/icons/stock_hand_signed.png
diff --git a/src/icons/stock_insert-file.png b/src/icons/stock_insert_file.png
index 34aed99d..34aed99d 100644
--- a/src/icons/stock_insert-file.png
+++ b/src/icons/stock_insert_file.png
diff --git a/src/icons/stock_mail-compose.png b/src/icons/stock_mail_compose.png
index b0d4e136..b0d4e136 100644
--- a/src/icons/stock_mail-compose.png
+++ b/src/icons/stock_mail_compose.png
diff --git a/src/icons/stock_mail-compose_16.png b/src/icons/stock_mail_compose_16.png
index 7c7d597d..7c7d597d 100644
--- a/src/icons/stock_mail-compose_16.png
+++ b/src/icons/stock_mail_compose_16.png
diff --git a/src/icons/stock_mail-forward.png b/src/icons/stock_mail_forward.png
index f848a60f..f848a60f 100644
--- a/src/icons/stock_mail-forward.png
+++ b/src/icons/stock_mail_forward.png
diff --git a/src/icons/stock_mail-receive.png b/src/icons/stock_mail_receive.png
index 20580e03..20580e03 100644
--- a/src/icons/stock_mail-receive.png
+++ b/src/icons/stock_mail_receive.png
diff --git a/src/icons/stock_mail-reply.png b/src/icons/stock_mail_reply.png
index 47eecc61..47eecc61 100644
--- a/src/icons/stock_mail-reply.png
+++ b/src/icons/stock_mail_reply.png
diff --git a/src/icons/stock_mail-reply-to-all.png b/src/icons/stock_mail_reply_to_all.png
index e2685771..e2685771 100644
--- a/src/icons/stock_mail-reply-to-all.png
+++ b/src/icons/stock_mail_reply_to_all.png
diff --git a/src/icons/stock_mail-send.png b/src/icons/stock_mail_send.png
index e1fa1519..e1fa1519 100644
--- a/src/icons/stock_mail-send.png
+++ b/src/icons/stock_mail_send.png
diff --git a/src/icons/sylpheed-logo.png b/src/icons/sylpheed_logo.png
index 1423da50..1423da50 100644
--- a/src/icons/sylpheed-logo.png
+++ b/src/icons/sylpheed_logo.png
diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index 5cb8c5e2..62493be3 100644
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -47,41 +47,41 @@
 #include "icons/online.xpm"
 #include "icons/offline.xpm"
 #include "icons/mail.xpm"
-#include "icons/stock_inbox.h"
-#include "icons/stock_outbox.h"
-#include "icons/stock_mail.h"
-#include "icons/stock_attach.h"
-#include "icons/stock_mail-compose.h"
-#include "icons/stock_mail-compose_16.h"
-#include "icons/stock_mail-forward.h"
-#include "icons/stock_mail-receive.h"
-#include "icons/stock_mail_receive_all.h"
-#include "icons/stock_mail-reply.h"
-#include "icons/stock_mail-reply-to-all.h"
-#include "icons/stock_mail-send.h"
-#include "icons/stock_mail_send_queue.h"
-#include "icons/stock_insert-file.h"
-#include "icons/stock_addressbook.h"
-#include "icons/stock_delete.h"
-#include "icons/stock_delete_16.h"
-#include "icons/stock_spam.h"
-#include "icons/stock_spam_16.h"
-#include "icons/stock_notspam.h"
-#include "icons/stock_hand-signed.h"
-#include "icons/stock_sylpheed.h"
-#include "icons/stock_sylpheed_16.h"
-#include "icons/stock_sylpheed_32.h"
-#include "icons/stock_sylpheed_newmail.h"
-#include "icons/stock_sylpheed_newmail_16.h"
-#include "icons/sylpheed-logo.h"
-#include "icons/stock_person.h"
-#include "icons/stock_book.h"
-#include "icons/folder-close.h"
-#include "icons/folder-open.h"
-#include "icons/folder-noselect.h"
-#include "icons/folder-search.h"
-#include "icons/group.h"
-#include "icons/html.h"
+#include "icon_stock_inbox.h"
+#include "icon_stock_outbox.h"
+#include "icon_stock_mail.h"
+#include "icon_stock_attach.h"
+#include "icon_stock_mail_compose.h"
+#include "icon_stock_mail_compose_16.h"
+#include "icon_stock_mail_forward.h"
+#include "icon_stock_mail_receive.h"
+#include "icon_stock_mail_receive_all.h"
+#include "icon_stock_mail_reply.h"
+#include "icon_stock_mail_reply_to_all.h"
+#include "icon_stock_mail_send.h"
+#include "icon_stock_mail_send_queue.h"
+#include "icon_stock_insert_file.h"
+#include "icon_stock_addressbook.h"
+#include "icon_stock_delete.h"
+#include "icon_stock_delete_16.h"
+#include "icon_stock_spam.h"
+#include "icon_stock_spam_16.h"
+#include "icon_stock_notspam.h"
+#include "icon_stock_hand_signed.h"
+#include "icon_stock_sylpheed.h"
+#include "icon_stock_sylpheed_16.h"
+#include "icon_stock_sylpheed_32.h"
+#include "icon_stock_sylpheed_newmail.h"
+#include "icon_stock_sylpheed_newmail_16.h"
+#include "icon_sylpheed_logo.h"
+#include "icon_stock_person.h"
+#include "icon_stock_book.h"
+#include "icon_folder_close.h"
+#include "icon_folder_open.h"
+#include "icon_folder_noselect.h"
+#include "icon_folder_search.h"
+#include "icon_group.h"
+#include "icon_html.h"
 
 typedef struct _StockPixmapData	StockPixmapData;