Import Upstream version 0.4.2.2

1 files changed, 102 insertions, 101 deletions

diff --git a/menu.c b/menu.c
index 4d6373e5..6c945c9c 100644
--- a/menu.c
+++ b/menu.c
@@ -30,142 +30,143 @@
 
 #include "uidefs.h"
 
-static GtkActionEntry entries[] = 
-{
-  { "InformationMenuAction", NULL, "_Information" },                  /* name, stock id, label */
-  { "ViewMenuAction", NULL, "_View" },
-  { "HelpMenuAction", NULL, "_Help" },
-  { "HelpMenuModulesAction", HI_STOCK_ABOUT_MODULES, "About _Modules" },
-  { "MainMenuBarAction", NULL, "" },
-  
-  { "ReportAction", HI_STOCK_REPORT,                    /* name, stock id */
-    "Generate _Report", "<control>R",                   /* label, accelerator */
-    NULL, 			                        /* tooltip */ 
-    G_CALLBACK(cb_generate_report) },
-  
-  { "SyncManagerAction", HI_STOCK_SYNC_MENU,
-    "_Network Updater...", NULL,
-    NULL,
-    G_CALLBACK(cb_sync_manager) },
-
-  { "CopyAction", GTK_STOCK_COPY,
-    "_Copy to Clipboard", "<control>C",
-    NULL,
-    G_CALLBACK(cb_copy_to_clipboard) },
-
-  { "SaveGraphAction", GTK_STOCK_SAVE_AS,
-    "_Save image as...", "<control>S",
-    NULL,
-    G_CALLBACK(cb_save_graphic) },
-
-  { "RefreshAction", GTK_STOCK_REFRESH,
-    "_Refresh", "F5",
-    NULL,
-    G_CALLBACK(cb_refresh) },
-
-  { "OnlineDocsAction", GTK_STOCK_HELP,
-    "Contents (online)", "F1",
-    NULL,
-    G_CALLBACK(cb_open_online_docs) },
-
-  { "HomePageAction", HI_STOCK_INTERNET,
-    "_Open HardInfo Web Site", NULL,
-    NULL,
-    G_CALLBACK(cb_open_web_page) },
-
-  { "ReportBugAction", HI_STOCK_INTERNET,
-    "_Report bug", NULL,
-    NULL,
-    G_CALLBACK(cb_report_bug) },
-
-  { "DonateAction", HI_STOCK_DONATE,
-    "_Donate to the project", NULL,
-    NULL,
-    G_CALLBACK(cb_donate) },
-
-  { "AboutAction", GTK_STOCK_ABOUT,
-    "_About HardInfo", NULL,    
-    "Displays program version information",
-    G_CALLBACK(cb_about) },
-
-  { "QuitAction", GTK_STOCK_QUIT,
-    "_Quit", "<control>Q",    
-    NULL,
-    G_CALLBACK(cb_quit) }
+static GtkActionEntry entries[] = {
+    {"InformationMenuAction", NULL, "_Information"},	/* name, stock id, label */
+    {"ViewMenuAction", NULL, "_View"},
+    {"HelpMenuAction", NULL, "_Help"},
+    {"HelpMenuModulesAction", HI_STOCK_ABOUT_MODULES, "About _Modules"},
+    {"MainMenuBarAction", NULL, ""},
+
+    {"ReportAction", HI_STOCK_REPORT,	/* name, stock id */
+     "Generate _Report", "<control>R",	/* label, accelerator */
+     NULL,			/* tooltip */
+     G_CALLBACK(cb_generate_report)},
+
+    {"SyncManagerAction", HI_STOCK_SYNC_MENU,
+     "_Network Updater...", NULL,
+     NULL,
+     G_CALLBACK(cb_sync_manager)},
+
+    {"CopyAction", GTK_STOCK_COPY,
+     "_Copy to Clipboard", "<control>C",
+     NULL,
+     G_CALLBACK(cb_copy_to_clipboard)},
+
+    {"SaveGraphAction", GTK_STOCK_SAVE_AS,
+     "_Save image as...", "<control>S",
+     NULL,
+     G_CALLBACK(cb_save_graphic)},
+
+    {"RefreshAction", GTK_STOCK_REFRESH,
+     "_Refresh", "F5",
+     NULL,
+     G_CALLBACK(cb_refresh)},
+
+    {"OnlineDocsAction", GTK_STOCK_HELP,
+     "Contents (online)", "F1",
+     NULL,
+     G_CALLBACK(cb_open_online_docs)},
+
+    {"HomePageAction", HI_STOCK_INTERNET,
+     "_Open HardInfo Web Site", NULL,
+     NULL,
+     G_CALLBACK(cb_open_web_page)},
+
+    {"ReportBugAction", HI_STOCK_INTERNET,
+     "_Report bug", NULL,
+     NULL,
+     G_CALLBACK(cb_report_bug)},
+
+    {"DonateAction", HI_STOCK_DONATE,
+     "_Donate to the project", NULL,
+     NULL,
+     G_CALLBACK(cb_donate)},
+
+    {"AboutAction", GTK_STOCK_ABOUT,
+     "_About HardInfo", NULL,
+     "Displays program version information",
+     G_CALLBACK(cb_about)},
+
+    {"QuitAction", GTK_STOCK_QUIT,
+     "_Quit", "<control>Q",
+     NULL,
+     G_CALLBACK(cb_quit)}
 };
 
-static GtkToggleActionEntry toggle_entries[] =
-{
-  { "SidePaneAction", NULL,
-    "_Side Pane", NULL,    
-    "Toggles side pane visibility",
-    G_CALLBACK(cb_side_pane) },
-  { "ToolbarAction", NULL,
-    "_Toolbar", NULL,    
-    NULL,
-    G_CALLBACK(cb_toolbar) },
+static GtkToggleActionEntry toggle_entries[] = {
+    {"SidePaneAction", NULL,
+     "_Side Pane", NULL,
+     "Toggles side pane visibility",
+     G_CALLBACK(cb_side_pane)},
+    {"ToolbarAction", NULL,
+     "_Toolbar", NULL,
+     NULL,
+     G_CALLBACK(cb_toolbar)},
 };
 
 /* Implement a handler for GtkUIManager's "add_widget" signal. The UI manager
  * will emit this signal whenever it needs you to place a new widget it has. */
 static void
-menu_add_widget(GtkUIManager *ui, GtkWidget *widget, GtkContainer *container)
+menu_add_widget(GtkUIManager * ui, GtkWidget * widget,
+		GtkContainer * container)
 {
     gtk_box_pack_start(GTK_BOX(container), widget, FALSE, FALSE, 0);
     gtk_widget_show(widget);
 }
 
-void menu_init(Shell *shell)
+void menu_init(Shell * shell)
 {
-    GtkWidget           *menu_box;              /* Packing box for the menu and toolbars */
-    GtkActionGroup      *action_group;          /* Packing group for our Actions */
-    GtkUIManager        *menu_manager;          /* The magic widget! */
-    GError              *error;                 /* For reporting exceptions or errors */
-    GtkAccelGroup	*accel_group;
-    
+    GtkWidget *menu_box;	/* Packing box for the menu and toolbars */
+    GtkActionGroup *action_group;	/* Packing group for our Actions */
+    GtkUIManager *menu_manager;	/* The magic widget! */
+    GError *error;		/* For reporting exceptions or errors */
+    GtkAccelGroup *accel_group;
+
     /* Create our objects */
     menu_box = shell->vbox;
     action_group = gtk_action_group_new("HardInfo");
     menu_manager = gtk_ui_manager_new();
-    
+
     shell->action_group = action_group;
-    shell->ui_manager   = menu_manager;
-    
+    shell->ui_manager = menu_manager;
+
     /* Pack up our objects:
      * menu_box -> window
      * actions -> action_group
      * action_group -> menu_manager */
-    gtk_action_group_add_actions(action_group, entries, G_N_ELEMENTS(entries),
-                                 NULL);
+    gtk_action_group_add_actions(action_group, entries,
+				 G_N_ELEMENTS(entries), NULL);
     gtk_action_group_add_toggle_actions(action_group, toggle_entries,
-                                        G_N_ELEMENTS(toggle_entries), NULL);
+					G_N_ELEMENTS(toggle_entries),
+					NULL);
     gtk_ui_manager_insert_action_group(menu_manager, action_group, 0);
-    
+
     /* Read in the UI from our XML file */
     error = NULL;
-    gtk_ui_manager_add_ui_from_string(menu_manager, uidefs_str, -1, &error);
-    
+    gtk_ui_manager_add_ui_from_string(menu_manager, uidefs_str, -1,
+				      &error);
+
     if (error) {
-        g_error("Building menus failed: %s", error->message);
-        g_error_free(error);
-        return;
+	g_error("Building menus failed: %s", error->message);
+	g_error_free(error);
+	return;
     }
-    
+
     /* Enable menu accelerators */
     accel_group = gtk_ui_manager_get_accel_group(menu_manager);
     gtk_window_add_accel_group(GTK_WINDOW(shell->window), accel_group);
-    
+
     /* Connect up important signals */
     /* This signal is necessary in order to place widgets from the UI manager
      * into the menu_box */
-    g_signal_connect(menu_manager, "add_widget", 
-                     G_CALLBACK(menu_add_widget),
-                     menu_box);
- 
+    g_signal_connect(menu_manager, "add_widget",
+		     G_CALLBACK(menu_add_widget), menu_box);
+
     /* Show the window and run the main loop, we're done! */
     gtk_widget_show(menu_box);
 
-    gtk_toolbar_set_style(GTK_TOOLBAR(gtk_ui_manager_get_widget(shell->ui_manager, "/MainMenuBarAction")),
-                          GTK_TOOLBAR_BOTH_HORIZ);
+    gtk_toolbar_set_style(GTK_TOOLBAR
+			  (gtk_ui_manager_get_widget
+			   (shell->ui_manager, "/MainMenuBarAction")),
+			  GTK_TOOLBAR_BOTH_HORIZ);
 }
-