Mercurial > pidgin.yaz
changeset 3363:7c3638a2e5ac
[gaim-migrate @ 3382]
The beginning of new gtk2 .png icons and replace our gaim.xpm desktop icon
with the purty .png
committer: Tailor Script <tailor@pidgin.im>
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Fri, 02 Aug 2002 04:46:13 +0000 |
| parents | b1cdee27ef02 |
| children | d4c260bb5b6b |
| files | pixmaps/Makefile.am pixmaps/edit.png pixmaps/gaim.png |
| diffstat | 3 files changed, 25 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/pixmaps/Makefile.am Fri Aug 02 04:39:23 2002 +0000 +++ b/pixmaps/Makefile.am Fri Aug 02 04:46:13 2002 +0000 @@ -23,6 +23,7 @@ big.xpm \ bigsmile.xpm \ block.xpm \ + block_small.xpm \ bold.xpm \ broken.xpm \ burp.xpm \ @@ -35,6 +36,7 @@ cry.xpm \ dt_icon.xpm \ download.xpm \ + edit.png \ embarrassed.xpm \ exit_small.xpm \ farted.xpm \ @@ -121,31 +123,34 @@ yell.xpm +gaimbuttonpixdir = $(datadir)/pixmaps/gaim/buttons +gaimbuttonpix_DATA = edit.png + if DISTRIB -gaimdistpixdir = $(datadir)/pixmaps/gaim -gaimdistpix_DATA = away.png connect.png msgpend.png offline.png online.png - -distpixmapdir = $(datadir)/pixmaps -distpixmap_DATA = gaim.xpm - -else + gaimdistpixdir = $(datadir)/pixmaps/gaim + gaimdistpix_DATA = away.png connect.png msgpend.png offline.png online.png -if GNOMEAPPLET - -gnomedata = `@GNOME_CONFIG@ --datadir` - -gaimdistpmdir = $(gnomedata)/pixmaps/gaim -gaimdistpm_DATA = away.png connect.png msgpend.png offline.png online.png - -gaimpixmapdir = $(gnomedata)/pixmaps -gaimpixmap_DATA = gaim.xpm + distpixmapdir = $(datadir)/pixmaps + distpixmap_DATA = gaim.png else -pixmapdir = $(datadir)/pixmaps -pixmap_DATA = gaim.xpm - -endif + if GNOMEAPPLET + + gnomedata = `@GNOME_CONFIG@ --datadir` + + gaimdistpmdir = $(gnomedata)/pixmaps/gaim + gaimdistpm_DATA = away.png connect.png msgpend.png offline.png online.png + + gaimpixmapdir = $(gnomedata)/pixmaps + gaimpixmap_DATA = gaim.png + + else + + pixmapdir = $(datadir)/pixmaps + pixmap_DATA = gaim.png + + endif endif