# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1227768843 0
# Node ID 24486313650462364357a7fc18aa9ea6ef277528
# Parent  9895d55d3877d46d5a7ff3cd85b6747c1f514de9
Clean up the merge I just did.

diff -r 9895d55d3877 -r 244863136504 pidgin/pidginstock.c
--- a/pidgin/pidginstock.c	Thu Nov 27 06:46:25 2008 +0000
+++ b/pidgin/pidginstock.c	Thu Nov 27 06:54:03 2008 +0000
@@ -321,7 +321,7 @@
 {
 	const gchar *file, *dir;
 	gchar *file_full = NULL;
-    gchar *tmp;
+	gchar *tmp;
 
 	if (theme != NULL) {
 		file = pidgin_icon_theme_get_icon(PIDGIN_ICON_THEME(theme), sized_icon.name);
@@ -353,7 +353,6 @@
 		const char *size, SizedStockIcon sized_icon, gboolean translucent)
 {
 	char *filename;
-	char *subpath;
 	GtkIconSource *source;
 	GdkPixbuf *pixbuf;
 
@@ -394,7 +393,7 @@
 			do_alphashift(pixbuf, pixbuf);
 
 		source = gtk_icon_source_new();
-        gtk_icon_source_set_pixbuf(source, pixbuf);
+		gtk_icon_source_set_pixbuf(source, pixbuf);
 		gtk_icon_source_set_filename(source, filename);
 		gtk_icon_source_set_direction(source, GTK_TEXT_DIR_RTL);
 		gtk_icon_source_set_size(source, sizeid);