Skip to content

Commit 3403ff7

Browse files
sc0wsc0w
committed
caja-places-sidebar.c: avoid deprecated GtkImageMenuItem
avoid deprecated: gtk_image_menu_item_new_with_mnemonic gtk_image_menu_item_new_with_label gtk_image_menu_item_set_image
1 parent 70ebaf4 commit 3403ff7

File tree

1 file changed

+19
-17
lines changed

1 file changed

+19
-17
lines changed

‎src/caja-places-sidebar.c‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2649,43 +2649,45 @@ bookmarks_build_popup_menu (CajaPlacesSidebar *sidebar)
26492649
}
26502650

26512651
sidebar->popup_menu = gtk_menu_new ();
2652+
2653+
gtk_menu_set_reserve_toggle_size (GTK_MENU (sidebar->popup_menu), FALSE);
2654+
26522655
gtk_menu_attach_to_widget (GTK_MENU (sidebar->popup_menu),
26532656
GTK_WIDGET (sidebar),
26542657
bookmarks_popup_menu_detach_cb);
26552658

2656-
item = gtk_image_menu_item_new_with_mnemonic (_("_Open"));
2657-
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item),
2658-
gtk_image_new_from_icon_name ("document-open", GTK_ICON_SIZE_MENU));
2659+
item = eel_image_menu_item_new_from_icon ("document-open", _("_Open"));
2660+
26592661
g_signal_connect (item, "activate",
26602662
G_CALLBACK (open_shortcut_cb), sidebar);
26612663
gtk_widget_show (item);
26622664
gtk_menu_shell_append (GTK_MENU_SHELL (sidebar->popup_menu), item);
26632665

2664-
item = gtk_menu_item_new_with_mnemonic (_("Open in New _Tab"));
2666+
item = eel_image_menu_item_new_from_icon (NULL, _("Open in New _Tab"));
26652667
sidebar->popup_menu_open_in_new_tab_item = item;
26662668
g_signal_connect (item, "activate",
26672669
G_CALLBACK (open_shortcut_in_new_tab_cb), sidebar);
26682670
gtk_widget_show (item);
26692671
gtk_menu_shell_append (GTK_MENU_SHELL (sidebar->popup_menu), item);
26702672

2671-
item = gtk_menu_item_new_with_mnemonic (_("Open in New _Window"));
2673+
item = eel_image_menu_item_new_from_icon (NULL, _("Open in New _Window"));
26722674
g_signal_connect (item, "activate",
26732675
G_CALLBACK (open_shortcut_in_new_window_cb), sidebar);
26742676
gtk_widget_show (item);
26752677
gtk_menu_shell_append (GTK_MENU_SHELL (sidebar->popup_menu), item);
26762678

26772679
eel_gtk_menu_append_separator (GTK_MENU (sidebar->popup_menu));
26782680

2679-
item = gtk_image_menu_item_new_with_label (_("Remove"));
2681+
item = eel_image_menu_item_new_from_icon ("list-remove", _("Remove"));
2682+
26802683
sidebar->popup_menu_remove_item = item;
2681-
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item),
2682-
gtk_image_new_from_icon_name ("list-remove", GTK_ICON_SIZE_MENU));
2684+
26832685
g_signal_connect (item, "activate",
26842686
G_CALLBACK (remove_shortcut_cb), sidebar);
26852687
gtk_widget_show (item);
26862688
gtk_menu_shell_append (GTK_MENU_SHELL (sidebar->popup_menu), item);
26872689

2688-
item = gtk_menu_item_new_with_label (_("Rename..."));
2690+
item = eel_image_menu_item_new_from_icon (NULL, _("Rename..."));
26892691
sidebar->popup_menu_rename_item = item;
26902692
g_signal_connect (item, "activate",
26912693
G_CALLBACK (rename_shortcut_cb), sidebar);
@@ -2697,49 +2699,49 @@ bookmarks_build_popup_menu (CajaPlacesSidebar *sidebar)
26972699
sidebar->popup_menu_separator_item =
26982700
GTK_WIDGET (eel_gtk_menu_append_separator (GTK_MENU (sidebar->popup_menu)));
26992701

