panel config patch

[jacob berkman <jacob ximian com>]

anyone object to this patch?  it allows one to not have to have a
separate ~/.gnome dir if they want to not lose their panel settings. 
this is not a long term solution - just a hack so i can remove a patch i
have to libgnome.

jacob
-- 
"It drains me, and it shakes me, and hurts like hell everytime I play
it, looking out at thousands of people cheering and smiling, oblivious
to the tragedy of it's meaning, like when you're going to have your
dog put down and it's wagging it's tail on the way there." - Thom Yorke

Index: launcher.c
===================================================================
RCS file: /cvs/gnome/gnome-core/panel/launcher.c,v
retrieving revision 1.134
diff -u -r1.134 launcher.c
--- launcher.c	2001/09/21 19:23:51	1.134
+++ launcher.c	2001/09/24 17:10:18
@@ -910,7 +910,7 @@
 #endif
 #else
 	g_return_val_if_fail (base != NULL, NULL);
-	return g_strdup_printf ("%s/.gnome/panel.d/default/launchers/%s",
+	return g_strdup_printf ("%s/.gnome/panel-2.d/default/launchers/%s",
 				g_get_home_dir (),
 				base);
 #endif
Index: main.c
===================================================================
RCS file: /cvs/gnome/gnome-core/panel/main.c,v
retrieving revision 1.260
diff -u -r1.260 main.c
--- main.c	2001/09/21 19:23:51	1.260
+++ main.c	2001/09/24 17:10:18
@@ -434,6 +434,7 @@
 {
 	GtkWidget *dialog;
 
+	return;
 	/*
 	 * Even if this warning sounds funny - do NOT turn this
 	 * startup protection off unless you know exactly what
@@ -507,6 +508,7 @@
 		break;
 	}
 	default: {
+#if 0
 		GtkWidget *box = panel_error_dialog
 			("no_panel_register",
 			 _("There was a problem registering the panel "
@@ -514,6 +516,7 @@
 			   "The panel will now exit."));
 		gtk_dialog_run (GTK_DIALOG (box));
 		gtk_widget_destroy (box);
+#endif
 		return 0;
 		break;
 	}
@@ -535,14 +538,14 @@
 	if (gnome_client_get_flags (client) & GNOME_CLIENT_RESTORED)
 		old_panel_cfg_path = g_strdup (gnome_client_get_config_prefix (client));
 	else
-		old_panel_cfg_path = g_strdup ("/panel.d/default/");
+		old_panel_cfg_path = g_strdup ("/panel-2.d/default/");
 
 #ifndef PER_SESSION_CONFIGURATION
 	real_global_path = gnome_config_get_real_path (old_panel_cfg_path);
-	real_global_path = "";
+	real_global_path = g_strdup ("");
 	if ( ! g_file_test (real_global_path, G_FILE_TEST_EXISTS)) {
 		g_free (old_panel_cfg_path);
-		old_panel_cfg_path = g_strdup ("/panel.d/default/");
+		old_panel_cfg_path = g_strdup ("/panel-2.d/default/");
 	}
 	g_free (real_global_path);
 #endif /* !PER_SESSION_CONFIGURATION */
Index: session.c
===================================================================
RCS file: /cvs/gnome/gnome-core/panel/session.c,v
retrieving revision 1.197
diff -u -r1.197 session.c
--- session.c	2001/09/21 19:23:51	1.197
+++ session.c	2001/09/24 17:10:18
@@ -700,7 +700,7 @@
 		panel_cfg_path = g_strdup (gnome_client_get_config_prefix (client));
 	else
 #endif /* PER_SESSION_CONFIGURATION */		
-		panel_cfg_path = g_strdup ("/panel.d/default/");
+		panel_cfg_path = g_strdup ("/panel-2.d/default/");
 
 #ifdef PER_SESSION_CONFIGURATION
 	new_args[2] = gnome_config_get_real_path (panel_cfg_path);
@@ -942,7 +942,7 @@
 	if (commie_mode) {
 		gnome_config_pop_prefix ();
 		*sep = "=";
-		return g_strdup_printf ("=%s/panel.d/default/", GLOBAL_CONFDIR);
+		return g_strdup_printf ("=%s/panel-2.d/default/", GLOBAL_CONFDIR);
 	}
 
 	count = conditional_get_int (PANEL_CONFIG_PATH
@@ -953,7 +953,7 @@
 		return g_strdup (PANEL_CONFIG_PATH);
 	}
 
-	path = g_strdup_printf ("=%s/panel.d/default/panel=/Config/panel_count",
+	path = g_strdup_printf ("=%s/panel-2.d/default/panel=/Config/panel_count",
 				GLOBAL_CONFDIR);
 	count = conditional_get_int (path, 0, NULL);
 	g_free (path);
@@ -961,7 +961,7 @@
 	if (count > 0) {
 		gnome_config_pop_prefix ();
 		*sep = "=";
-		return g_strdup_printf ("=%s/panel.d/default/", GLOBAL_CONFDIR);
+		return g_strdup_printf ("=%s/panel-2.d/default/", GLOBAL_CONFDIR);
 	}
 
 	gnome_config_pop_prefix ();