Change the group icon size using e_shortcuts_set_group_uses_small_icons()

* e-shortcuts-view.c (toggle_large_icons_cb): Change the group
icon size using e_shortcuts_set_group_uses_small_icons() instead
of changing it on the widget directly.
(toggle_small_icons_cb): Likewise.
(group_change_icon_size_callback): New, callback for the
"group_change_icon_size" signal on the EShortcuts object.
(e_shortcuts_view_construct): Connect.  Also, initialize the icon
sizes in the icon bars from the EShortcuts object.

* e-shell-view.c (e_shell_view_load_settings): Don't set the
shortcut group icon modes here anymore.

* e-shortcuts.c: New member use_small_icons in struct
ShortcutGroup.
(shortcut_group_new): Init to FALSE.
(e_shortcuts_set_group_uses_small_icons): New.
(e_shortcuts_get_group_uses_small_icons): New.
(class_init): Install "group_change_icon_size" signal.
(save_shortcuts): Save the icon size per-group
here, i.e. <group title="foo" icon_size="small">.
(load_shortcuts): Set the icon size from the group's definition
here.

* e-shortcuts.h: New signal "group_change_icon_size" in
EShortcutsClass.

svn path=/trunk/; revision=17386

1 files changed, 1 insertions, 12 deletions

diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index 2b706028c1..3cd04a983e 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -2678,7 +2678,7 @@ e_shell_view_load_settings (EShellView *shell_view,
 	Bonobo_ConfigDatabase db;
 	EShellViewPrivate *priv;
 	EShortcutBar *shortcut_bar;
-	int num_groups, group, val;
+	int num_groups, val;
 	long width, height;
 	char *stringval, *prefix, *filename, *key;
 	CORBA_Environment ev;
@@ -2754,17 +2754,6 @@ e_shell_view_load_settings (EShellView *shell_view,
 
 	num_groups = e_shortcut_model_get_num_groups (shortcut_bar->model);
 
-	for (group = 0; group < num_groups; group++) {
-		int iconmode;
-
-		key = g_strdup_printf ("%sShortcutBarGroup%dIconMode", prefix,
-				       group);
-		iconmode = bonobo_config_get_long (db, key, NULL);
-		g_free (key);
-
-		e_shortcut_bar_set_view_type (shortcut_bar, group, iconmode);
-	}
-
 	g_free (prefix);
 
 	/* Load the expanded state for the ShellView's StorageSetView */