Re: components connecting to session manager?

[Havoc Pennington <hp redhat com>]

On Fri, Feb 14, 2003 at 02:12:59PM +1300, Mark McLoughlin wrote: 
> 	The alternative is to add GNOME_CLIENT_PARAM_SM_CONNECT, FALSE to all
> gnome_program_inits for all components. No problem with doing that for
> applets, but looking at libbonoboui its not as straighforward as we need
> to know whether its a factory that's being initialised or whether its
> just a normal application (which should be session managed).
> 
> 	Thoughts ?

I'd have to agree with Michael, I think we have to fix all the applets
and components. Appended is a patch for gnome-panel...

Havoc

Index: applets/gen_util/clock.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/applets/gen_util/Attic/clock.c,v
retrieving revision 1.96
diff -u -p -u -r1.96 clock.c
--- applets/gen_util/clock.c	6 Jan 2003 00:48:37 -0000	1.96
+++ applets/gen_util/clock.c	14 Feb 2003 22:07:27 -0000
@@ -891,7 +891,8 @@ properties_response_cb (GtkWidget *widge
 			char *argv[2] = { "clock" };
 			applet_program = gnome_program_init ("clock", VERSION,
 							      LIBGNOME_MODULE, argc, argv,
-							      GNOME_PROGRAM_STANDARD_PROPERTIES, NULL);
+                                                             GNOME_CLIENT_PARAM_SM_CONNECT, FALSE,
+                                                             GNOME_PROGRAM_STANDARD_PROPERTIES, NULL);
 		}
 
 		egg_help_display_desktop_on_screen (
@@ -1132,7 +1133,8 @@ display_help_dialog (BonoboUIComponent *
 		int argc = 1;
 		char *argv[2] = { "clock" };
 		applet_program = gnome_program_init ("clock", VERSION,
-						      LIBGNOME_MODULE, argc, argv,
+                                                     LIBGNOME_MODULE, argc, argv,
+                                                     GNOME_CLIENT_PARAM_SM_CONNECT, FALSE,
 						      GNOME_PROGRAM_STANDARD_PROPERTIES, NULL);
 	}
 
Index: applets/gen_util/mailcheck.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/applets/gen_util/Attic/mailcheck.c,v
retrieving revision 1.110.2.1
diff -u -p -u -r1.110.2.1 mailcheck.c
--- applets/gen_util/mailcheck.c	22 Jan 2003 13:53:44 -0000	1.110.2.1
+++ applets/gen_util/mailcheck.c	14 Feb 2003 22:07:27 -0000
@@ -1622,6 +1622,7 @@ phelp_cb (GtkDialog *w, gint tab, MailCh
 		char *argv[2] = { "mailcheck" };
 		applet_program = gnome_program_init ("mailcheck", VERSION,
 						      LIBGNOME_MODULE, argc, argv,
+						     GNOME_CLIENT_PARAM_SM_CONNECT, FALSE,
      						      GNOME_PROGRAM_STANDARD_PROPERTIES, NULL);
 	}
 
@@ -1830,6 +1831,7 @@ help_callback (BonoboUIComponent *uic, M
 		char *argv[2] = { "mailcheck" };
 		applet_program = gnome_program_init ("mailcheck", VERSION,
 						      LIBGNOME_MODULE, argc, argv,
+						     GNOME_CLIENT_PARAM_SM_CONNECT, FALSE,
 						      GNOME_PROGRAM_STANDARD_PROPERTIES, NULL);
 	}
 
Index: applets/gen_util/pager.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/applets/gen_util/Attic/pager.c,v
retrieving revision 1.47.2.3
diff -u -p -u -r1.47.2.3 pager.c
--- applets/gen_util/pager.c	26 Jan 2003 20:11:56 -0000	1.47.2.3
+++ applets/gen_util/pager.c	14 Feb 2003 22:07:27 -0000
@@ -170,6 +170,7 @@ response_cb(GtkWidget * widget,int id, P
 			char *argv[2] = { "workspace-switcher" };
 			applet_program = gnome_program_init ("workspace-switcher", VERSION,
 							     LIBGNOME_MODULE, argc, argv,
+                                                             GNOME_CLIENT_PARAM_SM_CONNECT, FALSE,
 							     GNOME_PROGRAM_STANDARD_PROPERTIES, NULL);
 		}
 
@@ -505,6 +506,7 @@ display_help_dialog (BonoboUIComponent *
 		char *argv[2] = { "workspace-switcher" };
 		applet_program = gnome_program_init ("workspace-switcher", VERSION,
 						     LIBGNOME_MODULE, argc, argv,
+                                                     GNOME_CLIENT_PARAM_SM_CONNECT, FALSE,
 						     GNOME_PROGRAM_STANDARD_PROPERTIES, NULL);
 	}
 
Index: applets/gen_util/showdesktop.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/applets/gen_util/Attic/showdesktop.c,v
retrieving revision 1.3
diff -u -p -u -r1.3 showdesktop.c
--- applets/gen_util/showdesktop.c	19 Dec 2002 21:08:50 -0000	1.3
+++ applets/gen_util/showdesktop.c	14 Feb 2003 22:07:27 -0000
@@ -395,6 +395,7 @@ display_help_dialog (BonoboUIComponent *
                 char *argv[2] = { "show-desktop" };
                 applet_program = gnome_program_init ("show-desktop", VERSION,
                                                      LIBGNOME_MODULE, argc, argv,
+                                                     GNOME_CLIENT_PARAM_SM_CONNECT, FALSE,
                                                      GNOME_PROGRAM_STANDARD_PROPERTIES, NULL);
         }
 
Index: applets/gen_util/tasklist.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/applets/gen_util/Attic/tasklist.c,v
retrieving revision 1.46.2.2
diff -u -p -u -r1.46.2.2 tasklist.c
--- applets/gen_util/tasklist.c	26 Jan 2003 20:11:56 -0000	1.46.2.2
+++ applets/gen_util/tasklist.c	14 Feb 2003 22:07:28 -0000
@@ -106,6 +106,7 @@ response_cb(GtkWidget * widget,int id, T
 			char *argv[2] = { "window-list" };
 			applet_program = gnome_program_init ("window-list", VERSION,
 							     LIBGNOME_MODULE,argc, argv,
+                                                             GNOME_CLIENT_PARAM_SM_CONNECT, FALSE,
 							     GNOME_PROGRAM_STANDARD_PROPERTIES,NULL);
 		}
 
@@ -748,6 +749,7 @@ display_help_dialog (BonoboUIComponent *
 		char *argv[2] = { "window-list" };
 		applet_program = gnome_program_init ("window-list", VERSION,
 						     LIBGNOME_MODULE,argc, argv,
+                                                     GNOME_CLIENT_PARAM_SM_CONNECT, FALSE,
 						     GNOME_PROGRAM_STANDARD_PROPERTIES,NULL);
 	}
 
Index: libpanel-applet/panel-applet.h
===================================================================
RCS file: /cvs/gnome/gnome-panel/libpanel-applet/panel-applet.h,v
retrieving revision 1.33
diff -u -p -u -r1.33 panel-applet.h
--- libpanel-applet/panel-applet.h	2 Jul 2002 01:56:55 -0000	1.33
+++ libpanel-applet/panel-applet.h	14 Feb 2003 22:07:28 -0000
@@ -29,6 +29,7 @@
 #include <gtk/gtkenums.h>
 #include <gtk/gtkeventbox.h>
 #include <libgnomeui/gnome-ui-init.h>
+#include <libgnomeui/gnome-client.h>
 #include <bonobo/bonobo-control.h>
 #include <bonobo/bonobo-ui-component.h>
 #include <bonobo/bonobo-generic-factory.h>
@@ -182,6 +183,7 @@ int main (int argc, char *argv [])						
 	gnome_program_init (name, version,					\
 			    LIBGNOMEUI_MODULE,					\
 			    argc, argv,						\
+                            GNOME_CLIENT_PARAM_SM_CONNECT, FALSE,               \
 			    GNOME_PROGRAM_STANDARD_PROPERTIES,			\
 			    NULL);						\
         return panel_applet_factory_main (iid, type, callback, data);		\
@@ -193,6 +195,7 @@ int main (int argc, char *argv [])						
 	gnome_program_init (name, version,					\
 			    LIBGNOMEUI_MODULE,					\
 			    argc, argv,						\
+                            GNOME_CLIENT_PARAM_SM_CONNECT, FALSE,               \
 			    GNOME_PARAM_NONE);					\
         return panel_applet_factory_main (iid, type, callback, data);		\
 }
@@ -209,6 +212,7 @@ int main (int argc, char *argv [])						
 	gnome_program_init (name, version,					\
 			    LIBGNOMEUI_MODULE,					\
 			    argc, argv,						\
+                            GNOME_CLIENT_PARAM_SM_CONNECT, FALSE,               \
 			    GNOME_PROGRAM_STANDARD_PROPERTIES,			\
 			    NULL);						\
         return panel_applet_factory_main (iid, type, callback, data);		\
@@ -223,6 +227,7 @@ int main (int argc, char *argv [])						
 	gnome_program_init (name, version,					\
 			    LIBGNOMEUI_MODULE,					\
 			    argc, argv,						\
+                            GNOME_CLIENT_PARAM_SM_CONNECT, FALSE,               \
 			    GNOME_PARAM_NONE);					\
         return panel_applet_factory_main (iid, type, callback, data);		\
 }