pidgin.next.minor: 0bc630b4: Clean up the merge I just did.

[rlaager at pidgin.im]

-----------------------------------------------------------------
Revision: 0bc630b4c58beab06485f17e1633164d548ca68a
Ancestor: 6397f513b63c6515b0fd91361c40f3fa15f7d6f4
Author: rlaager at pidgin.im
Date: 2008-11-27T06:54:03
Branch: im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/0bc630b4c58beab06485f17e1633164d548ca68a

Modified files:
        pidgin/pidginstock.c

ChangeLog: 

Clean up the merge I just did.

-------------- next part --------------
============================================================
--- pidgin/pidginstock.c	cb30d38a987b8d094276d261ffd047a01bde4b4b
+++ pidgin/pidginstock.c	2d613695051711063b0596b1910354f009f0c8f0
@@ -321,7 +321,7 @@ find_icon_file(PidginStatusIconTheme *th
 {
 	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 @@ add_sized_icon(GtkIconSet *iconset, GtkI
 		const char *size, SizedStockIcon sized_icon, gboolean translucent)
 {
 	char *filename;
-	char *subpath;
 	GtkIconSource *source;
 	GdkPixbuf *pixbuf;
 
@@ -394,7 +393,7 @@ add_sized_icon(GtkIconSet *iconset, GtkI
 			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);