gnumeric r16975 - in trunk: . src

[mortenw svn gnome org]

Author: mortenw
Date: Mon Nov 24 15:24:37 2008
New Revision: 16975
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16975&view=rev

Log:
2008-11-24  Morten Welinder  <terra gnome org>

	* src/application.c (gnm_app_detachable_toolbars): New function.

	* src/wbc-gtk.c (cb_add_menus_toolbars): Use
	gnm_app_detachable_toolbars.

	* src/gnumeric-gconf.c (gnm_conf_init_essential): Setup
	->detachable_toolbars.



Modified:
   trunk/ChangeLog
   trunk/src/application.c
   trunk/src/application.h
   trunk/src/gnumeric-gconf.c
   trunk/src/gnumeric-gconf.h
   trunk/src/wbc-gtk.c

Modified: trunk/src/application.c
==============================================================================
--- trunk/src/application.c	(original)
+++ trunk/src/application.c	Mon Nov 24 15:24:37 2008
@@ -665,6 +665,7 @@
 int	 gnm_app_enter_moves_dir	(void) { return gnm_app_prefs->enter_moves_dir; }
 gboolean gnm_app_use_auto_complete	(void) { return gnm_app_prefs->auto_complete; }
 gboolean gnm_app_live_scrolling		(void) { return gnm_app_prefs->live_scrolling; }
+gboolean gnm_app_detachable_toolbars    (void) { return gnm_app_prefs->detachable_toolbars; }
 int	 gnm_app_auto_expr_recalc_lag	(void) { return gnm_app_prefs->recalc_lag; }
 gboolean gnm_app_use_transition_keys	(void) { return gnm_app_prefs->transition_keys; }
 void     gnm_app_set_transition_keys	(gboolean state)

Modified: trunk/src/application.h
==============================================================================
--- trunk/src/application.h	(original)
+++ trunk/src/application.h	Mon Nov 24 15:24:37 2008
@@ -37,6 +37,7 @@
 void         gnm_app_set_transition_keys  (gboolean);
 gboolean     gnm_app_live_scrolling	  (void);
 int	     gnm_app_auto_expr_recalc_lag (void);
+gboolean     gnm_app_detachable_toolbars  (void);
 
 double	     gnm_app_display_dpi_get	  (gboolean horizontal);
 double	     gnm_app_dpi_to_pixels	  (void);

Modified: trunk/src/gnumeric-gconf.c
==============================================================================
--- trunk/src/gnumeric-gconf.c	(original)
+++ trunk/src/gnumeric-gconf.c	Mon Nov 24 15:24:37 2008
@@ -197,6 +197,13 @@
 		  node, GNM_CONF_GUI_ED_AUTOCOMPLETE, TRUE);
 	prefs.live_scrolling = go_conf_load_bool (
 		  node, GNM_CONF_GUI_ED_LIVESCROLLING, TRUE);
+	prefs.detachable_toolbars =
+#ifdef WIN32
+		FALSE;
+#else
+		go_conf_get_bool
+		(NULL, "/desktop/gnome/interface/toolbar_detachable");
+#endif
 	prefs.toolbars = g_hash_table_new_full
 		(g_str_hash, g_str_equal,
 		 (GDestroyNotify)g_free,

Modified: trunk/src/gnumeric-gconf.h
==============================================================================
--- trunk/src/gnumeric-gconf.h	(original)
+++ trunk/src/gnumeric-gconf.h	Mon Nov 24 15:24:37 2008
@@ -91,6 +91,7 @@
 	gboolean	 transition_keys;
 
 	gboolean	 live_scrolling;
+	gboolean         detachable_toolbars;
 	GHashTable      *toolbars;
 	GHashTable      *toolbar_positions;
 	gint		 recalc_lag;

Modified: trunk/src/wbc-gtk.c
==============================================================================
--- trunk/src/wbc-gtk.c	(original)
+++ trunk/src/wbc-gtk.c	Mon Nov 24 15:24:37 2008
@@ -3428,11 +3428,8 @@
 #else
 		GtkWidget *box;
 		GtkPositionType pos = gnm_gconf_get_toolbar_position (name);
-		gboolean toolbars_can_detach = TRUE;
-#ifdef GNM_WITH_GNOME
-		toolbars_can_detach = go_conf_get_bool (NULL, "/desktop/gnome/interface/toolbar_detachable");
-#endif
-		if (toolbars_can_detach) {
+
+		if (gnm_app_detachable_toolbars ()) {
 			box = gtk_handle_box_new ();
 			g_object_connect (box,
 				"signal::child_attached", G_CALLBACK (cb_handlebox_dock_status), GINT_TO_POINTER (TRUE),