From 54f1272d2145b2e2cfb6c650ffce5179645434e2 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Thu, 2 Jul 2015 11:58:49 -0400
Subject: [PATCH] fix a couple of issues with port rename callback (duplicate
 structure members, missing break statement)

---
 libjack/client.c | 5 +++--
 libjack/local.h  | 4 +---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/libjack/client.c b/libjack/client.c
index 3fa4f73..f00dee9 100644
--- a/libjack/client.c
+++ b/libjack/client.c
@@ -1885,9 +1885,10 @@ jack_client_process_events (jack_client_t* client)
                         if (key) {
                                 free (key);
                         }
+                        break;
                 case PortRename:
                         if (control->port_rename_cbset) {
-                                client->port_rename_cb (event.y.other_id, event.x.name, event.z.other_name, client->port_rename_cb_arg);
+                                client->port_rename_cb (event.y.other_id, event.x.name, event.z.other_name, client->port_rename_arg);
                         }
                         break;
 		}
@@ -2761,7 +2762,7 @@ jack_set_port_rename_callback (jack_client_t *client,
 		return -1;
 	}
 	client->port_rename_arg = arg;
-	client->port_rename = callback;
+	client->port_rename_cb = callback;
 	client->control->port_rename_cbset = (callback != NULL);
 	return 0;
 }
diff --git a/libjack/local.h b/libjack/local.h
index 7b63ce6..3f7f074 100644
--- a/libjack/local.h
+++ b/libjack/local.h
@@ -55,8 +55,6 @@ struct _jack_client {
     void *bufsize_arg;
     JackSampleRateCallback srate;
     void *srate_arg;
-    JackPortRenameCallback port_rename;
-    void *port_rename_arg;
     JackPortRegistrationCallback port_register;
     void *port_register_arg;
     JackPortConnectCallback port_connect;
@@ -82,7 +80,7 @@ struct _jack_client {
     JackPropertyChangeCallback property_cb;	
     void *property_cb_arg;
     JackPortRenameCallback port_rename_cb;
-    void *port_rename_cb_arg;
+    void *port_rename_arg;
 
     /* external clients: set by libjack
      * internal clients: set by engine */