Ooops 2

3 files changed, 20 insertions, 18 deletions

diff --git a/hardinfo2/arch/common/fib.h b/hardinfo2/arch/common/fib.h
index a4fc2151..7deb3fca 100644
--- a/hardinfo2/arch/common/fib.h
+++ b/hardinfo2/arch/common/fib.h
@@ -44,7 +44,7 @@ benchmark_fib(void)
     elapsed = g_timer_elapsed(timer, NULL);
     g_timer_destroy(timer);
 
-    gchar *retval = g_strdup_printf("[Results <i>(in seconds; lower is better)</i>]\n"
-                           "<i>This Machine</i>=%.3f\n", elapsed);
+    gchar *retval = g_strdup_printf("[Results]\n"
+                           "<i>This Machine</i>=%.3f s\n", elapsed);
     return benchmark_include_results(retval, "Fibonacci");
 }
diff --git a/hardinfo2/arch/common/sha1.h b/hardinfo2/arch/common/sha1.h
index 8e4c2111..7103e8c6 100644
--- a/hardinfo2/arch/common/sha1.h
+++ b/hardinfo2/arch/common/sha1.h
@@ -59,7 +59,7 @@ benchmark_sha1(void)
     g_free(bdata_path);
 
     gchar *retval = g_strdup_printf("[Results]\n"
-                           "<i>This Machine</i>=%.2f MiB/s\n", elapsed);
+                           "<i>This Machine</i>=%.2f MiB/s\n", 312.0 / elapsed);
     return benchmark_include_results_reverse(retval, "SHA1");
 }
 
diff --git a/hardinfo2/shell.c b/hardinfo2/shell.c
index 9434d998..4655ec31 100644
--- a/hardinfo2/shell.c
+++ b/hardinfo2/shell.c
@@ -375,12 +375,13 @@ static void add_module_to_view_menu(gchar * name, GdkPixbuf * pixbuf)
     stock_icon_register_pixbuf(pixbuf, name);
 
     GtkActionEntry entries[] = {
-	{name,			/* name */
-	 name,			/* stockid */
-	 name,			/* label */
-	 NULL,			/* accelerator */
-	 NULL,			/* tooltip */
-	 NULL,			/* callback */
+	{
+           name,			/* name */
+	   name,			/* stockid */
+	   name,			/* label */
+	   NULL,			/* accelerator */
+	   NULL,			/* tooltip */
+  	   NULL,			/* callback */
 	 },
     };
 
@@ -399,12 +400,13 @@ add_module_entry_to_view_menu(gchar * module, gchar * name,
     stock_icon_register_pixbuf(pixbuf, name);
 
     GtkActionEntry entries[] = {
-	{name,			/* name */
-	 name,			/* stockid */
-	 name,			/* label */
-	 NULL,			/* accelerator */
-	 NULL,			/* tooltip */
-	 (GCallback) view_menu_select_entry,	/* callback */
+	{
+	   name,			/* name */
+	   name,			/* stockid */
+	   name,			/* label */
+	   NULL,			/* accelerator */
+	   NULL,			/* tooltip */
+	   (GCallback) view_menu_select_entry,	/* callback */
 	 },
     };
 
@@ -502,9 +504,6 @@ void shell_init(GSList * modules)
     g_slist_foreach(shell->tree->modules, add_modules_to_gui, shell->tree);
     gtk_tree_view_expand_all(GTK_TREE_VIEW(shell->tree->view));
 
-    shell_status_update("Done.");
-    shell_status_set_enabled(FALSE);
-
     gtk_widget_show_all(shell->hpaned);
 
     load_graph_configure_expose(shell->loadgraph);
@@ -515,6 +514,9 @@ void shell_init(GSList * modules)
     shell_action_set_enabled("SaveGraphAction", FALSE);
     shell_action_set_active("SidePaneAction", TRUE);
     shell_action_set_active("ToolbarAction", TRUE);
+
+    shell_status_update("Done.");
+    shell_status_set_enabled(FALSE);
 }
 
 static gboolean update_field(gpointer data)