From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49352) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WO39o-0007QF-L7 for qemu-devel@nongnu.org; Thu, 13 Mar 2014 06:46:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WO39i-0002Tm-NQ for qemu-devel@nongnu.org; Thu, 13 Mar 2014 06:46:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33473) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WO39i-0002TY-EX for qemu-devel@nongnu.org; Thu, 13 Mar 2014 06:46:30 -0400 From: Gerd Hoffmann Date: Thu, 13 Mar 2014 11:46:07 +0100 Message-Id: <1394707572-15112-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1394707572-15112-1-git-send-email-kraxel@redhat.com> References: <1394707572-15112-1-git-send-email-kraxel@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 2/7] gtk: Don't use deprecated gtk_image_menu_item_new_with_mnemonic List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Anthony Liguori , Cole Robinson From: Cole Robinson 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 =E2=80=98gd_create_menu_machine=E2=80=99: ui/gtk.c:1284:5: error: =E2=80=98gtk_image_menu_item_new_with_mnemonic=E2= =80=99 is deprecated (declared at /usr/include/gtk-3.0/gtk/deprecated/gtk= imagemenuitem.h:76): Use 'gtk_menu_item_new_with_mnemonic' instead [-Werr= or=3Ddeprecated-declarations] s->reset_item =3D gtk_image_menu_item_new_with_mnemonic(_("_Reset"))= ; ^ ui/gtk.c:1287:5: error: =E2=80=98gtk_image_menu_item_new_with_mnemonic=E2= =80=99 is deprecated (declared at /usr/include/gtk-3.0/gtk/deprecated/gtk= imagemenuitem.h:76): Use 'gtk_menu_item_new_with_mnemonic' instead [-Werr= or=3Ddeprecated-declarations] s->powerdown_item =3D gtk_image_menu_item_new_with_mnemonic(_("Power= _Down")); Signed-off-by: Cole Robinson Signed-off-by: Gerd Hoffmann --- ui/gtk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/gtk.c b/ui/gtk.c index 992f7d7..107860c 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -1281,10 +1281,10 @@ static GtkWidget *gd_create_menu_machine(GtkDispl= ayState *s, GtkAccelGroup *acce separator =3D gtk_separator_menu_item_new(); gtk_menu_shell_append(GTK_MENU_SHELL(machine_menu), separator); =20 - s->reset_item =3D gtk_image_menu_item_new_with_mnemonic(_("_Reset"))= ; + s->reset_item =3D gtk_menu_item_new_with_mnemonic(_("_Reset")); gtk_menu_shell_append(GTK_MENU_SHELL(machine_menu), s->reset_item); =20 - s->powerdown_item =3D gtk_image_menu_item_new_with_mnemonic(_("Power= _Down")); + s->powerdown_item =3D gtk_menu_item_new_with_mnemonic(_("Power _Down= ")); gtk_menu_shell_append(GTK_MENU_SHELL(machine_menu), s->powerdown_ite= m); =20 separator =3D gtk_separator_menu_item_new(); --=20 1.8.3.1