Remove the icon_modes schema.

* apps_evolution_shell.schemas: Remove the icon_modes schema.

* e-shell-view.c (setup_defaults): Don't set the icon modes from
GConf, they are already stored in the shortcuts.xml file.
(e_shell_view_save_defaults): Likewise, don't set it here.

* e-config-upgrade.c: Remove translation from
ShortcutBarGroup%iIconMode to
shell/view_defaults/shortcut_bar/icon_types.

svn path=/trunk/; revision=20673

4 files changed, 14 insertions, 40 deletions

diff --git a/shell/ChangeLog b/shell/ChangeLog
index 63c8c93b44..8d81314bc0 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,17 @@
+2003-04-04  Ettore Perazzoli  <ettore@ximian.com>
+
+	[#40748]
+
+	* apps_evolution_shell.schemas: Remove the icon_modes schema.
+
+	* e-shell-view.c (setup_defaults): Don't set the icon modes from
+	GConf, they are already stored in the shortcuts.xml file.
+	(e_shell_view_save_defaults): Likewise, don't set it here.
+
+	* e-config-upgrade.c: Remove translation from
+	ShortcutBarGroup%iIconMode to
+	shell/view_defaults/shortcut_bar/icon_types.
+
 2003-04-02  Rodrigo Moya <rodrigo@ximian.com>
 
 	* importer/GNOME_Evolution_Importer.idl:
diff --git a/shell/apps_evolution_shell.schemas b/shell/apps_evolution_shell.schemas
index d44a0f9c91..14d6c18021 100644
--- a/shell/apps_evolution_shell.schemas
+++ b/shell/apps_evolution_shell.schemas
@@ -249,17 +249,5 @@
       </locale>
     </schema>
 
-    <schema>
-      <key>/schemas/apps/evolution/shell/view_defaults/shortcut_bar/icon_types</key>
-      <applyto>/apps/evolution/shell/view_defaults/shortcut_bar/icon_types</applyto>
-      <owner>evolution</owner>
-      <type>list</type>
-      <list_type>int</list_type>
-      <default>[]</default>
-      <locale name="C">
-         <short>Types of icons to be used for the shortcut bar groups (0 = large, 1 = small)</short>
-      </locale>
-    </schema>
-
   </schemalist>  
 </gconfschemafile>
diff --git a/shell/e-config-upgrade.c b/shell/e-config-upgrade.c
index a3f8e32573..ffa9b6ffe1 100644
--- a/shell/e-config-upgrade.c
+++ b/shell/e-config-upgrade.c
@@ -1122,7 +1122,6 @@ static struct _gconf_map shell_views_map[] = {
 	{ "HPanedPosition", "shell/view_defaults/shortcut_bar/width", BMAP_INT },
 	{ "ViewPanedPosition", "shell/view_defaults/folder_bar/width", BMAP_INT },
 	{ "DisplayedURI", "shell/view_defaults/folder_path", BMAP_STRING },
-	{ "ShortcutBarGroup%iIconMode", "shell/view_defaults/shortcut_bar/icon_types", BMAP_INT|BMAP_LIST },
 	{ 0 },
 };
 
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index c964b7c38c..a2a28e80dd 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -413,12 +413,9 @@ setup_defaults (EShellView *shell_view)
 	EShellViewPrivate *priv;
 	EShortcutBar *shortcut_bar;
 	GConfClient *client;
-	GSList *icon_types_list;
-	GSList *p;
 	char *file_name;
 	int shortcut_group;
 	int width;
-	int i;
 
 	g_return_if_fail (shell_view != NULL);
 	g_return_if_fail (E_IS_SHELL_VIEW (shell_view));
@@ -450,12 +447,6 @@ setup_defaults (EShellView *shell_view)
 		gtk_paned_set_position (GTK_PANED (priv->view_hpaned), width);
 	priv->view_hpaned_position = width;
 
-	icon_types_list = gconf_client_get_list (client, "/apps/evolution/shell/view_defaults/shortcut_bar/icon_types",
-						 GCONF_VALUE_INT, NULL);
-	for (p = icon_types_list, i = 0; p != NULL; p = p->next, i++)
-		e_shortcut_bar_set_view_type (shortcut_bar, i, GPOINTER_TO_INT (p->data));
-	g_slist_free (icon_types_list);
-
 	/* Load the expanded state for the ShellView's StorageSetView */
 	file_name = g_strdup_printf ("%s/config/storage-set-view-expanded:default",
 				     e_shell_get_local_directory (priv->shell));
@@ -2816,11 +2807,8 @@ e_shell_view_save_defaults (EShellView *shell_view)
 	GConfClient *client;
 	EShellViewPrivate *priv;
 	EShortcutBar *shortcut_bar;
-	GSList *shortcut_view_type_list;
 	const char *uri;
 	char *file_name;
-	int num_groups;
-	int group;
 	struct stat temp;
 
 	g_return_if_fail (shell_view != NULL);
@@ -2865,21 +2853,6 @@ e_shell_view_save_defaults (EShellView *shell_view)
 	else
 		gconf_client_unset (client, "/apps/evolution/shell/view_defaults/folder_path", NULL);
 
-	num_groups = e_shortcut_model_get_num_groups (shortcut_bar->model);
-
-	shortcut_view_type_list = NULL;
-	for (group = 0; group < num_groups; group++) {
-		EIconBarViewType view_type;
-
-		view_type = e_shortcut_bar_get_view_type (shortcut_bar, group);
-		shortcut_view_type_list = g_slist_prepend (shortcut_view_type_list, GINT_TO_POINTER (view_type));
-	}
-
-	gconf_client_set_list (client, "/apps/evolution/shell/view_defaults/shortcut_bar/icon_types",
-			       GCONF_VALUE_INT, shortcut_view_type_list, NULL);
-
-	g_slist_free (shortcut_view_type_list);
-
 	/* If ~/evolution/config/ doesn't exist yet, make it */
 	file_name = g_strdup_printf ("%s/config/", e_shell_get_local_directory (priv->shell));
 	if (stat (file_name, &temp) != 0)