Mercurial > audlegacy
changeset 3978:40db2fe8d073
- fixed custom stock icons that were not displayed
| author | Giacomo Lozito <james@develia.org> |
|---|---|
| date | Mon, 19 Nov 2007 23:22:21 +0100 |
| parents | 81b4e186765f |
| children | 67f01143e613 |
| files | src/audacious/icons-csource.h src/audacious/icons-stock.h src/audacious/main.c |
| diffstat | 3 files changed, 9 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/audacious/icons-csource.h Mon Nov 19 21:35:25 2007 +0100 +++ b/src/audacious/icons-csource.h Mon Nov 19 23:22:21 2007 +0100 @@ -1,7 +1,7 @@ /* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */ #ifdef __SUNPRO_C -#pragma align 4 (my_pixbuf) +#pragma align 4 (info_pixbuf) #endif #ifdef __GNUC__ static const guint8 info_pixbuf[] __attribute__ ((__aligned__ (4))) =
--- a/src/audacious/icons-stock.h Mon Nov 19 21:35:25 2007 +0100 +++ b/src/audacious/icons-stock.h Mon Nov 19 23:22:21 2007 +0100 @@ -28,11 +28,11 @@ #define AUD_STOCK_QUEUETOGGLE "aud-queuetoggle" #define AUD_STOCK_RANDOMIZEPL "aud-randomizepl" #define AUD_STOCK_REMOVEDUPS "aud-removedups" -#define AUD_STOCK_REMOVEUNAVAIL "aud-removeunavail" +#define AUD_STOCK_REMOVEUNAVAIL "aud-removeunavail" #define AUD_STOCK_SELECTALL "aud-selectall" -#define AUD_STOCK_SELECTINVERT "aud-selectinvert" +#define AUD_STOCK_SELECTINVERT "aud-selectinvert" #define AUD_STOCK_SELECTNONE "aud-selectnone" -#define AUD_STOCK_SORTBYARTIST "aud-sortbydate" +#define AUD_STOCK_SORTBYARTIST "aud-sortbydate" #define AUD_STOCK_SORTBYFILENAME "aud-sortbyfilename" #define AUD_STOCK_SORTBYPATHFILE "aud-sortbypathfile" #define AUD_STOCK_SORTBYTITLE "aud-sortbytitle"
--- a/src/audacious/main.c Mon Nov 19 21:35:25 2007 +0100 +++ b/src/audacious/main.c Mon Nov 19 23:22:21 2007 +0100 @@ -1468,9 +1468,13 @@ { ui_main_check_theme_engine(); + /* register icons in stock + NOTE: should be called before UIManager */ + register_aud_stock_icons(); + /* UIManager NOTE: this needs to be called before plugin init, cause - plugin init functions may want to add custom menu entries */ + plugin init functions may want to add custom menu entries */ ui_manager_init(); ui_manager_create_menus(); } @@ -1491,9 +1495,6 @@ if (options.headless != 1) { - /* register icons in stock */ - register_aud_stock_icons(); - bmp_set_default_icon(); #ifdef GDK_WINDOWING_QUARTZ set_dock_icon();