[gnome-panel] panel: Remove code to migrate pre-2.4 panel configuration



commit 9c94a53b51d7093f4574b5e49c871d62c6e79ba7
Author: Vincent Untz <vuntz gnome org>
Date:   Wed Mar 23 10:37:34 2011 +0100

    panel: Remove code to migrate pre-2.4 panel configuration
    
    Users migrating from such an old version shouldn't expect the
    upgrade to keep their configuration for 3.0, really.

 gnome-panel/applet.c                 |    1 -
 gnome-panel/panel-compatibility.c    |  872 ----------------------------------
 gnome-panel/panel-compatibility.h    |    2 -
 gnome-panel/panel-general.schemas.in |    5 +-
 gnome-panel/panel-profile.c          |    5 -
 gnome-panel/panel.c                  |    1 -
 6 files changed, 1 insertions(+), 885 deletions(-)
---
diff --git a/gnome-panel/applet.c b/gnome-panel/applet.c
index 6cf0f8a..b8478a3 100644
--- a/gnome-panel/applet.c
+++ b/gnome-panel/applet.c
@@ -27,7 +27,6 @@
 #include "panel-action-button.h"
 #include "panel-menu-bar.h"
 #include "panel-separator.h"
-#include "panel-compatibility.h"
 #include "panel-toplevel.h"
 #include "panel-util.h"
 #include "panel-profile.h"
diff --git a/gnome-panel/panel-compatibility.c b/gnome-panel/panel-compatibility.c
index 20451ff..317fada 100644
--- a/gnome-panel/panel-compatibility.c
+++ b/gnome-panel/panel-compatibility.c
@@ -30,882 +30,10 @@
 #include "panel-compatibility.h"
 
 #include "panel-profile.h"
-#include "panel-menu-bar.h"
 #include "panel-applet-frame.h"
 #include "panel-applets-manager.h"
-#include "panel-globals.h"
 #include "panel-util.h"
 
