]> git.rkrishnan.org Git - pihpsdr.git/commitdiff
switch_menu.c: format and fix warnings
authorRamakrishnan Muthukrishnan <ram@rkrishnan.org>
Tue, 12 Dec 2023 11:36:43 +0000 (17:06 +0530)
committerRamakrishnan Muthukrishnan <ram@rkrishnan.org>
Sun, 17 Dec 2023 05:57:32 +0000 (11:27 +0530)
switch_menu.c

index 1d97208e1fc70ab3dc2de8f75019d0dd4e341b33..15c903f365bed25be42e75ba8f497501d036cbfc 100644 (file)
 /* Copyright (C)
-* 2016 - John Melton, G0ORX/N6LYT
-*
-* This program is free software; you can redistribute it and/or
-* modify it under the terms of the GNU General Public License
-* as published by the Free Software Foundation; either version 2
-* of the License, or (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*
-*/
+ * 2016 - John Melton, G0ORX/N6LYT
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ */
 
-#include <gdk/gdk.h>           // for GdkEvent, GdkEventButton
-#include <glib-object.h>       // for g_signal_connect
-#include <glib.h>              // for gint, gpointer, TRUE, g_print, gboolean
-#include <glib/gprintf.h>      // for g_sprintf
-#include <glib/gtypes.h>       // for GINT_TO_POINTER, GPOINTER_TO_INT
-#include <gtk/gtk.h>           // for gtk_button_new_with_label, gtk_grid_at...
-#include <stdio.h>             // for NULL
-#include "action_dialog.h"     // for action_dialog
-#include "actions.h"           // for ACTION_TABLE, ActionTable, CONTROLLER_...
-#include "gobject/gclosure.h"  // for G_CALLBACK
-#include "gpio.h"              // for SWITCH, switches_controller1, MAX_FUNC...
-#include "main.h"              // for controller, CONTROLLER1, NO_CONTROLLER
-#include "new_menu.h"          // for sub_menu, NO_MENU, active_menu
-#include "toolbar.h"           // for update_toolbar_labels
+#include "action_dialog.h"    // for action_dialog
+#include "actions.h"          // for ACTION_TABLE, ActionTable, CONTROLLER_...
+#include "gobject/gclosure.h" // for G_CALLBACK
+#include "gpio.h"             // for SWITCH, switches_controller1, MAX_FUNC...
+#include "main.h"             // for controller, CONTROLLER1, NO_CONTROLLER
+#include "new_menu.h"         // for sub_menu, NO_MENU, active_menu
+#include "toolbar.h"          // for update_toolbar_labels
+#include <gdk/gdk.h>          // for GdkEvent, GdkEventButton
+#include <glib-object.h>      // for g_signal_connect
+#include <glib.h>             // for gint, gpointer, TRUE, g_print, gboolean
+#include <glib/gprintf.h>     // for g_sprintf
+#include <glib/gtypes.h>      // for GINT_TO_POINTER, GPOINTER_TO_INT
+#include <gtk/gtk.h>          // for gtk_button_new_with_label, gtk_grid_at...
+#include <stdio.h>            // for NULL
 
-static GtkWidget *parent_window=NULL;
-
-static GtkWidget *dialog=NULL;
+static GtkWidget *dialog = NULL;
 
 static SWITCH *temp_switches;
 
