diff src/gtkutils.c @ 11525:b47708f46a38

[gaim-migrate @ 13773] Here's the rest of that custom smiley receiving patch, with some changes from me. I'm still not all that happy with it, but that's probably not the author's fault, and I don't have time to take it further right now. committer: Tailor Script <[e-mail]>

--- a/src/gtkutils.c	Mon Sep 12 06:50:29 2005 +0000
+++ b/src/gtkutils.c	Mon Sep 12 13:25:41 2005 +0000
@@ -57,6 +57,7 @@
 #include "gtkdialogs.h"
 #include "gtkimhtml.h"
 #include "gtkimhtmltoolbar.h"
+#include "gtkthemes.h"
 #include "gtkutils.h"
 
 static guint accels_save_timer = 0;
@@ -93,7 +94,7 @@
 	g_signal_connect(G_OBJECT(imhtml), "url_clicked",
 					 G_CALLBACK(url_clicked_cb), NULL);
 
-	smiley_themeize(imhtml);
+	gaim_gtkthemes_smiley_themeize(imhtml);
 
 	gtk_imhtml_set_funcs(GTK_IMHTML(imhtml), &gtkimhtml_cbs);
 }
@@ -241,7 +242,7 @@
 	gtk_label_set_pattern(GTK_LABEL(label), "_");
 	gtk_container_add(GTK_CONTAINER(menuitem), label);
 	gtk_widget_show(label);
-/* FIXME: Go back and fix this 
+/* FIXME: Go back and fix this
 	gtk_widget_add_accelerator(menuitem, "activate", accel, str[0],
 				   GDK_MOD1_MASK, GTK_ACCEL_LOCKED);
 */
@@ -1206,17 +1207,17 @@
 	monitor_num = gdk_screen_get_monitor_at_point (screen, *x, *y);
 
 	push_in = FALSE;
-  
+
 	/*
 	 * The placement of popup menus horizontally works like this (with
 	 * RTL in parentheses)
 	 *
 	 * - If there is enough room to the right (left) of the mouse cursor,
 	 *   position the menu there.
-	 * 
-	 * - Otherwise, if if there is enough room to the left (right) of the 
+	 *
+	 * - Otherwise, if if there is enough room to the left (right) of the
 	 *   mouse cursor, position the menu there.
-	 * 
+	 *
 	 * - Otherwise if the menu is smaller than the monitor, position it
 	 *   on the side of the mouse cursor that has the most space available
 	 *
@@ -1236,7 +1237,7 @@
 	/* position horizontally */
 
 	/* the amount of space we need to position the menu. Note the
-	 * menu is offset "xthickness" pixels 
+	 * menu is offset "xthickness" pixels
 	 */
 	needed_width = requisition.width - xthickness;
 
@@ -1300,7 +1301,7 @@
 			*y = *y - ythickness;
 		else
 			*y = *y + ythickness - requisition.height + 1;
- 
+
 		*y = CLAMP (*y, monitor.y,
 			   monitor.y + monitor.height - requisition.height);
 	}