Commit 0390e6ca authored by Jon Kåre Hellan's avatar Jon Kåre Hellan

s/ENABLE_BONOBO/WITH_BONOBO/

* src/gui-file.c: s/ENABLE_BONOBO/WITH_BONOBO/

* src/gui-util.c: Ditto.

* src/history.c: Ditto.

* src/main.c: Ditto.

* src/sheet.c: Ditto.

* src/sheet-object.c: Ditto.

* src/workbook-control-gui.c: Ditto.

* src/workbook-format-toolbar.c: Ditto.

* src/workbook-object-toolbar.c:

* src/workbook.c: Ditto.

* src/workbook-private.c: Ditto.

* src/xml-io.c: Ditto.

* plugins/excel/ms-chart.c: Ditto

* plugins/excel/ms-excel-read.c: Ditto
parent 1a7872e1
2002-04-13 Jon K Hellan <hellan@acm.org>
* src/gui-file.c: s/ENABLE_BONOBO/WITH_BONOBO/
* src/gui-util.c: Ditto.
* src/history.c: Ditto.
* src/main.c: Ditto.
* src/sheet.c: Ditto.
* src/sheet-object.c: Ditto.
* src/workbook-control-gui.c: Ditto.
* src/workbook-format-toolbar.c: Ditto.
* src/workbook-object-toolbar.c:
* src/workbook.c: Ditto.
* src/workbook-private.c: Ditto.
* src/xml-io.c: Ditto.
2002-04-13 Andreas J. Guelzow <aguelzow@taliesin.ca> 2002-04-13 Andreas J. Guelzow <aguelzow@taliesin.ca>
* schemas/gnumeric-general.schemas : add 2 undo preference settings * schemas/gnumeric-general.schemas : add 2 undo preference settings
......
2002-04-13 Jon K Hellan <hellan@acm.org>
* src/gui-file.c: s/ENABLE_BONOBO/WITH_BONOBO/
* src/gui-util.c: Ditto.
* src/history.c: Ditto.
* src/main.c: Ditto.
* src/sheet.c: Ditto.
* src/sheet-object.c: Ditto.
* src/workbook-control-gui.c: Ditto.
* src/workbook-format-toolbar.c: Ditto.
* src/workbook-object-toolbar.c:
* src/workbook.c: Ditto.
* src/workbook-private.c: Ditto.
* src/xml-io.c: Ditto.
2002-04-13 Andreas J. Guelzow <aguelzow@taliesin.ca> 2002-04-13 Andreas J. Guelzow <aguelzow@taliesin.ca>
* schemas/gnumeric-general.schemas : add 2 undo preference settings * schemas/gnumeric-general.schemas : add 2 undo preference settings
......
2002-04-13 Jon K Hellan <hellan@acm.org>
* src/gui-file.c: s/ENABLE_BONOBO/WITH_BONOBO/
* src/gui-util.c: Ditto.
* src/history.c: Ditto.
* src/main.c: Ditto.
* src/sheet.c: Ditto.
* src/sheet-object.c: Ditto.
* src/workbook-control-gui.c: Ditto.
* src/workbook-format-toolbar.c: Ditto.
* src/workbook-object-toolbar.c:
* src/workbook.c: Ditto.
* src/workbook-private.c: Ditto.
* src/xml-io.c: Ditto.
2002-04-13 Andreas J. Guelzow <aguelzow@taliesin.ca> 2002-04-13 Andreas J. Guelzow <aguelzow@taliesin.ca>
* schemas/gnumeric-general.schemas : add 2 undo preference settings * schemas/gnumeric-general.schemas : add 2 undo preference settings
......
2002-04-13 Jon K Hellan <hellan@acm.org>
* ms-chart.c: s/ENABLE_BONOBO/WITH_BONOBO/
* ms-excel-read.c: Ditto
2002-03-27 Jody Goldberg <jody@gnome.org> 2002-03-27 Jody Goldberg <jody@gnome.org>
* ms-biff.c (ms_biff_query_set_decrypt) : protect against NULL * ms-biff.c (ms_biff_query_set_decrypt) : protect against NULL
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <value.h> #include <value.h>
#include <gutils.h> #include <gutils.h>
#ifdef ENABLE_BONOBO #ifdef WITH_BONOBO
#include <gnumeric-graph.h> #include <gnumeric-graph.h>
#endif #endif
#include <xml-io.h> #include <xml-io.h>
...@@ -57,7 +57,7 @@ char const *const ms_vector_purpose_type_name [] = ...@@ -57,7 +57,7 @@ char const *const ms_vector_purpose_type_name [] =
typedef struct _ExcelChartSeries typedef struct _ExcelChartSeries
{ {
struct { struct {
#ifdef ENABLE_BONOBO #ifdef WITH_BONOBO
GnmGraphVectorType type; GnmGraphVectorType type;
#endif #endif
int count, remote_ID; int count, remote_ID;
...@@ -125,13 +125,13 @@ excel_chart_series_new (void) ...@@ -125,13 +125,13 @@ excel_chart_series_new (void)
series->xml = NULL; series->xml = NULL;
for (i = MS_VECTOR_PURPOSE_MAX; i-- > 0 ; ) { for (i = MS_VECTOR_PURPOSE_MAX; i-- > 0 ; ) {
series->vector [i].remote_ID = -1; series->vector [i].remote_ID = -1;
#ifdef ENABLE_BONOBO #ifdef WITH_BONOBO
series->vector [i].type = GNM_VECTOR_AUTO; /* may be reset later */ series->vector [i].type = GNM_VECTOR_AUTO; /* may be reset later */
#endif #endif
} }
/* labels are always strings */ /* labels are always strings */
#ifdef ENABLE_BONOBO #ifdef WITH_BONOBO
series->vector [MS_VECTOR_PURPOSE_LABELS].type = GNM_VECTOR_STRING; series->vector [MS_VECTOR_PURPOSE_LABELS].type = GNM_VECTOR_STRING;
#endif #endif
...@@ -156,7 +156,7 @@ excel_chart_series_write_xml (ExcelChartSeries *series, ...@@ -156,7 +156,7 @@ excel_chart_series_write_xml (ExcelChartSeries *series,
xmlAddChild (data, series->xml); xmlAddChild (data, series->xml);
for (i = 0 ; i < MS_VECTOR_PURPOSE_MAX; i++ ) for (i = 0 ; i < MS_VECTOR_PURPOSE_MAX; i++ )
if (series->vector [i].remote_ID >= 0) { if (series->vector [i].remote_ID >= 0) {
#ifdef ENABLE_BONOBO #ifdef WITH_BONOBO
xmlNode *v = gnm_graph_series_add_dimension (series->xml, xmlNode *v = gnm_graph_series_add_dimension (series->xml,
ms_vector_purpose_type_name [i]); ms_vector_purpose_type_name [i]);
if (v != NULL) if (v != NULL)
...@@ -344,7 +344,7 @@ BC_R(ai)(ExcelChartHandler const *handle, ...@@ -344,7 +344,7 @@ BC_R(ai)(ExcelChartHandler const *handle,
g_return_val_if_fail (sheet != NULL, FALSE); g_return_val_if_fail (sheet != NULL, FALSE);
g_return_val_if_fail (s->currentSeries != NULL, TRUE); g_return_val_if_fail (s->currentSeries != NULL, TRUE);
#ifdef ENABLE_BONOBO #ifdef WITH_BONOBO
s->currentSeries->vector [purpose].remote_ID = s->currentSeries->vector [purpose].remote_ID =
gnm_graph_add_vector (s->graph, expr, gnm_graph_add_vector (s->graph, expr,
s->currentSeries->vector [purpose].type, s->currentSeries->vector [purpose].type,
...@@ -1723,7 +1723,7 @@ BC_R(vector_details)(ExcelChartReadState *s, BiffQuery *q, ExcelChartSeries *ser ...@@ -1723,7 +1723,7 @@ BC_R(vector_details)(ExcelChartReadState *s, BiffQuery *q, ExcelChartSeries *ser
MS_VECTOR_PURPOSE purpose, MS_VECTOR_PURPOSE purpose,
int type_offset, int count_offset, char const *name) int type_offset, int count_offset, char const *name)
{ {
#ifdef ENABLE_BONOBO #ifdef WITH_BONOBO
GnmGraphVectorType type; GnmGraphVectorType type;
guint16 e_type = MS_OLE_GET_GUINT16 (q->data + type_offset); guint16 e_type = MS_OLE_GET_GUINT16 (q->data + type_offset);
...@@ -1827,7 +1827,7 @@ BC_R(seriestext)(ExcelChartHandler const *handle, ...@@ -1827,7 +1827,7 @@ BC_R(seriestext)(ExcelChartHandler const *handle,
/* A quick heuristic */ /* A quick heuristic */
if (s->currentSeries != NULL && if (s->currentSeries != NULL &&
s->currentSeries->vector [MS_VECTOR_PURPOSE_LABELS].remote_ID == -1) { s->currentSeries->vector [MS_VECTOR_PURPOSE_LABELS].remote_ID == -1) {
#ifdef ENABLE_BONOBO #ifdef WITH_BONOBO
s->currentSeries->vector [MS_VECTOR_PURPOSE_LABELS].type = GNM_VECTOR_STRING; s->currentSeries->vector [MS_VECTOR_PURPOSE_LABELS].type = GNM_VECTOR_STRING;
s->currentSeries->vector [MS_VECTOR_PURPOSE_LABELS].remote_ID = s->currentSeries->vector [MS_VECTOR_PURPOSE_LABELS].remote_ID =
...@@ -2417,7 +2417,7 @@ ms_excel_chart (BiffQuery *q, MSContainer *container, MsBiffVersion ver, GObject ...@@ -2417,7 +2417,7 @@ ms_excel_chart (BiffQuery *q, MSContainer *container, MsBiffVersion ver, GObject
state.xml.currentChartGroup = NULL; state.xml.currentChartGroup = NULL;
state.xml.dataFormat = NULL; state.xml.dataFormat = NULL;
#ifdef ENABLE_BONOBO #ifdef WITH_BONOBO
if (graph != NULL) if (graph != NULL)
state.graph = GNUMERIC_GRAPH (graph); state.graph = GNUMERIC_GRAPH (graph);
else else
...@@ -2524,7 +2524,7 @@ ms_excel_chart (BiffQuery *q, MSContainer *container, MsBiffVersion ver, GObject ...@@ -2524,7 +2524,7 @@ ms_excel_chart (BiffQuery *q, MSContainer *container, MsBiffVersion ver, GObject
state.prev_opcode = q->opcode; state.prev_opcode = q->opcode;
} }
#ifdef ENABLE_BONOBO #ifdef WITH_BONOBO
if (state.graph != NULL) if (state.graph != NULL)
gnm_graph_import_specification (state.graph, state.xml.doc); gnm_graph_import_specification (state.graph, state.xml.doc);
#endif #endif
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
#include <sheet-object-widget.h> #include <sheet-object-widget.h>
#include <sheet-object-graphic.h> #include <sheet-object-graphic.h>
#include <sheet-object-image.h> #include <sheet-object-image.h>
#ifdef ENABLE_BONOBO #ifdef WITH_BONOBO
# include <gnumeric-graph.h> # include <gnumeric-graph.h>
#endif #endif
...@@ -392,7 +392,7 @@ ms_sheet_create_obj (MSContainer *container, MSObj *obj) ...@@ -392,7 +392,7 @@ ms_sheet_create_obj (MSContainer *container, MSObj *obj)
} }
case 0x05: { /* Chart */ case 0x05: { /* Chart */
#ifdef ENABLE_BONOBO #ifdef WITH_BONOBO
so = SHEET_OBJECT (gnm_graph_new (wb)); so = SHEET_OBJECT (gnm_graph_new (wb));
#else #else
so = sheet_object_box_new (FALSE); /* placeholder */ so = sheet_object_box_new (FALSE); /* placeholder */
...@@ -3823,7 +3823,7 @@ ms_excel_read_sheet (BiffQuery *q, ExcelWorkbook *wb, ...@@ -3823,7 +3823,7 @@ ms_excel_read_sheet (BiffQuery *q, ExcelWorkbook *wb,
*/ */
if (q->opcode == BIFF_CHART_units) { if (q->opcode == BIFF_CHART_units) {
GObject *graph = GObject *graph =
#ifdef ENABLE_BONOBO #ifdef WITH_BONOBO
gnm_graph_new (esheet->wb->gnum_wb); gnm_graph_new (esheet->wb->gnum_wb);
#else #else
NULL; NULL;
......
...@@ -348,7 +348,7 @@ gui_file_save (WorkbookControlGUI *wbcg, WorkbookView *wb_view) ...@@ -348,7 +348,7 @@ gui_file_save (WorkbookControlGUI *wbcg, WorkbookView *wb_view)
return wb_view_save (wb_view, COMMAND_CONTEXT (wbcg)); return wb_view_save (wb_view, COMMAND_CONTEXT (wbcg));
} }
#ifdef ENABLE_BONOBO #ifdef WITH_BONOBO
static GnumFileSaver * static GnumFileSaver *
ask_for_file_saver (WorkbookControlGUI *wbcg, WorkbookView *wb_view) ask_for_file_saver (WorkbookControlGUI *wbcg, WorkbookView *wb_view)
{ {
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <gal/widgets/widget-color-combo.h> #include <gal/widgets/widget-color-combo.h>
#include <glade/glade.h> #include <glade/glade.h>
#ifdef ENABLE_BONOBO #ifdef WITH_BONOBO
# include <bonobo.h> # include <bonobo.h>
# include "workbook-private.h" # include "workbook-private.h"
#endif #endif
...@@ -856,7 +856,7 @@ gnumeric_non_modal_dialog (WorkbookControlGUI *wbcg, GtkWindow *dialog) ...@@ -856,7 +856,7 @@ gnumeric_non_modal_dialog (WorkbookControlGUI *wbcg, GtkWindow *dialog)
G_CALLBACK (cb_non_modal_dialog_keypress), NULL); G_CALLBACK (cb_non_modal_dialog_keypress), NULL);
} }
#ifdef ENABLE_BONOBO #ifdef WITH_BONOBO
/* /*
* gnumeric_inject_widget_into_bonoboui : * gnumeric_inject_widget_into_bonoboui :
* *
......
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
#include <gtk/gtkmenuitem.h> #include <gtk/gtkmenuitem.h>
#include <libgnome/gnome-i18n.h> #include <libgnome/gnome-i18n.h>
#include <libgnomeui/gnome-app-helper.h> #include <libgnomeui/gnome-app-helper.h>
#ifdef ENABLE_BONOBO #ifdef WITH_BONOBO
#include <bonobo.h> #include <bonobo.h>
#endif #endif
/* Command callback called on activation of a file history menu item. */ /* Command callback called on activation of a file history menu item. */
#ifndef ENABLE_BONOBO #ifndef WITH_BONOBO
#define UGLY_GNOME_UI_KEY "HistoryFilename" #define UGLY_GNOME_UI_KEY "HistoryFilename"
...@@ -80,7 +80,7 @@ history_item_label (const gchar *name, const gint accel_number) ...@@ -80,7 +80,7 @@ history_item_label (const gchar *name, const gint accel_number)
/* /*
* Create a history menu item in a menu at a given position. * Create a history menu item in a menu at a given position.
*/ */
#ifndef ENABLE_BONOBO #ifndef WITH_BONOBO
static void static void
history_menu_item_create (WorkbookControlGUI *wbcg, gchar *name, gint accel_number, history_menu_item_create (WorkbookControlGUI *wbcg, gchar *name, gint accel_number,
GtkWidget *menu, gint pos) GtkWidget *menu, gint pos)
...@@ -105,7 +105,7 @@ history_menu_item_create (WorkbookControlGUI *wbcg, gchar *name, gint accel_numb ...@@ -105,7 +105,7 @@ history_menu_item_create (WorkbookControlGUI *wbcg, gchar *name, gint accel_numb
} }
#endif #endif
#ifndef ENABLE_BONOBO #ifndef WITH_BONOBO
typedef struct { typedef struct {
GtkWidget *menu; GtkWidget *menu;
gint pos; gint pos;
...@@ -211,7 +211,7 @@ history_menu_insert_items (WorkbookControlGUI *wbcg, GList *name_list) ...@@ -211,7 +211,7 @@ history_menu_insert_items (WorkbookControlGUI *wbcg, GList *name_list)
} }
#endif #endif
#ifndef ENABLE_BONOBO #ifndef WITH_BONOBO
/* /*
* Remove the history list items from the file menu of the workbook * Remove the history list items from the file menu of the workbook
* specified. * specified.
...@@ -296,7 +296,7 @@ history_menu_setup (WorkbookControlGUI *wbcg, GList *name_list) ...@@ -296,7 +296,7 @@ history_menu_setup (WorkbookControlGUI *wbcg, GList *name_list)
{ {
g_return_if_fail (name_list != NULL); g_return_if_fail (name_list != NULL);
#ifdef ENABLE_BONOBO #ifdef WITH_BONOBO
/* Insert the items */ /* Insert the items */
history_menu_insert_items (wbcg, name_list); history_menu_insert_items (wbcg, name_list);
#else #else
...@@ -324,7 +324,7 @@ history_control_fill (WorkbookControl *control, GList *name_list, gboolean need_ ...@@ -324,7 +324,7 @@ history_control_fill (WorkbookControl *control, GList *name_list, gboolean need_
if (need_sep) if (need_sep)
history_menu_setup (wbcg, name_list); history_menu_setup (wbcg, name_list);
else { else {
#ifndef ENABLE_BONOBO #ifndef WITH_BONOBO
MenuPos mp; MenuPos mp;
history_menu_locate_separator (wbcg, &mp); history_menu_locate_separator (wbcg, &mp);
(mp.pos)++; (mp.pos)++;
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
#include <time.h> #include <time.h>
#include <gtk/gtkmain.h> #include <gtk/gtkmain.h>
#include <locale.h> #include <locale.h>
#ifdef ENABLE_BONOBO #ifdef WITH_BONOBO
#include "bonobo-io.h" #include "bonobo-io.h"
/* DO NOT include embeddable-grid.h. It causes odd depends in the non-bonobo /* DO NOT include embeddable-grid.h. It causes odd depends in the non-bonobo
* case */ * case */
...@@ -61,7 +61,7 @@ extern gboolean EmbeddableGridFactory_init (void); ...@@ -61,7 +61,7 @@ extern gboolean EmbeddableGridFactory_init (void);
#include <libgnomeui/gnome-window-icon.h> #include <libgnomeui/gnome-window-icon.h>
#endif #endif
#ifdef ENABLE_BONOBO #ifdef WITH_BONOBO
#include <bonobo.h> #include <bonobo.h>
#endif #endif
#include <libgnome/gnome-i18n.h> #include <libgnome/gnome-i18n.h>
...@@ -225,7 +225,7 @@ main (int argc, char *argv []) ...@@ -225,7 +225,7 @@ main (int argc, char *argv [])
/* The statically linked in file formats */ /* The statically linked in file formats */
xml_init (); xml_init ();
stf_init (); stf_init ();
#ifdef ENABLE_BONOBO #ifdef WITH_BONOBO
#ifdef GNOME2_CONVERSION_COMPLETE #ifdef GNOME2_CONVERSION_COMPLETE
gnumeric_bonobo_io_init (); gnumeric_bonobo_io_init ();
#endif #endif
...@@ -263,7 +263,7 @@ main (int argc, char *argv []) ...@@ -263,7 +263,7 @@ main (int argc, char *argv [])
return retval; return retval;
} }
#ifdef ENABLE_BONOBO #ifdef WITH_BONOBO
#if 0 #if 0
/* Activate object factories and init connections to POA */ /* Activate object factories and init connections to POA */
if (!WorkbookFactory_init ()) if (!WorkbookFactory_init ())
...@@ -280,7 +280,7 @@ main (int argc, char *argv []) ...@@ -280,7 +280,7 @@ main (int argc, char *argv [])
else else
startup_files = NULL; startup_files = NULL;
#ifdef ENABLE_BONOBO #ifdef WITH_BONOBO
bonobo_activate (); bonobo_activate ();
#endif #endif
wbc = workbook_control_gui_new (NULL, NULL); wbc = workbook_control_gui_new (NULL, NULL);
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
#include <time.h> #include <time.h>
#include <gtk/gtkmain.h> #include <gtk/gtkmain.h>
#include <locale.h> #include <locale.h>
#ifdef ENABLE_BONOBO #ifdef WITH_BONOBO
#include "bonobo-io.h" #include "bonobo-io.h"
/* DO NOT include embeddable-grid.h. It causes odd depends in the non-bonobo /* DO NOT include embeddable-grid.h. It causes odd depends in the non-bonobo
* case */ * case */
...@@ -61,7 +61,7 @@ extern gboolean EmbeddableGridFactory_init (void); ...@@ -61,7 +61,7 @@ extern gboolean EmbeddableGridFactory_init (void);
#include <libgnomeui/gnome-window-icon.h> #include <libgnomeui/gnome-window-icon.h>
#endif #endif
#ifdef ENABLE_BONOBO #ifdef WITH_BONOBO
#include <bonobo.h> #include <bonobo.h>
#endif #endif
#include <libgnome/gnome-i18n.h> #include <libgnome/gnome-i18n.h>
...@@ -225,7 +225,7 @@ main (int argc, char *argv []) ...@@ -225,7 +225,7 @@ main (int argc, char *argv [])
/* The statically linked in file formats */ /* The statically linked in file formats */
xml_init (); xml_init ();
stf_init (); stf_init ();
#ifdef ENABLE_BONOBO #ifdef WITH_BONOBO
#ifdef GNOME2_CONVERSION_COMPLETE #ifdef GNOME2_CONVERSION_COMPLETE
gnumeric_bonobo_io_init (); gnumeric_bonobo_io_init ();
#endif #endif
...@@ -263,7 +263,7 @@ main (int argc, char *argv []) ...@@ -263,7 +263,7 @@ main (int argc, char *argv [])
return retval; return retval;
} }
#ifdef ENABLE_BONOBO #ifdef WITH_BONOBO
#if 0 #if 0
/* Activate object factories and init connections to POA */ /* Activate object factories and init connections to POA */
if (!WorkbookFactory_init ()) if (!WorkbookFactory_init ())
...@@ -280,7 +280,7 @@ main (int argc, char *argv []) ...@@ -280,7 +280,7 @@ main (int argc, char *argv [])
else else
startup_files = NULL; startup_files = NULL;
#ifdef ENABLE_BONOBO #ifdef WITH_BONOBO
bonobo_activate (); bonobo_activate ();
#endif #endif
wbc = workbook_control_gui_new (NULL, NULL); wbc = workbook_control_gui_new (NULL, NULL);
......
...@@ -808,7 +808,7 @@ sheet_objects_clear (Sheet const *sheet, Range const *r, GType t) ...@@ -808,7 +808,7 @@ sheet_objects_clear (Sheet const *sheet, Range const *r, GType t)
} }
} }
#ifdef ENABLE_BONOBO #ifdef WITH_BONOBO
/* Do NOT include the relevant header files, /* Do NOT include the relevant header files,
* they introduce automake depends in the non-bonobo build. * they introduce automake depends in the non-bonobo build.
*/ */
...@@ -822,7 +822,7 @@ sheet_object_register (void) ...@@ -822,7 +822,7 @@ sheet_object_register (void)
SHEET_OBJECT_GRAPHIC_TYPE; SHEET_OBJECT_GRAPHIC_TYPE;
SHEET_OBJECT_FILLED_TYPE; SHEET_OBJECT_FILLED_TYPE;
CELL_COMMENT_TYPE; CELL_COMMENT_TYPE;
#ifdef ENABLE_BONOBO #ifdef WITH_BONOBO
#ifdef GNOME2_CONVERSION_COMPLETE #ifdef GNOME2_CONVERSION_COMPLETE
sheet_object_bonobo_get_type (); sheet_object_bonobo_get_type ();
gnm_graph_get_type (); gnm_graph_get_type ();
......
...@@ -188,7 +188,7 @@ sheet_new (Workbook *wb, char const *name) ...@@ -188,7 +188,7 @@ sheet_new (Workbook *wb, char const *name)
sheet = g_new0 (Sheet, 1); sheet = g_new0 (Sheet, 1);
sheet->priv = g_new0 (SheetPrivate, 1); sheet->priv = g_new0 (SheetPrivate, 1);
#ifdef ENABLE_BONOBO #ifdef WITH_BONOBO
sheet->priv->corba_server = NULL; sheet->priv->corba_server = NULL;
#endif #endif
......
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
#include "src/plugin-util.h" #include "src/plugin-util.h"
#include "sheet-object-image.h" #include "sheet-object-image.h"
#ifdef ENABLE_BONOBO #ifdef WITH_BONOBO
#include "sheet-object-container.h" #include "sheet-object-container.h"
#ifdef ENABLE_EVOLUTION #ifdef ENABLE_EVOLUTION
#include <idl/Evolution-Composer.h> #include <idl/Evolution-Composer.h>
...@@ -763,7 +763,7 @@ wbcg_undo_redo_push (WorkbookControl *wbc, char const *text, gboolean is_undo) ...@@ -763,7 +763,7 @@ wbcg_undo_redo_push (WorkbookControl *wbc, char const *text, gboolean is_undo)
gtk_combo_stack_push_item (ur_stack (wbc, is_undo), text); gtk_combo_stack_push_item (ur_stack (wbc, is_undo), text);
} }
#ifndef ENABLE_BONOBO #ifndef WITH_BONOBO
static void static void
change_menu_state (GtkWidget *menu_item, gboolean state) change_menu_state (GtkWidget *menu_item, gboolean state)
{ {
...@@ -877,7 +877,7 @@ wbcg_menu_state_update (WorkbookControl *wbc, Sheet const *sheet, int flags) ...@@ -877,7 +877,7 @@ wbcg_menu_state_update (WorkbookControl *wbc, Sheet const *sheet, int flags)
g_return_if_fail (wbcg != NULL); g_return_if_fail (wbcg != NULL);
#ifndef ENABLE_BONOBO #ifndef WITH_BONOBO
if (MS_INSERT_COLS & flags) if (MS_INSERT_COLS & flags)
change_menu_sensitivity (wbcg->menu_item_insert_cols, change_menu_sensitivity (wbcg->menu_item_insert_cols,
sheet->priv->enable_insert_cols); sheet->priv->enable_insert_cols);
...@@ -947,7 +947,7 @@ wbcg_menu_state_update (WorkbookControl *wbc, Sheet const *sheet, int flags) ...@@ -947,7 +947,7 @@ wbcg_menu_state_update (WorkbookControl *wbc, Sheet const *sheet, int flags)
* we don't reset it when the label changes */ * we don't reset it when the label changes */
char const* label = sheet_is_frozen (sheet)