Commit 82b50661 authored by Glynn Foster's avatar Glynn Foster Committed by Glynn Foster

Remove PER_SESSION cruft that just confuses me.

2001-12-13  Glynn Foster  <glynn.foster@sun.com>

	* launcher.c, main.c, session.c: Remove PER_SESSION cruft
	that just confuses me.
parent 2c098d2b
2001-12-13 Glynn Foster <glynn.foster@sun.com>
* launcher.c, main.c, session.c: Remove PER_SESSION cruft
that just confuses me.
Wed Dec 12 23:35:46 2001 George Lebl <jirka@5z.com>
* session.c: doh, remove a debugging g_print
......
......@@ -884,13 +884,6 @@ launcher_get_unique_uri (void)
char *
launcher_file_name (const char *base)
{
#ifdef PER_SESSION_CONFIGURATION
/* FIXME: this needs to do stuff, or perhaps just ignore per session
* configs */
#ifdef __GNUC__
#warning FIXME: per session config must be done for launchers
#endif
#else
char *tmp, *retval;
g_return_val_if_fail (base != NULL, NULL);
......@@ -905,7 +898,6 @@ launcher_file_name (const char *base)
g_free (tmp);
return retval;
#endif
}
......
......@@ -432,6 +432,7 @@ tell_user_Im_on_crack (void)
gtk_widget_destroy (dialog);
}
static void
session_notify_global_changes (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data) {
session_read_global_config ();
......@@ -491,15 +492,6 @@ main(int argc, char **argv)
else
old_panel_cfg_path = g_strdup (PANEL_CONFIG_PATH);
#ifndef PER_SESSION_CONFIGURATION
real_global_path = gnome_config_get_real_path (old_panel_cfg_path);
if ( ! g_file_test (real_global_path, G_FILE_TEST_EXISTS)) {
g_free (old_panel_cfg_path);
old_panel_cfg_path = g_strdup (PANEL_CONFIG_PATH);
}
g_free (real_global_path);
#endif /* !PER_SESSION_CONFIGURATION */
gnome_client_set_global_config_prefix (client, PANEL_CONFIG_PATH);
g_signal_connect (G_OBJECT (client), "save_yourself",
......
......@@ -535,9 +535,6 @@ do_session_save(GnomeClient *client,
gboolean sync_panels)
{
int num;
#if PER_SESSION_CONFIGURATION
gchar *new_args[] = { "rm", "-r", NULL };
#endif /* PER_SESSION_CONFIGURATION */
/* If in commie mode, then no saving is needed, the user
* could have changed anything anyway */
......@@ -547,19 +544,8 @@ do_session_save(GnomeClient *client,
if (panel_cfg_path)
g_free (panel_cfg_path);
#ifdef PER_SESSION_CONFIGURATION
if (gnome_client_get_flags(client) & GNOME_CLIENT_IS_CONNECTED &&
GNOME_CLIENT (client)->restart_style != GNOME_RESTART_NEVER)
panel_cfg_path = g_strdup (gnome_client_get_config_prefix (client));
else
#endif /* PER_SESSION_CONFIGURATION */
panel_cfg_path = g_strdup (PANEL_CONFIG_PATH);
#ifdef PER_SESSION_CONFIGURATION
new_args[2] = gnome_config_get_real_path (panel_cfg_path);
gnome_client_set_discard_command (client, 3, new_args);
#endif /* PER_SESSION_CONFIGURATION */
#ifdef SESSION_DEBUG
printf("Saving to [%s]\n",PANEL_CONFIG_PATH);
......@@ -621,25 +607,10 @@ panel_config_sync(void)
if(need_complete_save ||
applets_to_sync ||
panels_to_sync) {
#ifdef PER_SESSION_CONFIGURATION
if (!(gnome_client_get_flags(client) &
GNOME_CLIENT_IS_CONNECTED)) {
#endif
need_complete_save = FALSE;
applets_to_sync = FALSE;
panels_to_sync = FALSE;
do_session_save (client, ncs, ats, pts);
#ifdef PER_SESSION_CONFIGURATION
} else {
/*prevent possible races by doing this before requesting
save*/
need_complete_save = FALSE;
applets_to_sync = FALSE;
panels_to_sync = FALSE;
gnome_client_request_save (client, GNOME_SAVE_LOCAL, FALSE,
GNOME_INTERACT_NONE, FALSE, FALSE);
}
#endif /* PER_SESSION_CONFIGURATION */
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment