[gnumeric] fix build with --disable-solver. [#612820]
- From: Andreas J. Guelzow <guelzow src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] fix build with --disable-solver. [#612820]
- Date: Sat, 13 Mar 2010 22:53:49 +0000 (UTC)
commit ff0512dcbf9113badc69b23b2510ecffb1a1f532
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date: Sat Mar 13 15:53:23 2010 -0700
fix build with --disable-solver. [#612820]
2010-03-13 Andreas J. Guelzow <aguelzow pyrshep ca>
* src/wbc-gtk-actions.c (wbc_gtk_init_actions): move disabling
of solver menu item from here to
* src/wbc-gtk.c (wbc_gtk_init): here
ChangeLog | 6 ++++++
NEWS | 3 +++
src/wbc-gtk-actions.c | 4 ----
src/wbc-gtk.c | 5 +++++
4 files changed, 14 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index a092d4a..b408618 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-13 Andreas J. Guelzow <aguelzow pyrshep ca>
+
+ * src/wbc-gtk-actions.c (wbc_gtk_init_actions): move disabling
+ of solver menu item from here to
+ * src/wbc-gtk.c (wbc_gtk_init): here
+
2010-03-11 Morten Welinder <terra gnome org>
* src/commands.c (cmd_autofilter_add_remove): Remove extra
diff --git a/NEWS b/NEWS
index 8a3265f..5fdb1b8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
Gnumeric 1.10.2
+Andreas:
+
+ * fix build with --disable-solver. [#612820]
Morten:
* Improve object sizing tooltip positioning a bit.
* Fix filter critical. [#611073]
diff --git a/src/wbc-gtk-actions.c b/src/wbc-gtk-actions.c
index 6589827..a579d43 100644
--- a/src/wbc-gtk-actions.c
+++ b/src/wbc-gtk-actions.c
@@ -2593,8 +2593,4 @@ wbc_gtk_init_actions (WBCGtk *wbcg)
font_toggle_actions, G_N_ELEMENTS (font_toggle_actions), wbcg);
wbc_gtk_init_alignments (wbcg);
-
-#ifndef GNM_ENABLE_SOLVER
- wbc_gtk_set_action_sensitivity (wbcg, "ToolsSolver", FALSE);
-#endif
}
diff --git a/src/wbc-gtk.c b/src/wbc-gtk.c
index ac63a54..de2a7b9 100644
--- a/src/wbc-gtk.c
+++ b/src/wbc-gtk.c
@@ -5337,6 +5337,11 @@ wbc_gtk_init (GObject *obj)
#endif
wbcg_set_autosave_time (wbcg, gnm_conf_get_core_workbook_autosave_time ());
+
+#ifndef GNM_ENABLE_SOLVER
+ wbc_gtk_set_action_sensitivity (wbcg, "ToolsSolver", FALSE);
+#endif
+
}
GSF_CLASS_FULL (WBCGtk, wbc_gtk, NULL, NULL, wbc_gtk_class_init, NULL,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]