# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1106422830 0
# Node ID 74180743304a780c297d595caf8b9a9df4ce6e6f
# Parent  c047cf7e18baa16b8781e47412475f0df6e3f07c
[gaim-migrate @ 11890]
Compile warning fix and get rid of some extra whitespace

committer: Tailor Script <tailor@pidgin.im>

diff -r c047cf7e18ba -r 74180743304a src/gtkconv.c
--- a/src/gtkconv.c	Sat Jan 22 05:22:48 2005 +0000
+++ b/src/gtkconv.c	Sat Jan 22 19:40:30 2005 +0000
@@ -5207,28 +5207,28 @@
 		g_object_ref(G_OBJECT(smiley->icon));
 
 	gtk_imhtml_associate_smiley(GTK_IMHTML(gtkconv->imhtml), sml, smiley);
-	
+
 	return TRUE;
 }
 
-static void 
+static void
 gaim_gtkconv_custom_smiley_write(GaimConversation *conv, const char *smile,
                                       const char * data, gint64 size)
 {
 	GaimGtkConversation *gtkconv;
 	GtkIMHtmlSmiley *smiley;
-	GdkPixbufLoader *loader;	
+	GdkPixbufLoader *loader;
 	const char *sml;
 
 	sml = gaim_account_get_protocol_name(conv->account);
 	gtkconv = GAIM_GTK_CONVERSATION(conv);
 	smiley = gtk_imhtml_smiley_get(GTK_IMHTML(gtkconv->imhtml), sml, smile);
 
-	if (!smiley) 
+	if (!smiley)
 		return;
-	
+
 	loader = smiley->loader;
-	if (!loader) 
+	if (!loader)
 		return;
 
 	gdk_pixbuf_loader_write(loader, data, size, NULL);
@@ -5249,14 +5249,14 @@
 	gtkconv = GAIM_GTK_CONVERSATION(conv);
 	smiley = gtk_imhtml_smiley_get(GTK_IMHTML(gtkconv->imhtml), sml, smile);
 
-	if (!smiley) 
+	if (!smiley)
 		return;
 
 	loader = smiley->loader;
 
-	if (!loader) 
+	if (!loader)
 		return;
-	
+
 	gaim_debug_info("gtkconv", "About to close the smiley pixbuf\n");
 
 	gdk_pixbuf_loader_close(loader, NULL);
diff -r c047cf7e18ba -r 74180743304a src/gtkimhtml.c
--- a/src/gtkimhtml.c	Sat Jan 22 05:22:48 2005 +0000
+++ b/src/gtkimhtml.c	Sat Jan 22 19:40:30 2005 +0000
@@ -1484,7 +1484,7 @@
 
 void
 gtk_imhtml_associate_smiley (GtkIMHtml       *imhtml,
-			     gchar           *sml,
+			     const gchar     *sml,
 			     GtkIMHtmlSmiley *smiley)
 {
 	GtkSmileyTree *tree;
diff -r c047cf7e18ba -r 74180743304a src/gtkimhtml.h
--- a/src/gtkimhtml.h	Sat Jan 22 05:22:48 2005 +0000
+++ b/src/gtkimhtml.h	Sat Jan 22 19:40:30 2005 +0000
@@ -265,7 +265,7 @@
  * @param sml    The name of the smiley category.
  * @param smiley The GtkIMSmiley to associate.
  */
-void gtk_imhtml_associate_smiley(GtkIMHtml *imhtml, gchar *sml, GtkIMHtmlSmiley *smiley);
+void gtk_imhtml_associate_smiley(GtkIMHtml *imhtml, const gchar *sml, GtkIMHtmlSmiley *smiley);
 
 /**
  * Removes all smileys associated with a GTK IM/HTML.