-
-static void cleanup() {
-  if(dialog!=NULL) {
-    gtk_widget_destroy(dialog);
-    dialog=NULL;
-    active_menu=NO_MENU;
-    sub_menu=NULL;
-  }
-}
-
-static gboolean close_cb (GtkWidget *widget, GdkEventButton *event, gpointer data) {
-  cleanup();
-  return TRUE;
-}
-
-static gboolean delete_event(GtkWidget *widget, GdkEvent *event, gpointer user_data) {
-  cleanup();
-  return FALSE;
-}
-
-void switch_page_cb(GtkNotebook *notebook,GtkWidget *page,guint page_num,gpointer user_data) {
-  temp_switches=switches_controller1[page_num];
+void switch_page_cb(GtkNotebook *notebook, GtkWidget *page, guint page_num,
+                    gpointer user_data) {
+    temp_switches = switches_controller1[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);
-  gtk_button_set_label(GTK_BUTTON(widget),ActionTable[action].str);
-  temp_switches[sw].switch_function=action;
-  update_toolbar_labels();
-  return TRUE;
+    int sw = GPOINTER_TO_INT(data);
+    int action = action_dialog(top_window, 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();
+    return TRUE;
 }
 
-static void response_event(GtkWidget *dialog,gint id,gpointer user_data) {
-  gtk_widget_destroy(dialog);
-  dialog=NULL;
-  active_menu=NO_MENU;
-  sub_menu=NULL;
+static void response_event(GtkWidget *dialog, gint id, gpointer user_data) {
+    gtk_widget_destroy(dialog);
+    dialog = NULL;
+    active_menu = NO_MENU;
+    sub_menu = NULL;
 }
 
 void switch_menu(GtkWidget *parent) {
-  gint row;
-  gint col;
-  gchar label[64];
-  GtkWidget *notebook;
-  GtkWidget *grid;
-  GtkWidget *widget;
-  gint function=0;
+    gint row;
+    gint col;
+    gchar label[64];
+    GtkWidget *notebook = NULL;
+    GtkWidget *grid;
+    GtkWidget *widget;
+    gint function = 0;
 
+    dialog = gtk_dialog_new_with_buttons(
+        "piHPSDR - Switch Actions", GTK_WINDOW(parent),
+        GTK_DIALOG_DESTROY_WITH_PARENT, "_OK", GTK_RESPONSE_ACCEPT, NULL);
+    g_signal_connect(dialog, "response", G_CALLBACK(response_event), NULL);
 
-  dialog=gtk_dialog_new_with_buttons("piHPSDR - Switch Actions",GTK_WINDOW(parent),GTK_DIALOG_DESTROY_WITH_PARENT,"_OK",GTK_RESPONSE_ACCEPT,NULL);
-  g_signal_connect (dialog, "response", G_CALLBACK (response_event), NULL);
+    GtkWidget *content = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
 
-  GtkWidget *content=gtk_dialog_get_content_area(GTK_DIALOG(dialog));
+    function = 0;
 
-  function=0;
+    if (controller == NO_CONTROLLER || controller == CONTROLLER1) {
+        notebook = gtk_notebook_new();
+    }
 
-  if(controller==NO_CONTROLLER || controller==CONTROLLER1) {
-    notebook=gtk_notebook_new();
-  }
 next_function_set:
 
-  grid=gtk_grid_new();
-  gtk_grid_set_column_homogeneous(GTK_GRID(grid),TRUE);
-  gtk_grid_set_row_homogeneous(GTK_GRID(grid),FALSE);
-  gtk_grid_set_column_spacing (GTK_GRID(grid),0);
-  gtk_grid_set_row_spacing (GTK_GRID(grid),0);
-
+    grid = gtk_grid_new();
+    gtk_grid_set_column_homogeneous(GTK_GRID(grid), TRUE);
+    gtk_grid_set_row_homogeneous(GTK_GRID(grid), FALSE);
+    gtk_grid_set_column_spacing(GTK_GRID(grid), 0);
+    gtk_grid_set_row_spacing(GTK_GRID(grid), 0);
 
-  row=0;
-  col=0;
+    row = 0;
+    col = 0;
 
-  gint max_switches=MAX_SWITCHES;
-  switch(controller) {
+    gint max_switches = MAX_SWITCHES;
+    switch (controller) {
     case NO_CONTROLLER:
-      max_switches=8;
-      temp_switches=switches_controller1[function];
-      break;
+        max_switches = 8;
+        temp_switches = switches_controller1[function];
+        break;
     case CONTROLLER1:
-      max_switches=8;
-      temp_switches=switches_controller1[function];
-      break;
+        max_switches = 8;
+        temp_switches = switches_controller1[function];
+        break;
     case CONTROLLER2_V1:
-      max_switches=16;
-      temp_switches=switches_controller2_v1;
-      break;
+        max_switches = 16;
+        temp_switches = switches_controller2_v1;
+        break;
     case CONTROLLER2_V2:
-      max_switches=16;
-      temp_switches=switches_controller2_v2;
-      break;
-  }
-
+        max_switches = 16;
+        temp_switches = switches_controller2_v2;
+        break;
+    }
 
-  int original_row=row;
+    int original_row = row;
 
-  if(controller==CONTROLLER2_V1 || controller==CONTROLLER2_V2) {
-    row=row+5;
-    col=0;
-    widget=gtk_button_new_with_label(ActionTable[temp_switches[0].switch_function].str);
-    gtk_widget_set_name(widget,"small_button");
-    g_signal_connect(widget,"button-press-event",G_CALLBACK(switch_cb),GINT_TO_POINTER(0));
-    gtk_grid_attach(GTK_GRID(grid),widget,col,row,1,1);
-    col++;
-    widget=gtk_button_new_with_label(ActionTable[temp_switches[1].switch_function].str);
-    gtk_widget_set_name(widget,"small_button");
-    g_signal_connect(widget,"button-press-event",G_CALLBACK(switch_cb),GINT_TO_POINTER(1));
-    gtk_grid_attach(GTK_GRID(grid),widget,col,row,1,1);
-    col++;
-    widget=gtk_button_new_with_label(ActionTable[temp_switches[2].switch_function].str);
-    gtk_widget_set_name(widget,"small_button");
-    g_signal_connect(widget,"button-press-event",G_CALLBACK(switch_cb),GINT_TO_POINTER(2));
-    gtk_grid_attach(GTK_GRID(grid),widget,col,row,1,1);
-    col++;
-    widget=gtk_button_new_with_label(ActionTable[temp_switches[3].switch_function].str);
-    gtk_widget_set_name(widget,"small_button");
-    g_signal_connect(widget,"button-press-event",G_CALLBACK(switch_cb),GINT_TO_POINTER(3));
-    gtk_grid_attach(GTK_GRID(grid),widget,col,row,1,1);
-    col++;
-    widget=gtk_button_new_with_label(ActionTable[temp_switches[4].switch_function].str);
-    gtk_widget_set_name(widget,"small_button");
-    g_signal_connect(widget,"button-press-event",G_CALLBACK(switch_cb),GINT_TO_POINTER(4));
-    gtk_grid_attach(GTK_GRID(grid),widget,col,row,1,1);
-    col++;
-    widget=gtk_button_new_with_label(ActionTable[temp_switches[5].switch_function].str);
-    gtk_widget_set_name(widget,"small_button");
-    g_signal_connect(widget,"button-press-event",G_CALLBACK(switch_cb),GINT_TO_POINTER(5));
-    gtk_grid_attach(GTK_GRID(grid),widget,col,row,1,1);
-    col++;
-    widget=gtk_button_new_with_label(ActionTable[temp_switches[6].switch_function].str);
-    gtk_widget_set_name(widget,"small_button");
-    g_signal_connect(widget,"button-press-event",G_CALLBACK(switch_cb),GINT_TO_POINTER(6));
-    gtk_grid_attach(GTK_GRID(grid),widget,col,row,1,1);
-    col++;
+    if (controller == CONTROLLER2_V1 || controller == CONTROLLER2_V2) {
+        row = row + 5;
+        col = 0;
+        widget = gtk_button_new_with_label(
+            ActionTable[temp_switches[0].switch_function].str);
+        gtk_widget_set_name(widget, "small_button");
+        g_signal_connect(widget, "button-press-event", G_CALLBACK(switch_cb),
+                         GINT_TO_POINTER(0));
+        gtk_grid_attach(GTK_GRID(grid), widget, col, row, 1, 1);
+        col++;
+        widget = gtk_button_new_with_label(
+            ActionTable[temp_switches[1].switch_function].str);
+        gtk_widget_set_name(widget, "small_button");
+        g_signal_connect(widget, "button-press-event", G_CALLBACK(switch_cb),
+                         GINT_TO_POINTER(1));
+        gtk_grid_attach(GTK_GRID(grid), widget, col, row, 1, 1);
+        col++;
+        widget = gtk_button_new_with_label(
+            ActionTable[temp_switches[2].switch_function].str);
+        gtk_widget_set_name(widget, "small_button");
+        g_signal_connect(widget, "button-press-event", G_CALLBACK(switch_cb),
+                         GINT_TO_POINTER(2));
+        gtk_grid_attach(GTK_GRID(grid), widget, col, row, 1, 1);
+        col++;
+        widget = gtk_button_new_with_label(
+            ActionTable[temp_switches[3].switch_function].str);
+        gtk_widget_set_name(widget, "small_button");
+        g_signal_connect(widget, "button-press-event", G_CALLBACK(switch_cb),
+                         GINT_TO_POINTER(3));
+        gtk_grid_attach(GTK_GRID(grid), widget, col, row, 1, 1);
+        col++;
+        widget = gtk_button_new_with_label(
+            ActionTable[temp_switches[4].switch_function].str);
+        gtk_widget_set_name(widget, "small_button");
+        g_signal_connect(widget, "button-press-event", G_CALLBACK(switch_cb),
+                         GINT_TO_POINTER(4));
+        gtk_grid_attach(GTK_GRID(grid), widget, col, row, 1, 1);
+        col++;
+        widget = gtk_button_new_with_label(
+            ActionTable[temp_switches[5].switch_function].str);
+        gtk_widget_set_name(widget, "small_button");
+        g_signal_connect(widget, "button-press-event", G_CALLBACK(switch_cb),
+                         GINT_TO_POINTER(5));
+        gtk_grid_attach(GTK_GRID(grid), widget, col, row, 1, 1);
+        col++;
+        widget = gtk_button_new_with_label(
+            ActionTable[temp_switches[6].switch_function].str);
+        gtk_widget_set_name(widget, "small_button");
+        g_signal_connect(widget, "button-press-event", G_CALLBACK(switch_cb),
+                         GINT_TO_POINTER(6));
+        gtk_grid_attach(GTK_GRID(grid), widget, col, row, 1, 1);
+        col++;
 
-    row=original_row;
-    col=8;
-    widget=gtk_button_new_with_label(ActionTable[temp_switches[7].switch_function].str);
-    gtk_widget_set_name(widget,"small_button");
-    g_signal_connect(widget,"button-press-event",G_CALLBACK(switch_cb),GINT_TO_POINTER(7));
-    gtk_grid_attach(GTK_GRID(grid),widget,col,row,1,1);
-    row++;
-    col=7;
-    widget=gtk_button_new_with_label(ActionTable[temp_switches[8].switch_function].str);
-    gtk_widget_set_name(widget,"small_button");
-    g_signal_connect(widget,"button-press-event",G_CALLBACK(switch_cb),GINT_TO_POINTER(8));
-    gtk_grid_attach(GTK_GRID(grid),widget,col,row,1,1);
-    col++;
-    widget=gtk_button_new_with_label(ActionTable[temp_switches[9].switch_function].str);
-    gtk_widget_set_name(widget,"small_button");
-    g_signal_connect(widget,"button-press-event",G_CALLBACK(switch_cb),GINT_TO_POINTER(9));
-    gtk_grid_attach(GTK_GRID(grid),widget,col,row,1,1);
-    row++;
-    col=7;
-    widget=gtk_button_new_with_label(ActionTable[temp_switches[10].switch_function].str);
-    gtk_widget_set_name(widget,"small_button");
-    g_signal_connect(widget,"button-press-event",G_CALLBACK(switch_cb),GINT_TO_POINTER(10));
-    gtk_grid_attach(GTK_GRID(grid),widget,col,row,1,1);
-    col++;
-    widget=gtk_button_new_with_label(ActionTable[temp_switches[11].switch_function].str);
-    gtk_widget_set_name(widget,"small_button");
-    g_signal_connect(widget,"button-press-event",G_CALLBACK(switch_cb),GINT_TO_POINTER(11));
-    gtk_grid_attach(GTK_GRID(grid),widget,col,row,1,1);
-    row++;
-    col=7;
-    widget=gtk_button_new_with_label(ActionTable[temp_switches[12].switch_function].str);
-    gtk_widget_set_name(widget,"small_button");
-    g_signal_connect(widget,"button-press-event",G_CALLBACK(switch_cb),GINT_TO_POINTER(12));
-    gtk_grid_attach(GTK_GRID(grid),widget,col,row,1,1);
-    col++;
-    widget=gtk_button_new_with_label(ActionTable[temp_switches[13].switch_function].str);
-    gtk_widget_set_name(widget,"small_button");
-    g_signal_connect(widget,"button-press-event",G_CALLBACK(switch_cb),GINT_TO_POINTER(13));
-    gtk_grid_attach(GTK_GRID(grid),widget,col,row,1,1);
-    row++;
-    col=7;
-    widget=gtk_button_new_with_label(ActionTable[temp_switches[14].switch_function].str);
-    gtk_widget_set_name(widget,"small_button");
-    g_signal_connect(widget,"button-press-event",G_CALLBACK(switch_cb),GINT_TO_POINTER(14));
-    gtk_grid_attach(GTK_GRID(grid),widget,col,row,1,1);
-    col++;
-    widget=gtk_button_new_with_label(ActionTable[temp_switches[15].switch_function].str);
-    gtk_widget_set_name(widget,"small_button");
-    g_signal_connect(widget,"button-press-event",G_CALLBACK(switch_cb),GINT_TO_POINTER(15));
-    gtk_grid_attach(GTK_GRID(grid),widget,col,row,1,1);
+        row = original_row;
+        col = 8;
+        widget = gtk_button_new_with_label(
+            ActionTable[temp_switches[7].switch_function].str);
+        gtk_widget_set_name(widget, "small_button");
+        g_signal_connect(widget, "button-press-event", G_CALLBACK(switch_cb),
+                         GINT_TO_POINTER(7));
+        gtk_grid_attach(GTK_GRID(grid), widget, col, row, 1, 1);
+        row++;
+        col = 7;
+        widget = gtk_button_new_with_label(
+            ActionTable[temp_switches[8].switch_function].str);
+        gtk_widget_set_name(widget, "small_button");
+        g_signal_connect(widget, "button-press-event", G_CALLBACK(switch_cb),
+                         GINT_TO_POINTER(8));
+        gtk_grid_attach(GTK_GRID(grid), widget, col, row, 1, 1);
+        col++;
+        widget = gtk_button_new_with_label(
+            ActionTable[temp_switches[9].switch_function].str);
+        gtk_widget_set_name(widget, "small_button");
+        g_signal_connect(widget, "button-press-event", G_CALLBACK(switch_cb),
+                         GINT_TO_POINTER(9));
+        gtk_grid_attach(GTK_GRID(grid), widget, col, row, 1, 1);
+        row++;
+        col = 7;
+        widget = gtk_button_new_with_label(
+            ActionTable[temp_switches[10].switch_function].str);
+        gtk_widget_set_name(widget, "small_button");
+        g_signal_connect(widget, "button-press-event", G_CALLBACK(switch_cb),
+                         GINT_TO_POINTER(10));
+        gtk_grid_attach(GTK_GRID(grid), widget, col, row, 1, 1);
+        col++;
+        widget = gtk_button_new_with_label(
+            ActionTable[temp_switches[11].switch_function].str);
+        gtk_widget_set_name(widget, "small_button");
+        g_signal_connect(widget, "button-press-event", G_CALLBACK(switch_cb),
+                         GINT_TO_POINTER(11));
+        gtk_grid_attach(GTK_GRID(grid), widget, col, row, 1, 1);
+        row++;
+        col = 7;
+        widget = gtk_button_new_with_label(
+            ActionTable[temp_switches[12].switch_function].str);
+        gtk_widget_set_name(widget, "small_button");
+        g_signal_connect(widget, "button-press-event", G_CALLBACK(switch_cb),
+                         GINT_TO_POINTER(12));
+        gtk_grid_attach(GTK_GRID(grid), widget, col, row, 1, 1);
+        col++;
+        widget = gtk_button_new_with_label(
+            ActionTable[temp_switches[13].switch_function].str);
+        gtk_widget_set_name(widget, "small_button");
+        g_signal_connect(widget, "button-press-event", G_CALLBACK(switch_cb),
+                         GINT_TO_POINTER(13));
+        gtk_grid_attach(GTK_GRID(grid), widget, col, row, 1, 1);
+        row++;
+        col = 7;
+        widget = gtk_button_new_with_label(
+            ActionTable[temp_switches[14].switch_function].str);
+        gtk_widget_set_name(widget, "small_button");
+        g_signal_connect(widget, "button-press-event", G_CALLBACK(switch_cb),
+                         GINT_TO_POINTER(14));
+        gtk_grid_attach(GTK_GRID(grid), widget, col, row, 1, 1);
+        col++;
+        widget = gtk_button_new_with_label(
+            ActionTable[temp_switches[15].switch_function].str);
+        gtk_widget_set_name(widget, "small_button");
+        g_signal_connect(widget, "button-press-event", G_CALLBACK(switch_cb),
+                         GINT_TO_POINTER(15));
+        gtk_grid_attach(GTK_GRID(grid), widget, col, row, 1, 1);
 
-    gtk_container_add(GTK_CONTAINER(content),grid);
-  } else {
-    int start_row=row;
-    for(int i=0;i<max_switches;i++) {
-      if((controller==NO_CONTROLLER || controller==CONTROLLER1) && (temp_switches[i].switch_function==FUNCTION)) {
-        widget=gtk_button_new_with_label(ActionTable[temp_switches[i].switch_function].str);
-        // no signal for Function button
-      } else {
-        widget=gtk_button_new_with_label(ActionTable[temp_switches[i].switch_function].str);
-        g_signal_connect(widget,"button-press-event",G_CALLBACK(switch_cb),GINT_TO_POINTER(i));
-g_print("%s: %d\n",__FUNCTION__,i);
-      }
-      gtk_grid_attach(GTK_GRID(grid),widget,col,row,1,1);
-      col++;
-    }
+        gtk_container_add(GTK_CONTAINER(content), grid);
+    } else {
+        for (int i = 0; i < max_switches; i++) {
+            if ((controller == NO_CONTROLLER || controller == CONTROLLER1) &&
+                (temp_switches[i].switch_function == FUNCTION)) {
+                widget = gtk_button_new_with_label(
+                    ActionTable[temp_switches[i].switch_function].str);
+                // no signal for Function button
+            } else {
+                widget = gtk_button_new_with_label(
+                    ActionTable[temp_switches[i].switch_function].str);
+                g_signal_connect(widget, "button-press-event",
+                                 G_CALLBACK(switch_cb), GINT_TO_POINTER(i));
+                g_print("%s: %d\n", __FUNCTION__, i);
+            }
+            gtk_grid_attach(GTK_GRID(grid), widget, col, row, 1, 1);
+            col++;
+        }
 
-    g_sprintf(label,"Function %d",function);
-    gtk_notebook_append_page(GTK_NOTEBOOK(notebook),grid,gtk_label_new(label));
-    function++;
-    if(function<MAX_FUNCTIONS) {
-      goto next_function_set;
+        g_sprintf(label, "Function %d", function);
+        gtk_notebook_append_page(GTK_NOTEBOOK(notebook), grid,
+                                 gtk_label_new(label));
+        function++;
+        if (function < MAX_FUNCTIONS) {
+            goto next_function_set;
+        }
+        gtk_container_add(GTK_CONTAINER(content), notebook);
+        g_signal_connect(notebook, "switch-page", G_CALLBACK(switch_page_cb),
+                         NULL);
     }
-    gtk_container_add(GTK_CONTAINER(content),notebook);
-    g_signal_connect (notebook, "switch-page",G_CALLBACK(switch_page_cb),NULL);
-  }
 
-  sub_menu=dialog;
+    sub_menu = dialog;
 
-  gtk_widget_show_all(dialog);
+    gtk_widget_show_all(dialog);
 }