[nautilus/gtk3-breakage] application: perform checks in NautilusApplication if requested so

[Cosimo Cecchi <cosimoc src gnome org>]

commit 3f90a270731bf7fd891edcaafa4cb01e34bb331d
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Wed Oct 27 18:36:28 2010 +0200

    application: perform checks in NautilusApplication if requested so

 src/nautilus-application.c |   20 ++++++++++++++++++++
 src/nautilus-main.c        |   30 +++++-------------------------
 2 files changed, 25 insertions(+), 25 deletions(-)
---
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index c1eae73..f92bbd8 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -46,6 +46,7 @@
 #include "nautilus-navigation-window-slot.h"
 #include "nautilus-notes-viewer.h"
 #include "nautilus-places-sidebar.h"
+#include "nautilus-self-check-functions.h"
 #include "nautilus-spatial-window.h"
 #include "nautilus-window-bookmarks.h"
 #include "nautilus-window-manage-views.h"
@@ -59,6 +60,7 @@
 #include <libnautilus-private/nautilus-file-utilities.h>
 #include <libnautilus-private/nautilus-file-operations.h>
 #include <libnautilus-private/nautilus-global-preferences.h>
+#include <libnautilus-private/nautilus-lib-self-check-functions.h>
 #include <libnautilus-private/nautilus-module.h>
 #include <libnautilus-private/nautilus-signaller.h>
 #include <libnautilus-private/nautilus-undo-manager.h>
@@ -1528,6 +1530,24 @@ nautilus_application_command_line (GApplication *app,
 		goto out;
 	}
 
+	/* Do either the self-check or the real work. */
+	if (perform_self_check) {
+#ifndef NAUTILUS_OMIT_SELF_CHECK
+		/* Run the checks (each twice) for nautilus and libnautilus-private. */
+
+		nautilus_run_self_checks ();
+		nautilus_run_lib_self_checks ();
+		eel_exit_if_self_checks_failed ();
+
+		nautilus_run_self_checks ();
+		nautilus_run_lib_self_checks ();
+		eel_exit_if_self_checks_failed ();
+
+		retval = EXIT_SUCCESS;
+		goto out;
+#endif
+	}
+
 	/* Check the user's ~/.nautilus directories and post warnings
 	 * if there are problems.
 	 */
diff --git a/src/nautilus-main.c b/src/nautilus-main.c
index 6d4e883..ad169bf 100644
--- a/src/nautilus-main.c
+++ b/src/nautilus-main.c
@@ -31,7 +31,6 @@
 #include <config.h>
 
 #include "nautilus-application.h"
-#include "nautilus-self-check-functions.h"
 #include "nautilus-window.h"
 #include <dlfcn.h>
 #include <signal.h>
@@ -46,7 +45,6 @@
 #include <gio/gdesktopappinfo.h>
 #include <libnautilus-private/nautilus-debug-log.h>
 #include <libnautilus-private/nautilus-global-preferences.h>
-#include <libnautilus-private/nautilus-lib-self-check-functions.h>
 #include <libnautilus-private/nautilus-icon-names.h>
 #include <libxml/parser.h>
 #ifdef HAVE_LOCALE_H
@@ -231,7 +229,6 @@ main (int argc, char *argv[])
 	gboolean autostart_mode;
 	gint retval;
 	const char *autostart_id;
-	gboolean perform_self_check = FALSE;
 	NautilusApplication *application;
 	
 #if defined (HAVE_MALLOPT) && defined(M_MMAP_THRESHOLD)
@@ -293,30 +290,13 @@ main (int argc, char *argv[])
 	/* Initialize the services that we use. */
 	LIBXML_TEST_VERSION
 
-	/* Do either the self-check or the real work. */
-	if (perform_self_check) {
-#ifndef NAUTILUS_OMIT_SELF_CHECK
-		/* Run the checks (each twice) for nautilus and libnautilus-private. */
+	/* Run the nautilus application. */
+	application = nautilus_application_dup_singleton ();
 
-		nautilus_run_self_checks ();
-		nautilus_run_lib_self_checks ();
-		eel_exit_if_self_checks_failed ();
+	retval = g_application_run (G_APPLICATION (application),
+				    argc, argv);
 
-		nautilus_run_self_checks ();
-		nautilus_run_lib_self_checks ();
-		eel_exit_if_self_checks_failed ();
-
-		retval = EXIT_SUCCESS;
-#endif
-	} else {
-		/* Run the nautilus application. */
-		application = nautilus_application_dup_singleton ();
-
-		retval = g_application_run (G_APPLICATION (application),
-					    argc, argv);
-
-		g_object_unref (application);
-	}
+	g_object_unref (application);
 
  	eel_debug_shut_down ();