changeset 10219:f37516ae6a0b

[gaim-migrate @ 11347] The icon isn't quite the default size for a dialog icon. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Sat, 20 Nov 2004 19:36:22 +0000
parents 6071dfe17d14
children 69d5ed42919a
files src/gtkdialogs.c src/stock.c src/stock.h
diffstat 3 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/gtkdialogs.c	Sat Nov 20 18:57:59 2004 +0000
+++ b/src/gtkdialogs.c	Sat Nov 20 19:36:22 2004 +0000
@@ -399,7 +399,7 @@
 	GtkWidget *window;
 	GtkWidget *hbox;
 	GtkWidget *label;
-	GtkWidget *img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_COOL, GTK_ICON_SIZE_DIALOG);
+	GtkWidget *img;
 	gchar *norm = gaim_strreplace(ee, "rocksmyworld", "");
 
 	label = gtk_label_new(NULL);
@@ -447,6 +447,7 @@
 
 	hbox = gtk_hbox_new(FALSE, 12);
 	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(window)->vbox), hbox);
+	img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_COOL, gtk_icon_size_from_name(GAIM_ICON_SIZE_DIALOG_COOL));
 	gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
 
 	gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
--- a/src/stock.c	Sat Nov 20 18:57:59 2004 +0000
+++ b/src/stock.c	Sat Nov 20 19:36:22 2004 +0000
@@ -217,8 +217,9 @@
 
 	gtk_widget_destroy(win);
 
-	/* register logo icon size */
+	/* register custom icon sizes */
 	gtk_icon_size_register(GAIM_ICON_SIZE_LOGO, 330, 90);
+	gtk_icon_size_register(GAIM_ICON_SIZE_DIALOG_COOL, 40, 60);
 
 	g_object_unref(G_OBJECT(icon_factory));
 
--- a/src/stock.h	Sat Nov 20 18:57:59 2004 +0000
+++ b/src/stock.h	Sat Nov 20 19:36:22 2004 +0000
@@ -78,8 +78,9 @@
 /*@}*/
 
 /**
- * For getting the icon size for the logo
+ * For using icons that aren't one of the default GTK_ICON_SIZEs
  */
+#define GAIM_ICON_SIZE_DIALOG_COOL "gaim-icon-size-dialog-cool"
 #define GAIM_ICON_SIZE_LOGO        "gaim-icon-size-logo"
 
 /**