From 5602a92f7fa70ee85937eec73a4c2bb923aadab5 Mon Sep 17 00:00:00 2001
Message-Id: <5602a92f7fa70ee85937eec73a4c2bb923aadab5.1715707282.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Thu, 7 Nov 2013 16:58:02 +0000
Subject: [PATCH] disobedience: more sensible naming in menu setup
Organization: Straylight/Edgeware

From: Richard Kettlewell <rjk@terraraq.org.uk>

---
 disobedience/menu.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/disobedience/menu.c b/disobedience/menu.c
index b398606..57f1865 100644
--- a/disobedience/menu.c
+++ b/disobedience/menu.c
@@ -235,7 +235,7 @@ static void menu_rights_changed(const char attribute((unused)) *event,
 }
 
 /** @brief Create the menu bar widget */
-GtkWidget *menubar(GtkWidget *w) {
+GtkWidget *menubar(GtkWidget *window) {
   GtkWidget *m;
 
   static const GtkItemFactoryEntry entries[] = {
@@ -425,7 +425,7 @@ GtkWidget *menubar(GtkWidget *w) {
                                 sizeof entries / sizeof *entries,
                                 (GtkItemFactoryEntry *)entries,
                                 0);
-  gtk_window_add_accel_group(GTK_WINDOW(w), accel);
+  gtk_window_add_accel_group(GTK_WINDOW(window), accel);
   selectall_widget = gtk_item_factory_get_widget(mainmenufactory,
 						 "<GdisorderMain>/Edit/Select all tracks");
   selectnone_widget = gtk_item_factory_get_widget(mainmenufactory,
-- 
[mdw]