Normalise theme icon names which were different

diff --git a/src/Makefile.am b/src/Makefile.am
index a5d76ea27c71526e1c611f756a88f87b1840da31..b109034c0354b558e14997a3783d82f10c50da43 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -386,11 +386,11 @@ EXTRA_DIST = \
        pixmaps/checkbox_on.xpm \
        pixmaps/check_spelling.xpm \
        pixmaps/clipkey.xpm \
-       pixmaps/claws-mail_icon.xpm \
-       pixmaps/claws-mail_icon_64.xpm \
-       pixmaps/claws-mail_compose_logo.xpm \
-       pixmaps/claws-mail_logo.xpm \
-       pixmaps/claws-mail_logo-small.xpm \
+       pixmaps/claws_mail_icon.xpm \
+       pixmaps/claws_mail_icon_64.xpm \
+       pixmaps/claws_mail_compose_logo.xpm \
+       pixmaps/claws_mail_logo.xpm \
+       pixmaps/claws_mail_logo_small.xpm \
        pixmaps/claws-mail.xpm \
        pixmaps/clip.xpm \
        pixmaps/clip_gpg_signed.xpm \
@@ -530,15 +530,15 @@ EXTRA_DIST = \
        pixmaps/moved.xpm \
        pixmaps/copied.xpm \
        pixmaps/watchthread.xpm \
-       pixmaps/tray_newmail.offline.xpm \
+       pixmaps/tray_newmail_offline.xpm \
        pixmaps/tray_newmail.xpm \
-       pixmaps/tray_newmarkedmail.offline.xpm \
+       pixmaps/tray_newmarkedmail_offline.xpm \
        pixmaps/tray_newmarkedmail.xpm \
-       pixmaps/tray_nomail.offline.xpm \
+       pixmaps/tray_nomail_offline.xpm \
        pixmaps/tray_nomail.xpm \
-       pixmaps/tray_unreadmail.offline.xpm \
+       pixmaps/tray_unreadmail_offline.xpm \
        pixmaps/tray_unreadmail.xpm \
-       pixmaps/tray_unreadmarkedmail.offline.xpm \
+       pixmaps/tray_unreadmarkedmail_offline.xpm \
        pixmaps/tray_unreadmarkedmail.xpm \
        pixmaps/empty.xpm \
        pixmaps/replied_and_forwarded.xpm \

diff --git a/src/pixmaps/claws-mail_compose_logo.xpm b/src/pixmaps/claws_mail_compose_logo.xpm
similarity index 100%
rename from src/pixmaps/claws-mail_compose_logo.xpm
rename to src/pixmaps/claws_mail_compose_logo.xpm

diff --git a/src/pixmaps/claws-mail_icon.xpm b/src/pixmaps/claws_mail_icon.xpm
similarity index 100%
rename from src/pixmaps/claws-mail_icon.xpm
rename to src/pixmaps/claws_mail_icon.xpm

diff --git a/src/pixmaps/claws-mail_icon_64.xpm b/src/pixmaps/claws_mail_icon_64.xpm
similarity index 100%
rename from src/pixmaps/claws-mail_icon_64.xpm
rename to src/pixmaps/claws_mail_icon_64.xpm

diff --git a/src/pixmaps/claws-mail_logo.xpm b/src/pixmaps/claws_mail_logo.xpm
similarity index 100%
rename from src/pixmaps/claws-mail_logo.xpm
rename to src/pixmaps/claws_mail_logo.xpm

diff --git a/src/pixmaps/claws-mail_logo-small.xpm b/src/pixmaps/claws_mail_logo_small.xpm
similarity index 100%
rename from src/pixmaps/claws-mail_logo-small.xpm
rename to src/pixmaps/claws_mail_logo_small.xpm

diff --git a/src/pixmaps/tray_newmail.offline.xpm b/src/pixmaps/tray_newmail_offline.xpm
similarity index 100%
rename from src/pixmaps/tray_newmail.offline.xpm
rename to src/pixmaps/tray_newmail_offline.xpm

diff --git a/src/pixmaps/tray_newmarkedmail.offline.xpm b/src/pixmaps/tray_newmarkedmail_offline.xpm
similarity index 100%
rename from src/pixmaps/tray_newmarkedmail.offline.xpm
rename to src/pixmaps/tray_newmarkedmail_offline.xpm

diff --git a/src/pixmaps/tray_nomail.offline.xpm b/src/pixmaps/tray_nomail_offline.xpm
similarity index 100%
rename from src/pixmaps/tray_nomail.offline.xpm
rename to src/pixmaps/tray_nomail_offline.xpm

diff --git a/src/pixmaps/tray_unreadmail.offline.xpm b/src/pixmaps/tray_unreadmail_offline.xpm
similarity index 100%
rename from src/pixmaps/tray_unreadmail.offline.xpm
rename to src/pixmaps/tray_unreadmail_offline.xpm

