Holy piss sprinkled on this by Arik <arik@eazel.com>

Fri Jan 26 23:58:42 2001  George Lebl <jirka@5z.com>

	Holy piss sprinkled on this by Arik <arik@eazel.com>

	* components/adapter/main.c (main)
	  components/help/hyperbola-main.c (main)
	  components/image-viewer/nautilus-image-view.c (init_server_factory)
	  components/mozilla/main.c (main)
	  components/music/main.c (main)
	  components/notes/nautilus-notes.c (main)
	  components/services/install/nautilus-view/main.c (main)
	  components/services/inventory/main.c (main)
	  components/services/login/nautilus-view/main.c (main)
	  components/services/summary/nautilus-view/main.c (main)
	  components/shell/shell.c (init_bonobo)
	  components/text/main.c (main)
	  components/throbber/main.c (main)
	  components/tree/main.c (main)
	  libnautilus/nautilus-view-standard-main.c
	  (nautilus_view_standard_main_multi):
	  Add gnome_client_disable_master_connection call to all out of
	  process component main functions since they should not register
	  with the session manager.  Fixes bug #6051

2001-01-26  Seth Nickell  <seth@eazel.com>

16 files changed, 50 insertions, 0 deletions

diff --git a/components/adapter/main.c b/components/adapter/main.c
index 2c342e226..2413ec3e5 100644
--- a/components/adapter/main.c
+++ b/components/adapter/main.c
@@ -96,6 +96,9 @@ main (int argc, char *argv[])
 		nautilus_make_warnings_and_criticals_stop_in_debugger
 			(G_LOG_DOMAIN, g_log_domain_glib, "Gdk", "Gtk", "GnomeVFS", "GnomeUI", "Bonobo", "ORBit", NULL);
 	}