2700-
item = gtk_menu_item_new_with_mnemonic (_("_Mount"));
2702+
item = eel_image_menu_item_new_from_icon (NULL, _("_Mount"));
27012703
sidebar->popup_menu_mount_item = item;
27022704
g_signal_connect (item, "activate",
27032705
G_CALLBACK (mount_shortcut_cb), sidebar);
27042706
gtk_widget_show (item);
27052707
gtk_menu_shell_append (GTK_MENU_SHELL (sidebar->popup_menu), item);
27062708

2707-
item = gtk_menu_item_new_with_mnemonic (_("_Unmount"));
2709+
item = eel_image_menu_item_new_from_icon (NULL, _("_Unmount"));
27082710
sidebar->popup_menu_unmount_item = item;
27092711
g_signal_connect (item, "activate",
27102712
G_CALLBACK (unmount_shortcut_cb), sidebar);
27112713
gtk_widget_show (item);
27122714
gtk_menu_shell_append (GTK_MENU_SHELL (sidebar->popup_menu), item);
27132715

2714-
item = gtk_menu_item_new_with_mnemonic (_("_Eject"));
2716+
item = eel_image_menu_item_new_from_icon (NULL, _("_Eject"));
27152717
sidebar->popup_menu_eject_item = item;
27162718
g_signal_connect (item, "activate",
27172719
G_CALLBACK (eject_shortcut_cb), sidebar);
27182720
gtk_widget_show (item);
27192721
gtk_menu_shell_append (GTK_MENU_SHELL (sidebar->popup_menu), item);
27202722

2721-
item = gtk_menu_item_new_with_mnemonic (_("_Detect Media"));
2723+
item = eel_image_menu_item_new_from_icon (NULL, _("_Detect Media"));
27222724
sidebar->popup_menu_rescan_item = item;
27232725
g_signal_connect (item, "activate",
27242726
G_CALLBACK (rescan_shortcut_cb), sidebar);
27252727
gtk_widget_show (item);
27262728
gtk_menu_shell_append (GTK_MENU_SHELL (sidebar->popup_menu), item);
27272729

2728-
item = gtk_menu_item_new_with_mnemonic (_("_Format"));
2730+
item = eel_image_menu_item_new_from_icon (NULL, _("_Format"));
27292731
sidebar->popup_menu_format_item = item;
27302732
g_signal_connect (item, "activate",
27312733
G_CALLBACK (format_shortcut_cb), sidebar);
27322734
gtk_widget_show (item);
27332735
gtk_menu_shell_append (GTK_MENU_SHELL (sidebar->popup_menu), item);
27342736

2735-
item = gtk_menu_item_new_with_mnemonic (_("_Start"));
2737+
item = eel_image_menu_item_new_from_icon (NULL, _("_Start"));
27362738
sidebar->popup_menu_start_item = item;
27372739
g_signal_connect (item, "activate",
27382740
G_CALLBACK (start_shortcut_cb), sidebar);
27392741
gtk_widget_show (item);
27402742
gtk_menu_shell_append (GTK_MENU_SHELL (sidebar->popup_menu), item);
27412743

2742-
item = gtk_menu_item_new_with_mnemonic (_("_Stop"));
2744+
item = eel_image_menu_item_new_from_icon (NULL, _("_Stop"));
27432745
sidebar->popup_menu_stop_item = item;
27442746
g_signal_connect (item, "activate",
27452747
G_CALLBACK (stop_shortcut_cb), sidebar);
@@ -2748,7 +2750,7 @@ bookmarks_build_popup_menu (CajaPlacesSidebar *sidebar)
27482750

27492751
/* Empty Trash menu item */
27502752

2751-
item = gtk_menu_item_new_with_mnemonic (_("Empty _Trash"));
2753+
item = eel_image_menu_item_new_from_icon (NULL, _("Empty _Trash"));
27522754
sidebar->popup_menu_empty_trash_item = item;
27532755
g_signal_connect (item, "activate",
27542756
G_CALLBACK (empty_trash_cb), sidebar);

0 commit comments

Comments
 (0)