comparison pidgin/gtkutils.c @ 29693:7925bb7f2aa7

propagate from branch 'im.pidgin.pidgin' (head 92e101e3698042e7600729bc09dec9e28f81de8f) to branch 'im.pidgin.cpw.attention_ui' (head 563c35d20efcc234a74567ebb88c059d10ce1e09)
author Marcus Lundblad <ml@update.uu.se>
date Mon, 24 Aug 2009 19:23:56 +0000
parents d4036e0f58d6
children dfd8d82313be 07718e5eb8ce 2dcff225172e
comparison
equal deleted inserted replaced
29692:fb99a0067812 29693:7925bb7f2aa7
3697 gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), img); 3697 gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), img);
3698 g_signal_connect_swapped(G_OBJECT(item), "activate", G_CALLBACK(gtk_imhtml_link_activate), link); 3698 g_signal_connect_swapped(G_OBJECT(item), "activate", G_CALLBACK(gtk_imhtml_link_activate), link);
3699 gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); 3699 gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
3700 3700
3701 /* Open Containing Directory */ 3701 /* Open Containing Directory */
3702 #if GTK_CHECK_VERSION(2,6,0)
3702 img = gtk_image_new_from_stock(GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU); 3703 img = gtk_image_new_from_stock(GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU);
3703 item = gtk_image_menu_item_new_with_mnemonic(_("Open _Containing Directory")); 3704 item = gtk_image_menu_item_new_with_mnemonic(_("Open _Containing Directory"));
3704 gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), img); 3705 gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), img);
3706 #else
3707 item = gtk_menu_item_new_with_mnemonic(_("Open _Containing Directory"));
3708 #endif
3705 g_signal_connect(G_OBJECT(item), "activate", G_CALLBACK(open_containing_cb), (gpointer)url); 3709 g_signal_connect(G_OBJECT(item), "activate", G_CALLBACK(open_containing_cb), (gpointer)url);
3706 gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); 3710 gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
3707 3711
3708 return TRUE; 3712 return TRUE;
3709 } 3713 }
3765 return TRUE; 3769 return TRUE;
3766 3770
3767 url = gtk_imhtml_link_get_url(link); 3771 url = gtk_imhtml_link_get_url(link);
3768 3772
3769 /* Play Sound */ 3773 /* Play Sound */
3774 #if GTK_CHECK_VERSION(2,6,0)
3770 img = gtk_image_new_from_stock(GTK_STOCK_MEDIA_PLAY, GTK_ICON_SIZE_MENU); 3775 img = gtk_image_new_from_stock(GTK_STOCK_MEDIA_PLAY, GTK_ICON_SIZE_MENU);
3771 item = gtk_image_menu_item_new_with_mnemonic(_("_Play Sound")); 3776 item = gtk_image_menu_item_new_with_mnemonic(_("_Play Sound"));
3772 gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), img); 3777 gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), img);
3778 #else
3779 item = gtk_menu_item_new_with_mnemonic(_("_Play Sound"));
3780 #endif
3773 g_signal_connect_swapped(G_OBJECT(item), "activate", G_CALLBACK(gtk_imhtml_link_activate), link); 3781 g_signal_connect_swapped(G_OBJECT(item), "activate", G_CALLBACK(gtk_imhtml_link_activate), link);
3774 gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); 3782 gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
3775 3783
3776 /* Save File */ 3784 /* Save File */
3777 img = gtk_image_new_from_stock(GTK_STOCK_SAVE, GTK_ICON_SIZE_MENU); 3785 img = gtk_image_new_from_stock(GTK_STOCK_SAVE, GTK_ICON_SIZE_MENU);