+	
+	/* Disable session manager connection */
+	gnome_client_disable_master_connection ();
 
 	/* Initialize libraries. */
         gnome_init_with_popt_table ("nautilus-adapter", VERSION, 
diff --git a/components/help/hyperbola-main.c b/components/help/hyperbola-main.c
index 74d028f96..9e3d6b506 100644
--- a/components/help/hyperbola-main.c
+++ b/components/help/hyperbola-main.c
@@ -52,6 +52,9 @@ main(int argc, char *argv[])
   bindtextdomain (PACKAGE, GNOMELOCALEDIR);
   textdomain (PACKAGE);
 #endif	
+	
+  /* Disable session manager connection */
+  gnome_client_disable_master_connection ();
 
   gnome_init_with_popt_table ("hyperbola", VERSION, 
 			      argc, argv,
diff --git a/components/image-viewer/nautilus-image-view.c b/components/image-viewer/nautilus-image-view.c
index 735773e2d..7b61d808f 100644
--- a/components/image-viewer/nautilus-image-view.c
+++ b/components/image-viewer/nautilus-image-view.c
@@ -808,6 +808,9 @@ init_server_factory (int argc, char **argv)
 {
 	CORBA_Environment ev;
 	CORBA_exception_init (&ev);
+	
+	/* Disable session manager connection */
+	gnome_client_disable_master_connection ();
 
         gnome_init_with_popt_table("bonobo-image-generic", VERSION,
 				   argc, argv,
diff --git a/components/mozilla/main.c b/components/mozilla/main.c
index ba2a41796..13ab365cf 100644
--- a/components/mozilla/main.c
+++ b/components/mozilla/main.c
@@ -127,6 +127,9 @@ main (int argc, char *argv[])
 
 		exit (success ? 0 : -1);
 	}
+	
+	/* Disable session manager connection */
+	gnome_client_disable_master_connection ();
 
 	gnome_init_with_popt_table ("nautilus-mozilla-content-view", VERSION, 
 				    argc, argv,
diff --git a/components/music/main.c b/components/music/main.c
index d6d5ac107..2b3970832 100644
--- a/components/music/main.c
+++ b/components/music/main.c
@@ -98,6 +98,9 @@ main (int argc, char *argv[])
 			 "ORBit",
 			 NULL);
 	}
+	
+	/* Disable session manager connection */
+	gnome_client_disable_master_connection ();
 
         gnome_init_with_popt_table("nautilus-music-view", VERSION, 
 				   argc, argv,
diff --git a/components/notes/nautilus-notes.c b/components/notes/nautilus-notes.c
index 275bbd375..010f223e7 100644
--- a/components/notes/nautilus-notes.c
+++ b/components/notes/nautilus-notes.c
@@ -237,6 +237,9 @@ main(int argc, char *argv[])
 	textdomain (PACKAGE);
 #endif
 	
+	/* Disable session manager connection */
+	gnome_client_disable_master_connection ();
+	
         /* initialize CORBA and Bonobo */
 
         gnome_init_with_popt_table("nautilus-notes", VERSION,
diff --git a/components/services/install-view/main.c b/components/services/install-view/main.c
index 1064f8e75..c93ae2106 100644
--- a/components/services/install-view/main.c
+++ b/components/services/install-view/main.c
@@ -73,6 +73,9 @@ main (int argc, char *argv[])
 	BonoboGenericFactory *factory;
 	CORBA_ORB orb;
 	char *registration_id;
+	
+	/* Disable session manager connection */
+	gnome_client_disable_master_connection ();
 
 	gnome_init_with_popt_table ("nautilus-service-install-view", VERSION, 
                                     argc, argv,
diff --git a/components/services/install/nautilus-view/main.c b/components/services/install/nautilus-view/main.c
index 1064f8e75..c93ae2106 100644
--- a/components/services/install/nautilus-view/main.c
+++ b/components/services/install/nautilus-view/main.c
@@ -73,6 +73,9 @@ main (int argc, char *argv[])
 	BonoboGenericFactory *factory;
 	CORBA_ORB orb;
 	char *registration_id;
+	
+	/* Disable session manager connection */
+	gnome_client_disable_master_connection ();
 
 	gnome_init_with_popt_table ("nautilus-service-install-view", VERSION, 
                                     argc, argv,
diff --git a/components/services/inventory/main.c b/components/services/inventory/main.c
index 01c2d2b64..83cad29d6 100644
--- a/components/services/inventory/main.c
+++ b/components/services/inventory/main.c
@@ -113,6 +113,9 @@ main (int argc,
 	bindtextdomain (PACKAGE, GNOMELOCALEDIR);
 	textdomain (PACKAGE);
 #endif
+	
+	/* Disable session manager connection */
+	gnome_client_disable_master_connection ();
 
 	if (!trilobite_init ("trilobite-inventory-service", "0.1", "/tmp/eazel-inventory.log", NULL, argc, argv)) {
 		g_error ("Could not initialize trilobite. :(");
diff --git a/components/services/login/nautilus-view/main.c b/components/services/login/nautilus-view/main.c
index b36eb01b1..ecf9f6de7 100644
--- a/components/services/login/nautilus-view/main.c
+++ b/components/services/login/nautilus-view/main.c
@@ -79,6 +79,9 @@ main (int argc, char *argv[])
 	bindtextdomain (PACKAGE, GNOMELOCALEDIR);
 	textdomain (PACKAGE);
 #endif
+	
+	/* Disable session manager connection */
+	gnome_client_disable_master_connection ();
 
         gnome_init_with_popt_table ("nautilus-change-password-view", VERSION, 
                                     argc, argv,
diff --git a/components/services/summary/main.c b/components/services/summary/main.c
index 68ca3938b..050473b7d 100644
--- a/components/services/summary/main.c
+++ b/components/services/summary/main.c
@@ -82,6 +82,10 @@ main (int argc, char *argv[])
 	bindtextdomain (PACKAGE, GNOMELOCALEDIR);
 	textdomain (PACKAGE);
 #endif	
+	
+	/* Disable session manager connection */
+	gnome_client_disable_master_connection ();
+
         gnome_init_with_popt_table ("nautilus-summary-view", VERSION, 
                                     argc, argv,
                                     oaf_popt_options, 0, NULL);
diff --git a/components/services/summary/nautilus-view/main.c b/components/services/summary/nautilus-view/main.c
index 68ca3938b..050473b7d 100644
--- a/components/services/summary/nautilus-view/main.c
+++ b/components/services/summary/nautilus-view/main.c
@@ -82,6 +82,10 @@ main (int argc, char *argv[])
 	bindtextdomain (PACKAGE, GNOMELOCALEDIR);
 	textdomain (PACKAGE);
 #endif	
+	
+	/* Disable session manager connection */
+	gnome_client_disable_master_connection ();
+
         gnome_init_with_popt_table ("nautilus-summary-view", VERSION, 
                                     argc, argv,
                                     oaf_popt_options, 0, NULL);
diff --git a/components/shell/shell.c b/components/shell/shell.c
index 41272c7b8..abd2bfba1 100644
--- a/components/shell/shell.c
+++ b/components/shell/shell.c
@@ -54,6 +54,9 @@ CORBA_ORB orb;
 static void
 init_bonobo (int argc, char **argv)
 {
+    /* Disable session manager connection */
+    gnome_client_disable_master_connection ();
+
     gnome_init_with_popt_table ("xterm-control-factory", "0.0",
 				argc, argv, oaf_popt_options, 0, NULL);
     gdk_rgb_init ();
diff --git a/components/text/main.c b/components/text/main.c
index cd2f09380..af1e5ea4b 100644
--- a/components/text/main.c
+++ b/components/text/main.c
@@ -99,6 +99,9 @@ main (int argc, char *argv[])
 			 NULL);
 	}
 
+	/* Disable session manager connection */
+	gnome_client_disable_master_connection ();
+
 	gnome_init_with_popt_table("nautilus-text-view", VERSION, 
 				   argc, argv,
 				   oaf_popt_options, 0, NULL); 
diff --git a/components/throbber/main.c b/components/throbber/main.c
index 9aab2cc03..cf8bea65f 100644
--- a/components/throbber/main.c
+++ b/components/throbber/main.c
@@ -94,6 +94,9 @@ main (int argc, char *argv[])
 			 NULL);
 	}
 
+	/* Disable session manager connection */
+	gnome_client_disable_master_connection ();
+
 	gnome_init_with_popt_table("nautilus-throbber", VERSION, 
 				   argc, argv,
 				   oaf_popt_options, 0, NULL); 
diff --git a/components/tree/main.c b/components/tree/main.c
index 5be759c8e..57d56a4cc 100644
--- a/components/tree/main.c
+++ b/components/tree/main.c
@@ -96,6 +96,9 @@ main (int argc, char *argv[])
 	bindtextdomain (PACKAGE, GNOMELOCALEDIR);
 	textdomain (PACKAGE);
 #endif
+
+	/* Disable session manager connection */
+	gnome_client_disable_master_connection ();
 	
 	/* Initialize the services that we use. */