Skip to content

Commit

Permalink
caja-side-pane.c: avoid deprecated GtkImageMenuItem
Browse files Browse the repository at this point in the history
avoid deprecated:

gtk_image_menu_item_new_with_label
gtk_image_menu_item_set_image
  • Loading branch information
sc0w committed Apr 2, 2018
1 parent ffb953f commit d20ceac
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions src/caja-side-pane.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include "caja-side-pane.h"

#include <eel/eel-glib-extensions.h>
#include <eel/eel-gtk-extensions.h>
#include <eel/eel-gtk-macros.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
Expand Down Expand Up @@ -391,6 +392,9 @@ caja_side_pane_init (GObject *object)
TRUE, TRUE, 0);

side_pane->details->menu = gtk_menu_new ();

gtk_menu_set_reserve_toggle_size (GTK_MENU (side_pane->details->menu), FALSE);

g_signal_connect (side_pane->details->menu,
"deactivate",
G_CALLBACK (menu_deactivate_callback),
Expand Down Expand Up @@ -467,7 +471,8 @@ caja_side_pane_add_panel (CajaSidePane *side_pane,

gtk_widget_show (widget);

panel->menu_item = gtk_image_menu_item_new_with_label (title);
panel->menu_item = eel_image_menu_item_new_from_icon (NULL, title);

gtk_widget_show (panel->menu_item);
gtk_menu_shell_append (GTK_MENU_SHELL (side_pane->details->menu),
panel->menu_item);
Expand Down Expand Up @@ -608,9 +613,6 @@ caja_side_pane_set_panel_image (CajaSidePane *side_pane,
image = NULL;
}

gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (panel->menu_item),
image);

if (panel->shortcut)
{
gtk_widget_destroy (panel->shortcut);
Expand Down

0 comments on commit d20ceac

Please sign in to comment.