Mercurial > pidgin.yaz

changeset 4866:703e02e52262

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 5196] Added new typed and typing images to replace the gear. Missing stock icons now result in critical errors being shown. Restored the away button icon. Yay! You may now serve me cheese. committer: Tailor Script <tailor@pidgin.im>
author Christian Hammond <chipx86@chipx86.com>
date Sat, 22 Mar 2003 22:24:33 +0000
parents 3bc5a65728fb
children 6a0be79e9f71
files pixmaps/Makefile.am pixmaps/typed.png pixmaps/typing.png src/stock.c
diffstat 4 files changed, 9 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/pixmaps/Makefile.am	Sat Mar 22 21:56:48 2003 +0000
+++ b/pixmaps/Makefile.am	Sat Mar 22 22:24:33 2003 +0000
@@ -5,6 +5,7 @@
 		add.xpm				\
 		arrow_down.xpm			\
 		arrow_right.xpm			\
+		away.xpm                \
 		away.png			\
 		away_big.xpm			\
 		block.xpm			\
@@ -64,11 +65,13 @@
 		text_normal.png	\
 		text_smaller.png		\
 		tmp_send.xpm			\
+		typed.png               \
+		typing.png              \
 		warn.xpm			
 
 
 gaimbuttonpixdir = $(datadir)/pixmaps/gaim/buttons
-gaimbuttonpix_DATA = edit.png accounts.png change-bgcolor-small.png change-fgcolor-small.png signon.png preferences.png insert-image-small.png text_bigger.png text_smaller.png insert-link-small.png insert-smiley-small.png text_normal.png
+gaimbuttonpix_DATA = edit.png away.xpm accounts.png change-bgcolor-small.png change-fgcolor-small.png signon.png preferences.png insert-image-small.png text_bigger.png text_smaller.png insert-link-small.png insert-smiley-small.png text_normal.png
 
 gaimdialogpixdir = $(datadir)/pixmaps/gaim/dialogs
 gaimdialogpix_DATA = gaim_error.png gaim_info.png gaim_question.png gaim_warning.png gaim_cool.png gaim_auth.png
@@ -77,7 +80,7 @@
 gaimmenupix_DATA = insert-image-small.png about_menu.png import-menu.png accounts-menu.png insert-link-small.png
 
 gaimdistpixdir = $(datadir)/pixmaps/gaim
-gaimdistpix_DATA = away.png connect.png msgpend.png offline.png online.png msgunread.png logo.png tb_drag_arrow_down.xpm tb_drag_arrow_left.xpm tb_drag_arrow_right.xpm tb_drag_arrow_up.xpm
+gaimdistpix_DATA = away.png connect.png msgpend.png offline.png online.png msgunread.png logo.png tb_drag_arrow_down.xpm tb_drag_arrow_left.xpm tb_drag_arrow_right.xpm tb_drag_arrow_up.xpm typed.png typing.png
 
 distpixmapdir = $(datadir)/pixmaps
 distpixmap_DATA = gaim.png
Binary file pixmaps/typed.png has changed
Binary file pixmaps/typing.png has changed
--- a/src/stock.c	Sat Mar 22 21:56:48 2003 +0000
+++ b/src/stock.c	Sat Mar 22 22:24:33 2003 +0000
@@ -53,13 +53,13 @@
 	{ GAIM_STOCK_TEXT_BIGGER,   "buttons", "text_bigger.png"          },
 	{ GAIM_STOCK_TEXT_NORMAL,   "buttons", "text_normal.png"          },
 	{ GAIM_STOCK_TEXT_SMALLER,  "buttons", "text_smaller.png"         },
-	{ GAIM_STOCK_TYPED,         NULL,      GTK_STOCK_JUSTIFY_FILL     },
-	{ GAIM_STOCK_TYPING,        NULL,      GTK_STOCK_EXECUTE          },
+	{ GAIM_STOCK_TYPED,         "gaim",    "typed.png"                },
+	{ GAIM_STOCK_TYPING,        "gaim",    "typing.png"               },
 	{ GAIM_STOCK_UPLOAD,        NULL,      GTK_STOCK_GO_UP            },
 	{ GAIM_STOCK_WARN,          NULL,      GTK_STOCK_DIALOG_WARNING   },
 	{ GAIM_STOCK_IM,            NULL,      GTK_STOCK_CONVERT          },
 	{ GAIM_STOCK_CHAT,          NULL,      GTK_STOCK_JUMP_TO          },
-	{ GAIM_STOCK_AWAY,          "buttons",      "away.xpm"                 }
+	{ GAIM_STOCK_AWAY,          "buttons", "away.xpm"                 }
 };
 
 static gint stock_icon_count = sizeof(stock_icons) / sizeof(*stock_icons);
@@ -79,7 +79,7 @@
 									dir, base, NULL);
 
 	if (!g_file_test(filename, G_FILE_TEST_EXISTS)) {
-		debug_printf("Unable to load stock pixmap %s\n", base);
+		g_critical("Unable to load stock pixmap %s\n", base);
 
 		g_free(filename);