From patchwork Thu Oct 30 19:34:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cole Robinson X-Patchwork-Id: 39939 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f197.google.com (mail-lb0-f197.google.com [209.85.217.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id ADE9A2405B for ; Fri, 31 Oct 2014 16:19:31 +0000 (UTC) Received: by mail-lb0-f197.google.com with SMTP id b6sf2976449lbj.4 for ; Fri, 31 Oct 2014 09:19:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:in-reply-to:references:cc:subject :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=f/7dIy6k++dqIwdfyMENIEOvxjQOnIJUeEc6h9wWD4M=; b=P/4MLIJ12Yd9IO9aoLj4rxVKoQLSQrZFyZKX1YvMl5+AdqR5tDVaNZSOdR97Rk0D/3 52N19z0VHiC4bewY3WM9/sh+wl1HjC1iOikR8ZeHqwi65P/k6yBsH/5c8D8xkXdKp1PX pjPKtY7aB1J6N9Bz9xuRoegbWcnVob9XbA64peZK3CU0Auf3VNMApmW/OfxEtQS2fc1b X8DK0vrF5ZOugshLOTpAVP0CUqXAFB0uPfmtuN3DsyaNb5WxR/wH9MadGoISXDOSDqZF bS/VQm+d7nekioDA4Cxkdm3IN4K33xEGu2d4wuwyoX+A+Yvxi8gAY7v1Q0KhSDUJ/mCp vm5A== X-Gm-Message-State: ALoCoQlchkxP6qW3O8SJEXEwKWdJWKc0I0D3bZVF0Jo0PnRvZENQZzvWlQFD80y6zJ03H4UowlXA X-Received: by 10.180.93.35 with SMTP id cr3mr808996wib.2.1414772370527; Fri, 31 Oct 2014 09:19:30 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.197.100 with SMTP id it4ls501157lac.7.gmail; Fri, 31 Oct 2014 09:19:30 -0700 (PDT) X-Received: by 10.152.203.164 with SMTP id kr4mr24126070lac.31.1414772370223; Fri, 31 Oct 2014 09:19:30 -0700 (PDT) Received: from mail-lb0-f177.google.com (mail-lb0-f177.google.com. [209.85.217.177]) by mx.google.com with ESMTPS id nu7si17524803lbb.18.2014.10.31.09.19.30 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 31 Oct 2014 09:19:30 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) client-ip=209.85.217.177; Received: by mail-lb0-f177.google.com with SMTP id 10so6359116lbg.36 for ; Fri, 31 Oct 2014 09:19:30 -0700 (PDT) X-Received: by 10.112.130.41 with SMTP id ob9mr26934889lbb.74.1414772370009; Fri, 31 Oct 2014 09:19:30 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.84.229 with SMTP id c5csp227231lbz; Fri, 31 Oct 2014 09:19:29 -0700 (PDT) X-Received: by 10.140.23.198 with SMTP id 64mr36534287qgp.62.1414772368607; Fri, 31 Oct 2014 09:19:28 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id x8si17829254qab.21.2014.10.31.09.19.28 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 31 Oct 2014 09:19:28 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:38836 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XkEv9-0007JA-KE for patch@linaro.org; Fri, 31 Oct 2014 12:19:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34383) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XkE8u-0000oO-6t for qemu-devel@nongnu.org; Fri, 31 Oct 2014 11:32:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XjvUm-0005ep-Gy for qemu-devel@nongnu.org; Thu, 30 Oct 2014 15:35:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37787) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XjvUm-0005eY-9o for qemu-devel@nongnu.org; Thu, 30 Oct 2014 15:34:56 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s9UJYmfA002906 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 30 Oct 2014 15:34:48 -0400 Received: from colepc.home.com ([10.3.113.2]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s9UJYkFN015792; Thu, 30 Oct 2014 15:34:47 -0400 From: Cole Robinson To: qemu-devel@nongnu.org Date: Thu, 30 Oct 2014 15:34:32 -0400 Message-Id: <35ab277f143a8d5a53b1793e9389f19db12b6154.1414697380.git.crobinso@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: manday@gmx.net, Gerd Hoffmann , Cole Robinson Subject: [Qemu-devel] [PATCH 1/4] gtk: Grab accel_group from GtkDisplayState X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: crobinso@redhat.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Rather than needlessly pass it around Signed-off-by: Cole Robinson --- ui/gtk.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/ui/gtk.c b/ui/gtk.c index a5f6869..97ac4c9 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -1605,13 +1605,13 @@ static void gd_connect_signals(GtkDisplayState *s) G_CALLBACK(gd_change_page), s); } -static GtkWidget *gd_create_menu_machine(GtkDisplayState *s, GtkAccelGroup *accel_group) +static GtkWidget *gd_create_menu_machine(GtkDisplayState *s) { GtkWidget *machine_menu; GtkWidget *separator; machine_menu = gtk_menu_new(); - gtk_menu_set_accel_group(GTK_MENU(machine_menu), accel_group); + gtk_menu_set_accel_group(GTK_MENU(machine_menu), s->accel_group); s->pause_item = gtk_check_menu_item_new_with_mnemonic(_("_Pause")); gtk_menu_shell_append(GTK_MENU_SHELL(machine_menu), s->pause_item); @@ -1692,7 +1692,7 @@ static GSList *gd_vc_gfx_init(GtkDisplayState *s, VirtualConsole *vc, return group; } -static GtkWidget *gd_create_menu_view(GtkDisplayState *s, GtkAccelGroup *accel_group) +static GtkWidget *gd_create_menu_view(GtkDisplayState *s) { GSList *group = NULL; GtkWidget *view_menu; @@ -1701,7 +1701,7 @@ static GtkWidget *gd_create_menu_view(GtkDisplayState *s, GtkAccelGroup *accel_g int vc; view_menu = gtk_menu_new(); - gtk_menu_set_accel_group(GTK_MENU(view_menu), accel_group); + gtk_menu_set_accel_group(GTK_MENU(view_menu), s->accel_group); s->full_screen_item = gtk_menu_item_new_with_mnemonic(_("_Fullscreen")); gtk_menu_item_set_accel_path(GTK_MENU_ITEM(s->full_screen_item), @@ -1783,11 +1783,9 @@ static GtkWidget *gd_create_menu_view(GtkDisplayState *s, GtkAccelGroup *accel_g static void gd_create_menus(GtkDisplayState *s) { - GtkAccelGroup *accel_group; - - accel_group = gtk_accel_group_new(); - s->machine_menu = gd_create_menu_machine(s, accel_group); - s->view_menu = gd_create_menu_view(s, accel_group); + s->accel_group = gtk_accel_group_new(); + s->machine_menu = gd_create_menu_machine(s); + s->view_menu = gd_create_menu_view(s); s->machine_menu_item = gtk_menu_item_new_with_mnemonic(_("_Machine")); gtk_menu_item_set_submenu(GTK_MENU_ITEM(s->machine_menu_item), @@ -1798,9 +1796,8 @@ static void gd_create_menus(GtkDisplayState *s) gtk_menu_item_set_submenu(GTK_MENU_ITEM(s->view_menu_item), s->view_menu); gtk_menu_shell_append(GTK_MENU_SHELL(s->menu_bar), s->view_menu_item); - g_object_set_data(G_OBJECT(s->window), "accel_group", accel_group); - gtk_window_add_accel_group(GTK_WINDOW(s->window), accel_group); - s->accel_group = accel_group; + g_object_set_data(G_OBJECT(s->window), "accel_group", s->accel_group); + gtk_window_add_accel_group(GTK_WINDOW(s->window), s->accel_group); } static void gd_set_keycode_type(GtkDisplayState *s)