# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1247033198 0
# Node ID 1ce607bc4dcea15601a9fd8c80f2fcdfe9c44b20
# Parent  a712df376f19622d0198a6a5cb314d2610e034d2# Parent  e420ce16863046de25f481e00dd1d618da764153
merge of '4659790302e1226bf3dd9eb699c028d230304638'
     and '947111754d9b58f45801cb22f64596b1ed0a5a31'

diff -r a712df376f19 -r 1ce607bc4dce pidgin/gtkutils.c
--- a/pidgin/gtkutils.c	Wed Jul 08 04:33:25 2009 +0000
+++ b/pidgin/gtkutils.c	Wed Jul 08 06:06:38 2009 +0000
@@ -3698,7 +3698,7 @@
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 
 	/* Open Containing Directory */
-	img = gtk_image_new_from_stock(GTK_STOCK_COPY, GTK_ICON_SIZE_MENU);
+	img = gtk_image_new_from_stock(GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU);
 	item = gtk_image_menu_item_new_with_mnemonic(_("Open _Containing Directory"));
 	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), img);
 	g_signal_connect(G_OBJECT(item), "activate", G_CALLBACK(open_containing_cb), (gpointer)url);
@@ -3840,6 +3840,7 @@
 		gnome_url_handlers = NULL;
 		return;
 	}
+	gtk_imhtml_class_register_protocol("file://", NULL, NULL);
 
 	gtk_imhtml_class_register_protocol("http://", NULL, NULL);
 	gtk_imhtml_class_register_protocol("https://", NULL, NULL);