pidgin.2.6.1: d6b02e6d: applied changes from f3fc028d9b3beec4d7d...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: d6b02e6d4a924e2081bcc6b126a9e849918331fe
Ancestor: c689082b1715bc80b3e6d362263e2c9a434dab2c
Author: markdoliner at pidgin.im
Date: 2009-08-19T00:40:53
Branch: im.pidgin.pidgin.2.6.1
URL: http://d.pidgin.im/viewmtn/revision/info/d6b02e6d4a924e2081bcc6b126a9e849918331fe

Modified files:
        pidgin/gtkutils.c

ChangeLog: 

applied changes from f3fc028d9b3beec4d7d987c7b04796f22b6f4bf6
             through d2383e911ebba694cd695847354d51d2fff2fbaf

Plucked this revision from im.pidgin.pidgin
Original commit message:

More fixes for Gtk < 2.6

-------------- next part --------------
============================================================
--- pidgin/gtkutils.c	d5ad48e7bc73be72da53753acf30e558c0213696
+++ pidgin/gtkutils.c	439850f3e9de4db4a560eb82525b7229b687961c
@@ -3699,9 +3699,13 @@ file_context_menu(GtkIMHtml *imhtml, Gtk
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 
 	/* Open Containing Directory */
+#if GTK_CHECK_VERSION(2,6,0)
 	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);
+#else
+	item = gtk_menu_item_new_with_mnemonic(_("Open _Containing Directory"));
+#endif
 	g_signal_connect(G_OBJECT(item), "activate", G_CALLBACK(open_containing_cb), (gpointer)url);
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 
@@ -3767,9 +3771,13 @@ audio_context_menu(GtkIMHtml *imhtml, Gt
 	url = gtk_imhtml_link_get_url(link);
 
 	/* Play Sound */
+#if GTK_CHECK_VERSION(2,6,0)
 	img = gtk_image_new_from_stock(GTK_STOCK_MEDIA_PLAY, GTK_ICON_SIZE_MENU);
 	item = gtk_image_menu_item_new_with_mnemonic(_("_Play Sound"));
 	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), img);
+#else
+	item = gtk_menu_item_new_with_mnemonic(_("_Play Sound"));
+#endif
 	g_signal_connect_swapped(G_OBJECT(item), "activate", G_CALLBACK(gtk_imhtml_link_activate), link);
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);