comparison: pidgin/gtkwebview.c
pidgin/gtkwebview.c
- changeset 37879
- 38eebb7c9019
- parent 37240
- d70b97846c13
- child 37993
- b84212f9f022
equal
deleted
inserted
replaced
| 37774:bf8ed95aaa1c | 37879:38eebb7c9019 |
|---|---|
| 837 show_clipboard = FALSE; | 837 show_clipboard = FALSE; |
| 838 } | 838 } |
| 839 | 839 |
| 840 if (show_clipboard) { | 840 if (show_clipboard) { |
| 841 /* Using connect_swapped means we don't need any wrapper functions */ | 841 /* Using connect_swapped means we don't need any wrapper functions */ |
| 842 cut = pidgin_new_item_from_stock(menu, _("Cu_t"), GTK_STOCK_CUT, | 842 cut = pidgin_new_menu_item(menu, _("Cu_t"), GTK_STOCK_CUT, |
| 843 NULL, NULL, 0, 0, NULL); | 843 NULL, NULL); |
| 844 g_signal_connect_swapped(G_OBJECT(cut), "activate", | 844 g_signal_connect_swapped(G_OBJECT(cut), "activate", |
| 845 G_CALLBACK(webkit_web_view_cut_clipboard), | 845 G_CALLBACK(webkit_web_view_cut_clipboard), |
| 846 webview); | 846 webview); |
| 847 | 847 |
| 848 copy = pidgin_new_item_from_stock(menu, _("_Copy"), GTK_STOCK_COPY, | 848 copy = pidgin_new_menu_item(menu, _("_Copy"), GTK_STOCK_COPY, |
| 849 NULL, NULL, 0, 0, NULL); | 849 NULL, NULL); |
| 850 g_signal_connect_swapped(G_OBJECT(copy), "activate", | 850 g_signal_connect_swapped(G_OBJECT(copy), "activate", |
| 851 G_CALLBACK(webkit_web_view_copy_clipboard), | 851 G_CALLBACK(webkit_web_view_copy_clipboard), |
| 852 webview); | 852 webview); |
| 853 | 853 |
| 854 paste = pidgin_new_item_from_stock(menu, _("_Paste"), GTK_STOCK_PASTE, | 854 paste = pidgin_new_menu_item(menu, _("_Paste"), GTK_STOCK_PASTE, |
| 855 NULL, NULL, 0, 0, NULL); | 855 NULL, NULL); |
| 856 g_signal_connect_swapped(G_OBJECT(paste), "activate", | 856 g_signal_connect_swapped(G_OBJECT(paste), "activate", |
| 857 G_CALLBACK(webkit_web_view_paste_clipboard), | 857 G_CALLBACK(webkit_web_view_paste_clipboard), |
| 858 webview); | 858 webview); |
| 859 | 859 |
| 860 delete = pidgin_new_item_from_stock(menu, _("_Delete"), GTK_STOCK_DELETE, | 860 delete = pidgin_new_menu_item(menu, _("_Delete"), GTK_STOCK_DELETE, |
| 861 NULL, NULL, 0, 0, NULL); | 861 NULL, NULL); |
| 862 g_signal_connect_swapped(G_OBJECT(delete), "activate", | 862 g_signal_connect_swapped(G_OBJECT(delete), "activate", |
| 863 G_CALLBACK(webkit_web_view_delete_selection), | 863 G_CALLBACK(webkit_web_view_delete_selection), |
| 864 webview); | 864 webview); |
| 865 | 865 |
| 866 pidgin_separator(menu); | 866 pidgin_separator(menu); |
| 867 | 867 |
| 868 select = pidgin_new_item_from_stock(menu, _("Select _All"), | 868 select = pidgin_new_menu_item(menu, _("Select _All"), |
| 869 GTK_STOCK_SELECT_ALL, | 869 GTK_STOCK_SELECT_ALL, NULL, NULL); |
| 870 NULL, NULL, 0, 0, NULL); | 870 g_signal_connect_swapped(G_OBJECT(select), "activate", |
| 871 g_signal_connect_swapped(G_OBJECT(select), "activate", | 871 G_CALLBACK(webkit_web_view_select_all), |
| 872 G_CALLBACK(webkit_web_view_select_all), | 872 webview); |
| 873 webview); | |
| 874 | 873 |
| 875 gtk_widget_set_sensitive(cut, | 874 gtk_widget_set_sensitive(cut, |
| 876 webkit_web_view_can_cut_clipboard(webview)); | 875 webkit_web_view_can_cut_clipboard(webview)); |
| 877 gtk_widget_set_sensitive(copy, | 876 gtk_widget_set_sensitive(copy, |
| 878 webkit_web_view_can_copy_clipboard(webview)); | 877 webkit_web_view_can_copy_clipboard(webview)); |
| 896 data->inspector = webkit_web_view_get_inspector(webview); | 895 data->inspector = webkit_web_view_get_inspector(webview); |
| 897 data->node = node; | 896 data->node = node; |
| 898 | 897 |
| 899 pidgin_separator(menu); | 898 pidgin_separator(menu); |
| 900 | 899 |
| 901 inspect = pidgin_new_item_from_stock(menu, _("Inspect _Element"), | 900 inspect = pidgin_new_menu_item(menu, _("Inspect _Element"), |
| 902 PIDGIN_STOCK_DEBUG, NULL, NULL, 0, 0, NULL); | 901 PIDGIN_STOCK_DEBUG, NULL, NULL); |
| 903 g_signal_connect_data(G_OBJECT(inspect), "activate", | 902 g_signal_connect_data(G_OBJECT(inspect), "activate", |
| 904 G_CALLBACK(webview_inspector_inspect_element), | 903 G_CALLBACK(webview_inspector_inspect_element), |
| 905 data, (GClosureNotify)g_free, 0); | 904 data, (GClosureNotify)g_free, 0); |
| 906 } | 905 } |
| 907 | 906 |
