Skip to content

Commit ffb953f

Browse files
sc0wlukefromdc
authored andcommitted
caja-navigation-window-pane.c: avoid deprecated GtkImageMenuItem
avoid deprecated: gtk_image_menu_item_new_with_mnemonic gtk_image_menu_item_set_image
1 parent 9b6b0dc commit ffb953f

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

‎src/caja-navigation-window-pane.c‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
#include "caja-notebook.h"
3131
#include "caja-window-slot.h"
3232

33+
#include <eel/eel-gtk-extensions.h>
34+
3335
#include <libcaja-private/caja-global-preferences.h>
3436
#include <libcaja-private/caja-window-slot-info.h>
3537
#include <libcaja-private/caja-view-factory.h>
@@ -439,7 +441,6 @@ notebook_popup_menu_show (CajaNavigationWindowPane *pane,
439441
{
440442
GtkWidget *popup;
441443
GtkWidget *item;
442-
GtkWidget *image;
443444
int button, event_time;
444445
gboolean can_move_left, can_move_right;
445446
CajaNotebook *notebook;
@@ -451,7 +452,9 @@ notebook_popup_menu_show (CajaNavigationWindowPane *pane,
451452

452453
popup = gtk_menu_new();
453454

454-
item = gtk_menu_item_new_with_mnemonic (_("_New Tab"));
455+
gtk_menu_set_reserve_toggle_size (GTK_MENU (popup), FALSE);
456+
457+
item = eel_image_menu_item_new_from_icon (NULL, _("_New Tab"));
455458
g_signal_connect (item, "activate",
456459
G_CALLBACK (notebook_popup_menu_new_tab_cb),
457460
pane);
@@ -461,15 +464,15 @@ notebook_popup_menu_show (CajaNavigationWindowPane *pane,
461464
gtk_menu_shell_append (GTK_MENU_SHELL (popup),
462465
gtk_separator_menu_item_new ());
463466

464-
item = gtk_menu_item_new_with_mnemonic (_("Move Tab _Left"));
467+
item = eel_image_menu_item_new_from_icon (NULL, _("Move Tab _Left"));
465468
g_signal_connect (item, "activate",
466469
G_CALLBACK (notebook_popup_menu_move_left_cb),
467470
pane);
468471
gtk_menu_shell_append (GTK_MENU_SHELL (popup),
469472
item);
470473
gtk_widget_set_sensitive (item, can_move_left);
471474

472-
item = gtk_menu_item_new_with_mnemonic (_("Move Tab _Right"));
475+
item = eel_image_menu_item_new_from_icon (NULL, _("Move Tab _Right"));
473476
g_signal_connect (item, "activate",
474477
G_CALLBACK (notebook_popup_menu_move_right_cb),
475478
pane);
@@ -480,9 +483,8 @@ notebook_popup_menu_show (CajaNavigationWindowPane *pane,
480483
gtk_menu_shell_append (GTK_MENU_SHELL (popup),
481484
gtk_separator_menu_item_new ());
482485

483-
item = gtk_image_menu_item_new_with_mnemonic (_("_Close Tab"));
484-
image = gtk_image_new_from_icon_name ("window-close", GTK_ICON_SIZE_MENU);
485-
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
486+
item = eel_image_menu_item_new_from_icon ("window-close", _("_Close Tab"));
487+
486488
g_signal_connect (item, "activate",
487489
G_CALLBACK (notebook_popup_menu_close_cb), pane);
488490
gtk_menu_shell_append (GTK_MENU_SHELL (popup),

0 commit comments

Comments
 (0)