[gnome-panel/wip/3.0-freeze-break: 4/32] panel: Drop migration code for launchers from pre-2.10 days

[Vincent Untz <vuntz src gnome org>]

commit aad769b536e643cdb549520a7946928767aed81e
Author: Vincent Untz <vuntz gnome org>
Date:   Wed Mar 23 10:41:14 2011 +0100

    panel: Drop migration code for launchers from pre-2.10 days
    
    Same rationale as previous commit.

 gnome-panel/launcher.c            |    2 --
 gnome-panel/panel-compatibility.c |   36 ------------------------------------
 gnome-panel/panel-compatibility.h |    2 --
 3 files changed, 0 insertions(+), 40 deletions(-)
---
diff --git a/gnome-panel/launcher.c b/gnome-panel/launcher.c
index 9c42b1f..cf0e033 100644
--- a/gnome-panel/launcher.c
+++ b/gnome-panel/launcher.c
@@ -41,7 +41,6 @@
 #include "panel-globals.h"
 #include "panel-multiscreen.h"
 #include "panel-lockdown.h"
-#include "panel-compatibility.h"
 #include "panel-ditem-editor.h"
 #include "panel-icon-names.h"
 
@@ -817,7 +816,6 @@ launcher_load_from_gconf (PanelWidget *panel_widget,
 	client  = panel_gconf_get_client ();
 
 	key = panel_gconf_full_key (PANEL_GCONF_OBJECTS, id, "launcher_location");
-	panel_compatibility_migrate_applications_scheme (client, key);
 	launcher_location = gconf_client_get_string (client, key, NULL);
 
 	if (!launcher_location) {
diff --git a/gnome-panel/panel-compatibility.c b/gnome-panel/panel-compatibility.c
index 317fada..7b019c2 100644
--- a/gnome-panel/panel-compatibility.c
+++ b/gnome-panel/panel-compatibility.c
@@ -35,42 +35,6 @@
 #include "panel-util.h"
 
 void
-panel_compatibility_migrate_applications_scheme (GConfClient *client,
-						 const char  *key)
-{
-	char *location;
-
-	location = gconf_client_get_string (client, key, NULL);
-
-	if (!location)
-		return;
-
-	if (!strncmp (location, "applications:", strlen ("applications:")) ||
-	    !strncmp (location, "applications-all-users:", strlen ("applications-all-users:")) ||
-	    !strncmp (location, "all-applications:", strlen ("all-applications:")) ||
-	    !strncmp (location, "preferences:", strlen ("preferences:")) ||
-	    !strncmp (location, "preferences-all-users:", strlen ("preferences-all-users:")) ||
-	    !strncmp (location, "all-preferences:", strlen ("all-preferences:")) ||
-	    !strncmp (location, "system-settings:", strlen ("system-settings:")) ||
-	    !strncmp (location, "server-settings:", strlen ("server-settings:"))) {
-		char *basename;
-		char *new_location;
-
-		basename = g_path_get_basename (location);
-		new_location = panel_g_lookup_in_applications_dirs (basename);
-		g_free (basename);
-
-		if (new_location != NULL) {
-			gconf_client_set_string (client, key,
-						 new_location, NULL);
-			g_free (new_location);
-		}
-	}
-
-	g_free (location);
-}
-
-void
 panel_compatibility_migrate_screenshot_action (GConfClient *client,
 					      const char  *id)
 {
diff --git a/gnome-panel/panel-compatibility.h b/gnome-panel/panel-compatibility.h
index 8068b35..7a8796d 100644
--- a/gnome-panel/panel-compatibility.h
+++ b/gnome-panel/panel-compatibility.h
@@ -30,8 +30,6 @@
 
 G_BEGIN_DECLS
 
-void panel_compatibility_migrate_applications_scheme (GConfClient *client,
-						      const char  *key);
 void panel_compatibility_migrate_screenshot_action (GConfClient *client,
 						   const char  *id);
 void panel_compatiblity_migrate_settings_menu_button (GConfClient *client,