Correction from John.

diff --git a/encoder_menu.c b/encoder_menu.c
index 66b6b2fa2bc64925d19dc6e5744af6928d4e4196..56958b8f782c1e20a462cfc19adab291531359f4 100644 (file)
--- a/encoder_menu.c
+++ b/encoder_menu.c
@@ -62,7 +62,7 @@ static gboolean delete_event(GtkWidget *widget, GdkEvent *event, gpointer user_d
 
 static gboolean encoder_bottom_cb(GtkWidget *widget, GdkEvent *event, gpointer data) {
   int en=GPOINTER_TO_INT(data);
-  int action=action_dialog(top_window,CONTROLLER_ENCODER,encoders[en].bottom_encoder_function);
+  int action=action_dialog(dialog,CONTROLLER_ENCODER,encoders[en].bottom_encoder_function);
   gtk_button_set_label(GTK_BUTTON(widget),ActionTable[action].str);
   encoders[en].bottom_encoder_function=action;
   return TRUE;

diff --git a/switch_menu.c b/switch_menu.c
index 94bee0dd9b33ac30b06b195aaa9fa052a8609351..fb22a7099bf580d5dc8276d59b696873fea72fe4 100644 (file)
--- a/switch_menu.c
+++ b/switch_menu.c
@@ -70,7 +70,7 @@ void switch_page_cb(GtkNotebook *notebook,GtkWidget *page,guint page_num,gpointe
 
 static gboolean switch_cb(GtkWidget *widget, GdkEvent *event, gpointer data) {
   int sw=GPOINTER_TO_INT(data);
-  int action=action_dialog(top_window,CONTROLLER_SWITCH,temp_switches[sw].switch_function);
+  int action=action_dialog(dialog,CONTROLLER_SWITCH,temp_switches[sw].switch_function);
   gtk_button_set_label(GTK_BUTTON(widget),ActionTable[action].str);
   temp_switches[sw].switch_function=action;
   update_toolbar_labels();

diff --git a/toolbar_menu.c b/toolbar_menu.c
index 4dd2cc5eed46c9b5e4a0f4cd9d43e526ca17cc3b..2913b44dd5100ddc6fcb1f009606be8a1a6bea40 100644 (file)
--- a/toolbar_menu.c
+++ b/toolbar_menu.c
@@ -71,7 +71,7 @@ static void switch_page_cb(GtkNotebook *notebook,GtkWidget *page,guint page_num,
 
 static gboolean switch_cb(GtkWidget *widget, GdkEvent *event, gpointer data) {
   int sw=GPOINTER_TO_INT(data);
-  int action=action_dialog(top_window,CONTROLLER_SWITCH,temp_switches[sw].switch_function);
+  int action=action_dialog(dialog,CONTROLLER_SWITCH,temp_switches[sw].switch_function);
   gtk_button_set_label(GTK_BUTTON(widget),ActionTable[action].str);
   temp_switches[sw].switch_function=action;
   update_toolbar_labels();