Attachment #63124 for bug #98646

View | Details | Raw Unified | Return to bug 98646
Collapse All | Expand All

Lines 74-84 Link Here

(-)gnome-panel-2.10.2-r1/gnome-panel/panel-session.c.1 (-5 lines)
74	{	74	{
75	GnomeClient *client;	75	GnomeClient *client;
76		76
77	/* We don't want the WM to try and save/restore our
78	* window position
79	*/
80	gdk_set_sm_client_id (NULL);
81
82	client = gnome_master_client ();	77	client = gnome_master_client ();
83		78
84	if (!getenv ("GNOME_PANEL_DEBUG"))	79	if (!getenv ("GNOME_PANEL_DEBUG"))




	panel_multiscreen_init ();
	panel_init_stock_icons_and_items ();

	panel_session_init ();

	gconf_client_add_dir (panel_gconf_get_client (),
			      "/desktop/gnome/interface",
			      GCONF_CLIENT_PRELOAD_NONE,

	panel_lockdown_init ();
	panel_profile_load ();

	panel_session_init ();

	/*add forbidden lists to ALL panels*/
	g_slist_foreach (panels,
			 (GFunc)panel_widget_add_forbidden,

Return to bug 98646

Lines 71-78 Link Here

(-)gnome-panel-2.10.2-r1/gnome-panel/main.c.1 (-2 / +2 lines)
71	panel_multiscreen_init ();	71	panel_multiscreen_init ();
72	panel_init_stock_icons_and_items ();	72	panel_init_stock_icons_and_items ();
73		73
74	panel_session_init ();
75
76	gconf_client_add_dir (panel_gconf_get_client (),	74	gconf_client_add_dir (panel_gconf_get_client (),
77	"/desktop/gnome/interface",	75	"/desktop/gnome/interface",
78	GCONF_CLIENT_PRELOAD_NONE,	76	GCONF_CLIENT_PRELOAD_NONE,
Lines 82-87 Link Here
82	panel_lockdown_init ();	80	panel_lockdown_init ();
83	panel_profile_load ();	81	panel_profile_load ();
84		82
		83	panel_session_init ();
		84
85	/add forbidden lists to ALL panels/	85	/add forbidden lists to ALL panels/
86	g_slist_foreach (panels,	86	g_slist_foreach (panels,
87	(GFunc)panel_widget_add_forbidden,	87	(GFunc)panel_widget_add_forbidden,