-typedef enum {
-	PANEL_ORIENT_UP,
-	PANEL_ORIENT_DOWN,
-	PANEL_ORIENT_LEFT,
-	PANEL_ORIENT_RIGHT,
-} PanelOrient;
-
-static GConfEnumStringPair panel_orientation_map [] = {
-	{ GTK_ORIENTATION_HORIZONTAL, "panel-orientation-horizontal" },
-	{ GTK_ORIENTATION_VERTICAL,   "panel-orientation-vertical" },
-	{ 0,                          NULL }
-};
-
-
-static gboolean
-panel_compatibility_map_orientation_string (const char     *str,
-					    GtkOrientation *orientation)
-{
-	int mapped;
-
-	g_return_val_if_fail (orientation != NULL, FALSE);
-
-	if (!str)
-		return FALSE;
-
-	if (!gconf_string_to_enum (panel_orientation_map, str, &mapped))
-		return FALSE;
-
-	*orientation = mapped;
-
-	return TRUE;
-}
-
-typedef enum {
-	BORDER_TOP,
-	BORDER_RIGHT,
-	BORDER_BOTTOM,
-	BORDER_LEFT
-} BorderEdge;
-
-static GConfEnumStringPair panel_edge_map [] = {
-	{ BORDER_TOP,    "panel-edge-top" },
-	{ BORDER_RIGHT,  "panel-edge-right" },
-	{ BORDER_BOTTOM, "panel-edge-bottom" },
-	{ BORDER_LEFT,   "panel-edge-left" },
-	{ 0,             NULL }
-};
-
-static gboolean
-panel_compatibility_map_edge_string (const char *str,
-				     BorderEdge *edge)
-{
-	int mapped;
-
-	g_return_val_if_fail (edge != NULL, FALSE);
-
-	if (!str)
-		return FALSE;
-
-	if (!gconf_string_to_enum (panel_edge_map, str, &mapped))
-		return FALSE;
-
-	*edge = mapped;
-
-	return TRUE;
-}
-
-typedef enum {
-	EDGE_PANEL,
-	ALIGNED_PANEL,
-	SLIDING_PANEL,
-	FLOATING_PANEL,
-	MENU_PANEL
-} PanelType;
-
-static GConfEnumStringPair panel_type_map [] = {
-	{ EDGE_PANEL,      "edge-panel" },
-	{ ALIGNED_PANEL,   "aligned-panel" },
-	{ SLIDING_PANEL,   "sliding-panel" },
-	{ FLOATING_PANEL,  "floating-panel" },
-	{ MENU_PANEL,      "menu-panel" },
-	{ 0,               NULL }
-};
-
-static gboolean
-panel_compatibility_map_panel_type_string (const char *str,
-					   PanelType  *type)
-{
-	int mapped;
-
-	g_return_val_if_fail (type != NULL, FALSE);
-
-	if (!str)
-		return FALSE;
-
-	if (!gconf_string_to_enum (panel_type_map, str, &mapped))
-		return FALSE;
-
-	*type = mapped;
-
-	return TRUE;
-}
-
-enum {
-	PANEL_SIZE_XX_SMALL = 12,
-	PANEL_SIZE_X_SMALL  = 24,
-	PANEL_SIZE_SMALL    = 36,
-	PANEL_SIZE_MEDIUM   = 48,
-	PANEL_SIZE_LARGE    = 64,
-	PANEL_SIZE_X_LARGE  = 80,
-	PANEL_SIZE_XX_LARGE = 128
-};
-
-static GConfEnumStringPair panel_size_map [] = {
-	{ PANEL_SIZE_XX_SMALL, "panel-size-xx-small" },
-	{ PANEL_SIZE_X_SMALL,  "panel-size-x-small" },
-	{ PANEL_SIZE_SMALL,    "panel-size-small" },
-	{ PANEL_SIZE_MEDIUM,   "panel-size-medium" },
-	{ PANEL_SIZE_LARGE,    "panel-size-large" },
-	{ PANEL_SIZE_X_LARGE,  "panel-size-x-large" },
-	{ PANEL_SIZE_XX_LARGE, "panel-size-xx-large" },
-	{ 0,                   NULL }
-};
-
-static gboolean
-panel_compatibility_map_panel_size_string (const char *str,
-					   int        *size)
-{
-	int mapped;
-
-	g_return_val_if_fail (size != NULL, FALSE);
-
-	if (!str)
-		return FALSE;
-
-	if (!gconf_string_to_enum (panel_size_map, str, &mapped))
-		return FALSE;
-
-	*size = mapped;
-
-	return TRUE;
-}
-
-static GConfEnumStringPair panel_background_type_map [] = {
-	{ PANEL_BACK_NONE,   "no-background" },
-	{ PANEL_BACK_COLOR,  "color-background" },
-	{ PANEL_BACK_IMAGE,  "pixmap-background" },
-	{ 0,                 NULL }
-};
-
-static gboolean
-panel_compatibility_map_background_type_string (const char          *str,
-						PanelBackgroundType *type)
-{
-	int mapped;
-
-	g_return_val_if_fail (type != NULL, FALSE);
-
-	if (!str)
-		return FALSE;
-
-	if (!gconf_string_to_enum (panel_background_type_map, str, &mapped))
-		return FALSE;
-
-	*type = mapped;
-
-	return TRUE;
-}
-
-static void
-panel_compatibility_migrate_background_settings (GConfClient *client,
-						 const char  *toplevel_dir,
-						 const char  *panel_dir)
-{
-	PanelBackgroundType  type;
-	const char          *key;
-	char                *background_dir;
-	char                *type_str;
-	char                *color_str;
-	char                *image_str;
-	gboolean             fit;
-	gboolean             stretch;
-	gboolean             rotate;
-	int                  opacity;
-
-	background_dir = gconf_concat_dir_and_key (toplevel_dir, "background");
-
-	/* panel_background_type -> background/type */
-	key = panel_gconf_sprintf ("%s/panel_background_type", panel_dir);
-	type_str = gconf_client_get_string (client, key, NULL);
-
-	if (panel_compatibility_map_background_type_string (type_str, &type)) {
-		key = panel_gconf_sprintf ("%s/type", background_dir);
-		gconf_client_set_string (client,
-					 key,
-					 panel_profile_map_background_type (type),
-					 NULL);
-	}
-
-	g_free (type_str);
-
-	/* panel_background_color -> background/color */
-	key = panel_gconf_sprintf ("%s/panel_background_color", panel_dir);
-	color_str = gconf_client_get_string (client, key, NULL);
-
-	if (color_str) {
-		key = panel_gconf_sprintf ("%s/color", background_dir);
-		gconf_client_set_string (client, key, color_str, NULL);
-	}
-
-	g_free (color_str);
-
-	/* panel_background_color_alpha -> background/opacity */
-	key = panel_gconf_sprintf ("%s/panel_background_color_alpha", panel_dir);
-	opacity = gconf_client_get_int (client, key, NULL);
-
-	key = panel_gconf_sprintf ("%s/opacity", background_dir);
-	gconf_client_set_int (client, key, opacity, NULL);
-
-	/* panel_background_pixmap -> background/image */
-	key = panel_gconf_sprintf ("%s/panel_background_pixmap", panel_dir);
-	image_str = gconf_client_get_string (client, key, NULL);
-
-	if (image_str) {
-		key = panel_gconf_sprintf ("%s/image", background_dir);
-		gconf_client_set_string (client, key, image_str, NULL);
-	}
-
-	g_free (image_str);
-
-	/* panel_background_pixmap_fit -> background/fit */
-	key = panel_gconf_sprintf ("%s/panel_background_pixmap_fit", panel_dir);
-	fit = gconf_client_get_bool (client, key, NULL);
-
-	key = panel_gconf_sprintf ("%s/fit", background_dir);
-	gconf_client_set_bool (client, key, fit, NULL);
-
-	/* panel_background_pixmap_stretch -> background/stretch */
-	key = panel_gconf_sprintf ("%s/panel_background_pixmap_stretch", panel_dir);
-	stretch = gconf_client_get_bool (client, key, NULL);
-
-	key = panel_gconf_sprintf ("%s/stretch", background_dir);
-	gconf_client_set_bool (client, key, stretch, NULL);
-
-	/* panel_background_pixmap_rotate -> background/rotate */
-	key = panel_gconf_sprintf ("%s/panel_background_pixmap_rotate", panel_dir);
-	rotate = gconf_client_get_bool (client, key, NULL);
-
-	key = panel_gconf_sprintf ("%s/rotate", background_dir);
-	gconf_client_set_bool (client, key, rotate, NULL);
-
-	g_free (background_dir);
-}
-
-static void
-panel_compatibility_migrate_edge_setting (GConfClient *client,
-					  const char  *toplevel_dir,
-					  const char  *panel_dir)
-{
-	BorderEdge  edge;
-	const char *key;
-	char       *edge_str;
-
-	key = panel_gconf_sprintf ("%s/screen_edge", panel_dir);
-	edge_str = gconf_client_get_string (client, key, NULL);
-
-	if (panel_compatibility_map_edge_string (edge_str, &edge)) {
-		PanelOrientation orientation;
-
-		switch (edge) {
-		case BORDER_TOP:
-			orientation = PANEL_ORIENTATION_TOP;
-			break;
-		case BORDER_BOTTOM:
-			orientation = PANEL_ORIENTATION_BOTTOM;
-			break;
-		case BORDER_LEFT:
-			orientation = PANEL_ORIENTATION_LEFT;
-			break;
-		case BORDER_RIGHT:
-			orientation = PANEL_ORIENTATION_RIGHT;
-			break;
-		default:
-			orientation = 0;
-			g_assert_not_reached ();
-			break;
-		}
-
-		key = panel_gconf_sprintf ("%s/orientation", toplevel_dir);
-		gconf_client_set_string (client,
-					 key,
-					 panel_profile_map_orientation (orientation),
-					 NULL);
-	}
-
-	g_free (edge_str);
-}
-
-static void
-panel_compatibility_migrate_edge_panel_settings (GConfClient *client,
-						 const char  *toplevel_dir,
-						 const char  *panel_dir)
-{
-	const char *key;
-
-	key = panel_gconf_sprintf ("%s/expand", toplevel_dir);
-	gconf_client_set_bool (client, key, TRUE, NULL);
-
-	panel_compatibility_migrate_edge_setting (client, toplevel_dir, panel_dir);
-}
-
-static void
-panel_compatibility_migrate_corner_panel_settings (GConfClient *client,
-						   const char  *toplevel_dir,
-						   const char  *panel_dir)
-
-{
-	const char *key;
-
-	key = panel_gconf_sprintf ("%s/expand", toplevel_dir);
-	gconf_client_set_bool (client, key, FALSE, NULL);
-
-	/* screen edge */
-	panel_compatibility_migrate_edge_setting (client, toplevel_dir, panel_dir);
-
-	g_warning ("FIXME: implement migrating the 'panel_align' setting");
-}
-
-static void
-panel_compatibility_migrate_sliding_panel_settings (GConfClient *client,
-						    const char  *toplevel_dir,
-						    const char  *panel_dir)
-{
-	const char *key;
-
-	key = panel_gconf_sprintf ("%s/expand", toplevel_dir);
-	gconf_client_set_bool (client, key, FALSE, NULL);
-
-	/* screen edge */
-	panel_compatibility_migrate_edge_setting (client, toplevel_dir, panel_dir);
-
-	g_warning ("FIXME: implement migrating the 'panel_anchor' and 'panel_offset' settings");
-}
-
-static void
-panel_compatibility_migrate_floating_panel_settings (GConfClient *client,
-						     const char  *toplevel_dir,
-						     const char  *panel_dir)
-{
-	GtkOrientation  orientation;
-	const char     *key;
-	char           *orientation_str;
-	int             x, y;
-
-	key = panel_gconf_sprintf ("%s/expand", toplevel_dir);
-	gconf_client_set_bool (client, key, FALSE, NULL);
-
-	key = panel_gconf_sprintf ("%s/panel_orient", panel_dir);
-	orientation_str = gconf_client_get_string (client, key, NULL);
-
-	if (panel_compatibility_map_orientation_string (orientation_str, &orientation)) {
-		PanelOrientation panel_orientation;
-
-		switch (orientation) {
-		case GTK_ORIENTATION_HORIZONTAL:
-			panel_orientation = PANEL_ORIENTATION_TOP;
-			break;
-		case GTK_ORIENTATION_VERTICAL:
-			panel_orientation = PANEL_ORIENTATION_LEFT;
-			break;
-		default:
-			panel_orientation = 0;
-			g_assert_not_reached ();
-			break;
-		}
-
-		key = panel_gconf_sprintf ("%s/orientation", toplevel_dir);
-		gconf_client_set_string (client,
-					 key,
-					 panel_profile_map_orientation (panel_orientation),
-					 NULL);
-	}
-
-	g_free (orientation_str);
-
-	/* x */
-	key = panel_gconf_sprintf ("%s/panel_x_position", panel_dir);
-	x = gconf_client_get_int (client, key, NULL);
-
-	key = panel_gconf_sprintf ("%s/x", toplevel_dir);
-	gconf_client_set_int (client, key, x, NULL);
-
-	/* y */
-	key = panel_gconf_sprintf ("%s/panel_y_position", panel_dir);
-	y = gconf_client_get_int (client, key, NULL);
-
-	key = panel_gconf_sprintf ("%s/y", toplevel_dir);
-	gconf_client_set_int (client, key, y, NULL);
-}
-
-static void
-panel_compatibility_migrate_menu_panel_settings (GConfClient *client,
-						 const char  *toplevel_dir,
-						 const char  *panel_dir)
-{
-	const char *key;
-	const char *toplevel_id;
-	char       *id;
-
-	key = panel_gconf_sprintf ("%s/expand", toplevel_dir);
-	gconf_client_set_bool (client, key, TRUE, NULL);
-
-	key = panel_gconf_sprintf ("%s/orientation", toplevel_dir);
-	gconf_client_set_string (client, key,
-				 panel_profile_map_orientation (PANEL_ORIENTATION_TOP),
-				 NULL);
-
-	toplevel_id = panel_gconf_basename (toplevel_dir);
-
-	/* menu bar on far right corner */
-        id = panel_profile_prepare_object_with_id (PANEL_OBJECT_MENU_BAR, toplevel_id, 0, FALSE);
-        panel_profile_add_to_list (PANEL_GCONF_OBJECTS, id);
-	g_free (id);
-
-	/* window menu on far left corner */
-        id = panel_profile_prepare_object_with_id (PANEL_OBJECT_APPLET, toplevel_id, 0, TRUE);
-
-	key = panel_gconf_full_key (PANEL_GCONF_APPLETS, id, "bonobo_iid");
-        gconf_client_set_string (client, key, "OAFIID:GNOME_WindowMenuApplet", NULL);
-
-        panel_profile_add_to_list (PANEL_GCONF_APPLETS, id);
-	g_free (id);
-}
-
-static void
-panel_compatibility_migrate_panel_type (GConfClient *client,
-					const char  *toplevel_dir,
-					const char  *panel_dir)
-{
-	PanelType   type;
-	const char *key;
-	char       *type_str;
-
-	key = panel_gconf_sprintf ("%s/panel_type", panel_dir);
-	type_str = gconf_client_get_string (client, key, NULL);
-
-	if (!panel_compatibility_map_panel_type_string (type_str, &type)) {
-		g_free (type_str);
-		return;
-	}
-
-	g_free (type_str);
-
-	switch (type) {
-	case EDGE_PANEL:
-		panel_compatibility_migrate_edge_panel_settings (client, toplevel_dir, panel_dir);
-		break;
-	case ALIGNED_PANEL:
-		panel_compatibility_migrate_corner_panel_settings (client, toplevel_dir, panel_dir);
-		break;
-	case SLIDING_PANEL:
-		panel_compatibility_migrate_sliding_panel_settings (client, toplevel_dir, panel_dir);
-		break;
-	case FLOATING_PANEL:
-		panel_compatibility_migrate_floating_panel_settings (client, toplevel_dir, panel_dir);
-		break;
-	case MENU_PANEL:
-		panel_compatibility_migrate_menu_panel_settings (client, toplevel_dir, panel_dir);
-		break;
-	default:
-		g_assert_not_reached ();
-		break;
-	}
-}
-
-static char *
-panel_compatibility_migrate_panel_settings (GConfClient *client,
-					    GSList      *toplevel_id_list,
-					    const char  *panel_id)
-{
-	const char *key;
-	char       *toplevel_id;
-	char       *toplevel_dir;
-	char       *panel_dir;
-	char       *size_str;
-	int         screen;
-	int         monitor;
-	int         size;
-	gboolean    enable_buttons;
-	gboolean    enable_arrows;
-	gboolean    auto_hide;
-
-	toplevel_id = panel_profile_find_new_id (PANEL_GCONF_TOPLEVELS);
-
-	toplevel_dir = g_strdup_printf (PANEL_CONFIG_DIR "/toplevels/%s", toplevel_id);
-	panel_dir    = g_strdup_printf (PANEL_CONFIG_DIR "/panels/%s", panel_id);
-
-	panel_gconf_associate_schemas_in_dir (
-			client, toplevel_dir, PANEL_SCHEMAS_DIR "/toplevels");
-
-	/* screen */
-	key = panel_gconf_sprintf ("%s/screen", panel_dir);
-	screen = gconf_client_get_int (client, key, NULL);
-
-	key = panel_gconf_sprintf ("%s/screen", toplevel_dir);
-	gconf_client_set_int (client, key, screen, NULL);
-
-	/* monitor */
-	key = panel_gconf_sprintf ("%s/monitor", panel_dir);
-	monitor = gconf_client_get_int (client, key, NULL);
-
-	key = panel_gconf_sprintf ("%s/monitor", toplevel_dir);
-	gconf_client_set_int (client, key, monitor, NULL);
-
-	/* size */
-	key = panel_gconf_sprintf ("%s/panel_size", panel_dir);
-	size_str = gconf_client_get_string (client, key, NULL);
-
-	if (panel_compatibility_map_panel_size_string (size_str, &size)) {
-		key = panel_gconf_sprintf ("%s/size", toplevel_dir);
-		gconf_client_set_int (client, key, size, NULL);
-	}
-
-	g_free (size_str);
-
-	/* enable_buttons */
-	key = panel_gconf_sprintf ("%s/hide_buttons_enabled", panel_dir);
-	enable_buttons = gconf_client_get_bool (client, key, NULL);
-
-	key = panel_gconf_sprintf ("%s/enable_buttons", toplevel_dir);
-	gconf_client_set_bool (client, key, enable_buttons, NULL);
-
-	/* enable_arrows */
-	key = panel_gconf_sprintf ("%s/hide_button_pixmaps_enabled", panel_dir);
-	enable_arrows = gconf_client_get_bool (client, key, NULL);
-
-	key = panel_gconf_sprintf ("%s/enable_arrows", toplevel_dir);
-	gconf_client_set_bool (client, key, enable_arrows, NULL);
-
-	/* auto hide */
-	key = panel_gconf_sprintf ("%s/panel_hide_mode", panel_dir);
-	auto_hide = gconf_client_get_int (client, key, NULL);
-
-	key = panel_gconf_sprintf ("%s/auto_hide", toplevel_dir);
-	gconf_client_set_bool (client, key, auto_hide, NULL);
-
-	/* migrate different panel types to toplevels */
-	panel_compatibility_migrate_panel_type (client, toplevel_dir, panel_dir);
-
-	/* background settings */
-	panel_compatibility_migrate_background_settings (client, toplevel_dir, panel_dir);
-
-	g_free (toplevel_dir);	
-	g_free (panel_dir);
-
-	return toplevel_id;
-}
-
-static gboolean
-panel_compatibility_migrate_panel_id (GConfClient       *client,
-				      PanelGConfKeyType  key_type,
-				      const char        *object_id,
-				      GHashTable        *panel_id_hash)
-{
-	const char *key;
-	char       *panel_id;
-	char       *toplevel_id;
-	gboolean    retval = FALSE;
-
-	/* panel_id -> toplevel_id */
-	key = panel_gconf_full_key (key_type, object_id, "panel_id");
-	panel_id = gconf_client_get_string (client, key, NULL);
-
-	if (panel_id && (toplevel_id = g_hash_table_lookup (panel_id_hash, panel_id))) {
-		key = panel_gconf_full_key (key_type, object_id, "toplevel_id");
-		gconf_client_set_string (client, key, toplevel_id, NULL);
-
-		retval = TRUE;
-	}
-
-	g_free (panel_id);
-
-	return retval;
-}
-
-static void
-panel_compatibility_migrate_menu_button_settings (GConfClient       *client,
-						  PanelGConfKeyType  key_type,
-						  const char        *object_id)
-{
-	const char *key;
-	gboolean    use_custom_icon;
-	gboolean    use_menu_path;
-	char       *custom_icon;
-	char       *menu_path;
-
-	/* custom-icon -> use_custom_icon */
-	key = panel_gconf_full_key (key_type, object_id, "custom-icon");
-	use_custom_icon = gconf_client_get_bool (client, key, NULL);
-
-	key = panel_gconf_full_key (key_type, object_id, "use_custom_icon");
-	gconf_client_set_bool (client, key, use_custom_icon, NULL);
-
-	/* custom-icon-file -> custom_icon */
-	key = panel_gconf_full_key (key_type, object_id, "custom-icon-file");
-	custom_icon = gconf_client_get_string (client, key, NULL);
-
-	if (custom_icon) {
-		key = panel_gconf_full_key (key_type, object_id, "custom_icon");
-		gconf_client_set_string (client, key, custom_icon, NULL);
-	}
-
-	/* main_menu -> ! use_menu_path */
-	key = panel_gconf_full_key (key_type, object_id, "main-menu");
-	use_menu_path = ! gconf_client_get_bool (client, key, NULL);
-
-	key = panel_gconf_full_key (key_type, object_id, "use_menu_path");
-	gconf_client_set_bool (client, key, use_menu_path, NULL);
-
-	/* path -> menu_path */
-	key = panel_gconf_full_key (key_type, object_id, "path");
-	menu_path = gconf_client_get_string (client, key, NULL);
-
-	if (menu_path) {
-		key = panel_gconf_full_key (key_type, object_id, "menu_path");
-		gconf_client_set_string (client, key, menu_path, NULL);
-	}
-
-	g_free (custom_icon);
-	g_free (menu_path);
-}
-
-static void
-panel_compatibility_migrate_objects (GConfClient       *client,
-				     PanelGConfKeyType  key_type,
-				     GHashTable        *panel_id_hash)
-{
-	const char *key;
-	GSList     *l, *objects;
-
-	key = panel_gconf_general_key (panel_gconf_key_type_to_id_list (key_type));
-	objects = gconf_client_get_list (client, key, GCONF_VALUE_STRING, NULL);
-
-	for (l = objects; l; l = l->next) {
-		const char      *id = l->data;
-		PanelObjectType  object_type;
-		char            *object_type_str;
-
-		if (!panel_compatibility_migrate_panel_id (client, key_type, id, panel_id_hash)) {
-			g_free (l->data);
-			continue;
-		}
-
-		key = panel_gconf_full_key (key_type, id, "object_type");
-		object_type_str = gconf_client_get_string (client, key, NULL);
-
-		if (panel_profile_map_object_type_string (object_type_str, &object_type)) {
-			switch (object_type) {
-			case PANEL_OBJECT_MENU:
-				panel_compatibility_migrate_menu_button_settings (
-						client, key_type, id);
-				break;
-			default:
-				break;
-			}
-		}
-		g_free (object_type_str);
-		g_free (l->data);
-	}
-	g_slist_free (objects);
-}
-
-/* Major hack, but we now set toplevel_id_list in the defaults database,
- * so we need to figure out if its actually set in the users database.
- */
-
-static GConfEngine *
-get_homedir_source (void)
-{
-	GConfEngine *engine;
-	GError      *error = NULL;
-	char        *source;
-
-	source = g_strdup_printf ("xml:readwrite:%s/.gconf", g_get_home_dir ());
-
-	if (!(engine = gconf_engine_get_for_address (source, &error))) {
-#if 0
-		g_warning ("Cannot get GConf source '%s': %s\n",
-			   source, error->message);
-#endif
-		g_error_free (error);
-		g_free (source);
-		return NULL;
-	}
-
-	g_free (source);
-
-	return engine;
-}
-
-static gboolean
-is_general_key_set (GConfEngine *engine,
-		    const char  *config_dir,
-		    const char  *general_key)
-{
-	GConfEntry *entry;
-	const char *key;
-	gboolean    retval;
-
-	key = panel_gconf_sprintf ("%s/general/%s", config_dir, general_key);
-
-	if (!(entry = gconf_engine_get_entry (engine, key, NULL, FALSE, NULL)))
-		return FALSE;
-
-	retval = gconf_entry_get_value (entry)       != NULL ||
-		 gconf_entry_get_schema_name (entry) != NULL;
-
-	gconf_entry_unref (entry);
-
-	return retval;
-}
-
-static gboolean
-panel_compatibility_detect_needs_migration (void)
-{
-	GConfEngine *engine;
-	gboolean     needs_migration = FALSE;
-
-	if (!(engine = get_homedir_source ()))
-		return FALSE;
-
-	if (!is_general_key_set (engine, PANEL_CONFIG_DIR, "panel_id_list"))
-		goto no_migration;
-
-	if (is_general_key_set (engine, PANEL_CONFIG_DIR, "toplevel_id_list"))
-		goto no_migration;
-
-	needs_migration = TRUE;
-
- no_migration:
-	gconf_engine_unref (engine);
-
-	return needs_migration;
-}
-
-/* If toplevel_id_list is unset, migrate all the panels in
- * panel_id_list to toplevels
- */
-void
-panel_compatibility_migrate_panel_id_list (GConfClient *client)
-{
-	GHashTable *panel_id_hash;
-	const char *key;
-	GSList     *panel_id_list;
-	GSList     *toplevel_id_list = NULL;
-	GSList     *l;
-
-	if (!panel_compatibility_detect_needs_migration ())
-		return;
-
-	panel_id_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
-
-	key = panel_gconf_general_key ("panel_id_list");
-	panel_id_list = gconf_client_get_list (client, key, GCONF_VALUE_STRING, NULL);
-
-	for (l = panel_id_list; l; l = l->next) {
-		char     *new_id;
-
-		new_id = panel_compatibility_migrate_panel_settings (client,
-								     toplevel_id_list,
-								     l->data);
-
-		toplevel_id_list = g_slist_prepend (toplevel_id_list, new_id);
-
-		g_hash_table_insert (panel_id_hash, l->data, new_id);
-	}
-
-	key = panel_gconf_general_key ("toplevel_id_list");
-	gconf_client_set_list (client, key, GCONF_VALUE_STRING, toplevel_id_list, NULL);
-
-	g_slist_free (panel_id_list);
-	g_slist_free (toplevel_id_list);
-
-	panel_compatibility_migrate_objects (client, PANEL_GCONF_OBJECTS, panel_id_hash);
-	panel_compatibility_migrate_objects (client, PANEL_GCONF_APPLETS, panel_id_hash);
-
-	g_hash_table_destroy (panel_id_hash);
-}
-
-static void
-copy_gconf_dir (GConfClient  *client,
-		const char   *src_dir,
-		const char   *dest_dir)
-{
-	GSList *list, *l;
-
-	list = gconf_client_all_entries (client, src_dir, NULL);
-	for (l = list; l; l = l->next) {
-		GConfEntry *entry = l->data;
-		const char *key;
-		char       *tmp;
-
-		tmp = g_path_get_basename (gconf_entry_get_key (entry));
-		key = panel_gconf_sprintf ("%s/%s", dest_dir, tmp);
-		g_free (tmp);
-
-		if (gconf_entry_get_schema_name (entry))
-			gconf_engine_associate_schema (client->engine,
-						       key,
-						       gconf_entry_get_schema_name (entry),
-						       NULL);
-
-		if (entry->value)
-			gconf_client_set (client, key, entry->value, NULL);
-
-		gconf_entry_unref (entry);
-	}
-	g_slist_free (list);
-
-	list = gconf_client_all_dirs (client, src_dir, NULL);
-	for (l = list; l; l = l->next) {
-		char *subdir = l->data;
-		char *src_subdir;
-		char *dest_subdir;
-		char *tmp;
-
-		tmp = g_path_get_basename (subdir);
-		src_subdir  = gconf_concat_dir_and_key (src_dir,  tmp);
-		dest_subdir = gconf_concat_dir_and_key (dest_dir, tmp);
-		g_free (tmp);
-
-		copy_gconf_dir (client, src_subdir, dest_subdir);
-
-		g_free (src_subdir);
-		g_free (dest_subdir);
-		g_free (subdir);
-	}
-
-	g_slist_free (list);
-}
-
-void
-panel_compatibility_maybe_copy_old_config (GConfClient *client)
-{
-	GConfEngine *engine;
-	const char  *key;
-
-	key = panel_gconf_general_key ("profiles_migrated");
-	if (gconf_client_get_bool (client, key, NULL))
-		return;
-
-	if (!(engine = get_homedir_source ()))
-		goto no_migration_needed;;
-
-	if (!is_general_key_set (engine, PANEL_OLD_CONFIG_DIR, "panel_id_list")    &&
-	    !is_general_key_set (engine, PANEL_OLD_CONFIG_DIR, "toplevel_id_list") &&
-	    !is_general_key_set (engine, PANEL_OLD_CONFIG_DIR, "applet_id_list")   &&
-	    !is_general_key_set (engine, PANEL_OLD_CONFIG_DIR, "object_id_list"))
-		goto no_migration_needed;
-
-	copy_gconf_dir (client, PANEL_OLD_CONFIG_DIR, PANEL_CONFIG_DIR);
-
-	key = panel_gconf_general_key ("profiles_migrated");
-	gconf_client_set_bool (client, key, TRUE, NULL);
-
- no_migration_needed:
-	if (engine)
-		gconf_engine_unref (engine);
-}
-
 void
 panel_compatibility_migrate_applications_scheme (GConfClient *client,
 						 const char  *key)
