Skip to content

Commit d20ceac

Browse files
committed
caja-side-pane.c: avoid deprecated GtkImageMenuItem
avoid deprecated: gtk_image_menu_item_new_with_label gtk_image_menu_item_set_image
1 parent ffb953f commit d20ceac

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

src/caja-side-pane.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include "caja-side-pane.h"
2626

2727
#include <eel/eel-glib-extensions.h>
28+
#include <eel/eel-gtk-extensions.h>
2829
#include <eel/eel-gtk-macros.h>
2930
#include <gdk/gdkkeysyms.h>
3031
#include <gtk/gtk.h>
@@ -391,6 +392,9 @@ caja_side_pane_init (GObject *object)
391392
TRUE, TRUE, 0);
392393

393394
side_pane->details->menu = gtk_menu_new ();
395+
396+
gtk_menu_set_reserve_toggle_size (GTK_MENU (side_pane->details->menu), FALSE);
397+
394398
g_signal_connect (side_pane->details->menu,
395399
"deactivate",
396400
G_CALLBACK (menu_deactivate_callback),
@@ -467,7 +471,8 @@ caja_side_pane_add_panel (CajaSidePane *side_pane,
467471

468472
gtk_widget_show (widget);
469473

470-
panel->menu_item = gtk_image_menu_item_new_with_label (title);
474+
panel->menu_item = eel_image_menu_item_new_from_icon (NULL, title);
475+
471476
gtk_widget_show (panel->menu_item);
472477
gtk_menu_shell_append (GTK_MENU_SHELL (side_pane->details->menu),
473478
panel->menu_item);
@@ -608,9 +613,6 @@ caja_side_pane_set_panel_image (CajaSidePane *side_pane,
608613
image = NULL;
609614
}
610615

611-
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (panel->menu_item),
612-
image);
613-
614616
if (panel->shortcut)
615617
{
616618
gtk_widget_destroy (panel->shortcut);

0 commit comments

Comments
 (0)