# HG changeset patch # User Sean Egan # Date 1028263573 0 # Node ID 7c3638a2e5ac008300ac1cea121a5dd78ba358f6 # Parent b1cdee27ef02eaafc1e4b5bf58a9b51fad516dfb [gaim-migrate @ 3382] The beginning of new gtk2 .png icons and replace our gaim.xpm desktop icon with the purty .png committer: Tailor Script diff -r b1cdee27ef02 -r 7c3638a2e5ac pixmaps/Makefile.am --- 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 diff -r b1cdee27ef02 -r 7c3638a2e5ac pixmaps/edit.png Binary file pixmaps/edit.png has changed diff -r b1cdee27ef02 -r 7c3638a2e5ac pixmaps/gaim.png Binary file pixmaps/gaim.png has changed