diff --git a/gnome-panel/panel-compatibility.h b/gnome-panel/panel-compatibility.h
index e079ea7..8068b35 100644
--- a/gnome-panel/panel-compatibility.h
+++ b/gnome-panel/panel-compatibility.h
@@ -30,8 +30,6 @@
 
 G_BEGIN_DECLS
 
-void panel_compatibility_migrate_panel_id_list (GConfClient *client);
-void panel_compatibility_maybe_copy_old_config (GConfClient *client);
 void panel_compatibility_migrate_applications_scheme (GConfClient *client,
 						      const char  *key);
 void panel_compatibility_migrate_screenshot_action (GConfClient *client,
diff --git a/gnome-panel/panel-general.schemas.in b/gnome-panel/panel-general.schemas.in
index 0719b45..ceb314a 100644
--- a/gnome-panel/panel-general.schemas.in
+++ b/gnome-panel/panel-general.schemas.in
@@ -113,11 +113,8 @@
       <type>bool</type>
       <default>false</default>
       <locale name="C">
-        <short>Old profiles configuration migrated</short>
+        <short>Deprecated</short>
         <long>
-          A boolean flag to indicate whether the user's previous
-          configuration in /apps/panel/profiles/default has been
-          copied to the new location in /apps/panel.
         </long>
       </locale>
     </schema>
diff --git a/gnome-panel/panel-profile.c b/gnome-panel/panel-profile.c
index 4407744..d48dd1c 100644
--- a/gnome-panel/panel-profile.c
+++ b/gnome-panel/panel-profile.c
@@ -32,7 +32,6 @@
 #include <libpanel-util/panel-list.h>
 
 #include "applet.h"
-#include "panel-compatibility.h"
 #include "panel-gconf.h"
 #include "panel.h"
 #include "panel-widget.h"
@@ -2402,10 +2401,6 @@ panel_profile_load (void)
 
 	gconf_client_add_dir (client, PANEL_CONFIG_DIR "/general", GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
 
-	panel_compatibility_maybe_copy_old_config (client);
-
-	panel_compatibility_migrate_panel_id_list (client);
-
 	panel_profile_load_list (client,
 				 PANEL_CONFIG_DIR,
 				 PANEL_GCONF_TOPLEVELS,
diff --git a/gnome-panel/panel.c b/gnome-panel/panel.c
index 9649a5c..ac23c76 100644
--- a/gnome-panel/panel.c
+++ b/gnome-panel/panel.c
@@ -37,7 +37,6 @@
 #include "panel-action-button.h"
 #include "panel-menu-bar.h"
 #include "panel-separator.h"
-#include "panel-compatibility.h"
 #include "panel-multiscreen.h"
 #include "panel-toplevel.h"
 #include "panel-menu-button.h"



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]