diff --git a/src/pixmaps/tray_unreadmarkedmail.offline.xpm b/src/pixmaps/tray_unreadmarkedmail_offline.xpm
similarity index 100%
rename from src/pixmaps/tray_unreadmarkedmail.offline.xpm
rename to src/pixmaps/tray_unreadmarkedmail_offline.xpm

diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index 30fa8ba55e8cbe94b70161b263194b45aff4d1b3..c356be9a0111f09051566096ffee5e103251aec9 100644 (file)
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -84,13 +84,13 @@
 #include "pixmaps/queue_close_hrm.xpm"
 #include "pixmaps/queue_open.xpm"
 #include "pixmaps/queue_open_hrm.xpm"
-#include "pixmaps/claws-mail_icon.xpm"
-#include "pixmaps/claws-mail_icon_64.xpm"
-#include "pixmaps/claws-mail_compose_logo.xpm"
+#include "pixmaps/claws_mail_icon.xpm"
+#include "pixmaps/claws_mail_icon_64.xpm"
+#include "pixmaps/claws_mail_compose_logo.xpm"
 #ifndef GENERIC_UMPC
-#include "pixmaps/claws-mail_logo.xpm"
+#include "pixmaps/claws_mail_logo.xpm"
 #else
-#include "pixmaps/claws-mail_logo-small.xpm"
+#include "pixmaps/claws_mail_logo_small.xpm"
 #endif
 #include "pixmaps/address_book.xpm"
 #include "pixmaps/unread.xpm"
@@ -187,15 +187,15 @@
 #include "pixmaps/selection.xpm"
 #include "pixmaps/watchthread.xpm"
 #include "pixmaps/empty.xpm"
-#include "pixmaps/tray_newmail.offline.xpm"
+#include "pixmaps/tray_newmail_offline.xpm"
 #include "pixmaps/tray_newmail.xpm"
-#include "pixmaps/tray_newmarkedmail.offline.xpm"
+#include "pixmaps/tray_newmarkedmail_offline.xpm"
 #include "pixmaps/tray_newmarkedmail.xpm"
-#include "pixmaps/tray_nomail.offline.xpm"
+#include "pixmaps/tray_nomail_offline.xpm"
 #include "pixmaps/tray_nomail.xpm"
-#include "pixmaps/tray_unreadmail.offline.xpm"
+#include "pixmaps/tray_unreadmail_offline.xpm"
 #include "pixmaps/tray_unreadmail.xpm"
-#include "pixmaps/tray_unreadmarkedmail.offline.xpm"
+#include "pixmaps/tray_unreadmarkedmail_offline.xpm"
 #include "pixmaps/tray_unreadmarkedmail.xpm"
 
 typedef struct _StockPixmapData        StockPixmapData;
@@ -396,15 +396,15 @@ static StockPixmapData pixmaps[] =
        {copied_xpm                             , NULL, NULL, "copied", NULL},
        {selection_xpm                          , NULL, NULL, "selection", NULL},
        {watchthread_xpm                        , NULL, NULL, "watchthread", NULL},
-       {tray_newmail_offline_xpm               , NULL, NULL, "tray_newmail.offline", NULL},
+       {tray_newmail_offline_xpm               , NULL, NULL, "tray_newmail_offline", NULL},
        {tray_newmail_xpm                       , NULL, NULL, "tray_newmail", NULL},
-       {tray_newmarkedmail_offline_xpm         , NULL, NULL, "tray_newmarkedmail.offline", NULL},
+       {tray_newmarkedmail_offline_xpm         , NULL, NULL, "tray_newmarkedmail_offline", NULL},
        {tray_newmarkedmail_xpm                 , NULL, NULL, "tray_newmarkedmail", NULL},
-       {tray_nomail_offline_xpm                , NULL, NULL, "tray_nomail.offline", NULL},
+       {tray_nomail_offline_xpm                , NULL, NULL, "tray_nomail_offline", NULL},
        {tray_nomail_xpm                        , NULL, NULL, "tray_nomail", NULL},
-       {tray_unreadmail_offline_xpm            , NULL, NULL, "tray_unreadmail.offline", NULL},
+       {tray_unreadmail_offline_xpm            , NULL, NULL, "tray_unreadmail_offline", NULL},
        {tray_unreadmail_xpm                    , NULL, NULL, "tray_unreadmail", NULL},
-       {tray_unreadmarkedmail_offline_xpm      , NULL, NULL, "tray_unreadmarkedmail.offline", NULL},
+       {tray_unreadmarkedmail_offline_xpm      , NULL, NULL, "tray_unreadmarkedmail_offline", NULL},
        {tray_unreadmarkedmail_xpm              , NULL, NULL, "tray_unreadmarkedmail", NULL},
         {empty_xpm                              , NULL, NULL, "empty" , NULL}
 };