Mercurial > pidgin.yaz
changeset 776:626975d79bff
[gaim-migrate @ 786]
i'm not sure i want these, but they're much much better than the penguins/daemons
committer: Tailor Script <tailor@pidgin.im>
| author | Eric Warmenhoven <eric@warmenhoven.org> |
|---|---|
| date | Tue, 29 Aug 2000 00:44:32 +0000 |
| parents | 9614e69f68ca |
| children | 1d60fb2c3b3b |
| files | ChangeLog pixmaps/Makefile.am src/gnome_applet_mgr.c src/gnome_applet_mgr.h |
| diffstat | 4 files changed, 21 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Aug 28 23:47:29 2000 +0000 +++ b/ChangeLog Tue Aug 29 00:44:32 2000 +0000 @@ -24,6 +24,7 @@ * Added the S html tag. * Optionally Ignore TiK's Automated Messages * Option to beep instead of play sound + * New icons for panel (depends on some GNOME pixmaps) version 0.9.20 (07/14/2000): * More plugin events, more plugin features
--- a/pixmaps/Makefile.am Mon Aug 28 23:47:29 2000 +0000 +++ b/pixmaps/Makefile.am Tue Aug 29 00:44:32 2000 +0000 @@ -94,25 +94,25 @@ pixmap_DATA = gaim.xpm if GNOMEAPPLET -gnomesysconf = `@GNOME_CONFIG@ --sysconfdir` +#gnomesysconf = `@GNOME_CONFIG@ --sysconfdir` gnomedata = `@GNOME_CONFIG@ --datadir` gaimpixmapdir = $(gnomedata)/pixmaps gaimpixmap_DATA = gaim.xpm gaimgnomedir = $(gnomedata)/pixmaps/gaim/gnome -gaimgnome_DATA = -gaimgnomepixmapsdir = $(gnomedata)/pixmaps/gaim -gaimgnomepixmaps_DATA = gnome/penguin-online.png gnome/penguin-offline.png \ - gnome/penguin-connect.png gnome/devil-offline.png \ - gnome/devil-connect.png gnome/devil-online.png +#gaimgnome_DATA = +#gaimgnomepixmapsdir = $(gnomedata)/pixmaps/gaim +#gaimgnomepixmaps_DATA = gnome/penguin-online.png gnome/penguin-offline.png \ +# gnome/penguin-connect.png gnome/devil-offline.png \ +# gnome/devil-connect.png gnome/devil-online.png endif if DISTRIB pixmapdistribdir = $(datadir)/pixmaps pixmapdistrib_DATA = gaim.xpm -gnomedistribdir = $(datadir)/pixmaps/gaim/gnome -gnomedistrib_DATA = -gnomepixmapdistribdir = $(datadir)/pixmaps/gaim -gnomepixmapdistrib_DATA = gnome/penguin-online.png gnome/penguin-offline.png \ - gnome/penguin-connect.png gnome/devil-offline.png \ - gnome/devil-connect.png gnome/devil-online.png +#gnomedistribdir = $(datadir)/pixmaps/gaim/gnome +#gnomedistrib_DATA = +#gnomepixmapdistribdir = $(datadir)/pixmaps/gaim +#gnomepixmapdistrib_DATA = gnome/penguin-online.png gnome/penguin-offline.png \ +# gnome/penguin-connect.png gnome/devil-offline.png \ +# gnome/devil-connect.png gnome/devil-online.png endif
--- a/src/gnome_applet_mgr.c Mon Aug 28 23:47:29 2000 +0000 +++ b/src/gnome_applet_mgr.c Tue Aug 29 00:44:32 2000 +0000 @@ -41,9 +41,11 @@ gboolean applet_buddy_show = FALSE; GtkWidget *applet_popup = NULL; +/* gchar GAIM_GNOME_OFFLINE_ICON[255] = GAIM_GNOME_PENGUIN_OFFLINE; gchar GAIM_GNOME_CONNECT_ICON[255] = GAIM_GNOME_PENGUIN_CONNECT; gchar GAIM_GNOME_ONLINE_ICON[255] = GAIM_GNOME_PENGUIN_ONLINE; +*/ GtkWidget *applet; GtkWidget *appletframe; @@ -146,6 +148,7 @@ } void update_pixmaps() { + /* if (display_options & OPT_DISP_DEVIL_PIXMAPS) { sprintf(GAIM_GNOME_OFFLINE_ICON, "%s", GAIM_GNOME_DEVIL_OFFLINE); sprintf(GAIM_GNOME_CONNECT_ICON, "%s", GAIM_GNOME_DEVIL_CONNECT); @@ -155,6 +158,7 @@ sprintf(GAIM_GNOME_CONNECT_ICON, "%s", GAIM_GNOME_PENGUIN_CONNECT); sprintf(GAIM_GNOME_ONLINE_ICON, "%s", GAIM_GNOME_PENGUIN_ONLINE); } + */ load_applet_icon( GAIM_GNOME_OFFLINE_ICON, (sizehint-16), (sizehint-12), &icon_offline_pm, &icon_offline_bm ); load_applet_icon( GAIM_GNOME_CONNECT_ICON, (sizehint-16), (sizehint-12),
--- a/src/gnome_applet_mgr.h Mon Aug 28 23:47:29 2000 +0000 +++ b/src/gnome_applet_mgr.h Tue Aug 29 00:44:32 2000 +0000 @@ -61,6 +61,10 @@ #define GAIM_GNOME_PENGUIN_CONNECT "gaim/gnome/penguin-connect.png" #define GAIM_GNOME_PENGUIN_ONLINE "gaim/gnome/penguin-online.png" +#define GAIM_GNOME_OFFLINE_ICON "apple-red.png" +#define GAIM_GNOME_CONNECT_ICON "gnome-battery.png" +#define GAIM_GNOME_ONLINE_ICON "apple-green.png" + extern gint init_applet_mgr(); extern void applet_do_signon(AppletWidget *, gpointer); extern void make_buddy();