summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCole Robinson2014-03-17 21:06:24 +0100
committerGerd Hoffmann2014-04-29 10:46:30 +0200
commit9068f20dfbc8e24afe467ce568dc30049b520652 (patch)
tree2fe59e6c73b3560c04ad76d00818ab3dfeff8fee
parentconfigure: Re-run make if gtkabi/sdlabi is changed (diff)
downloadqemu-9068f20dfbc8e24afe467ce568dc30049b520652.tar.gz
qemu-9068f20dfbc8e24afe467ce568dc30049b520652.tar.xz
qemu-9068f20dfbc8e24afe467ce568dc30049b520652.zip
gtk: Don't use deprecated gtk_image_menu_item_new_with_mnemonic
In these cases we weren't using an image in the menu item anyways, so just do as the suggestion says. Should be fine for all qemu supported gtk versions. ui/gtk.c: In function ‘gd_create_menu_machine’: ui/gtk.c:1284:5: error: ‘gtk_image_menu_item_new_with_mnemonic’ is deprecated (declared at /usr/include/gtk-3.0/gtk/deprecated/gtkimagemenuitem.h:76): Use 'gtk_menu_item_new_with_mnemonic' instead [-Werror=deprecated-declarations] s->reset_item = gtk_image_menu_item_new_with_mnemonic(_("_Reset")); ^ ui/gtk.c:1287:5: error: ‘gtk_image_menu_item_new_with_mnemonic’ is deprecated (declared at /usr/include/gtk-3.0/gtk/deprecated/gtkimagemenuitem.h:76): Use 'gtk_menu_item_new_with_mnemonic' instead [-Werror=deprecated-declarations] s->powerdown_item = gtk_image_menu_item_new_with_mnemonic(_("Power _Down")); Signed-off-by: Cole Robinson <crobinso@redhat.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-rw-r--r--ui/gtk.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/gtk.c b/ui/gtk.c
index 00fbbccb34..a56678f5ec 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -1362,10 +1362,10 @@ static GtkWidget *gd_create_menu_machine(GtkDisplayState *s, GtkAccelGroup *acce
separator = gtk_separator_menu_item_new();
gtk_menu_shell_append(GTK_MENU_SHELL(machine_menu), separator);
- s->reset_item = gtk_image_menu_item_new_with_mnemonic(_("_Reset"));
+ s->reset_item = gtk_menu_item_new_with_mnemonic(_("_Reset"));
gtk_menu_shell_append(GTK_MENU_SHELL(machine_menu), s->reset_item);
- s->powerdown_item = gtk_image_menu_item_new_with_mnemonic(_("Power _Down"));
+ s->powerdown_item = gtk_menu_item_new_with_mnemonic(_("Power _Down"));
gtk_menu_shell_append(GTK_MENU_SHELL(machine_menu), s->powerdown_item);
separator = gtk_separator_menu_item_new();