Commit cda21e74 authored by Jody Goldberg's avatar Jody Goldberg Committed by Jody Goldberg

cleanup the includes a bit and make the libole2 requirement specific to

2002-02-01  Jody Goldberg <jody@gnome.org>

	* configure.in : cleanup the includes a bit and make the libole2
	  requirement specific to the XL plugin.  Tidy up the gda, and gb
	  tests to be consistent and more informative.

	* src/main.c : remove ole debug flag.

	* src/gnumeric-graph.c (gnm_graph_new) : return a GObject
	  makes it easier to handle NULL.
parent 76244d48
2002-02-01 Jody Goldberg <jody@gnome.org>
* configure.in : cleanup the includes a bit and make the libole2
requirement specific to the XL plugin. Tidy up the gda, and gb
tests to be consistent and more informative.
* src/main.c : remove ole debug flag.
* src/gnumeric-graph.c (gnm_graph_new) : return a GObject
makes it easier to handle NULL.
2002-01-31 Andreas J. Guelzow <aguelzow@taliesin.ca>
* src/analysis-tools.h : add `warning' to GENERIC_TOOL_STATE
......
......@@ -26,6 +26,7 @@ Jody:
* Clean sheet object widget creation.
* Improve key handling when there are gurus.
* Crash importing 3d references to external workbooks.
* move libole2 req into excel plugin, and make it optional.
Joshua R. Odom:
* Reorganize the custom pixmaps.
......
2002-02-01 Jody Goldberg <jody@gnome.org>
* configure.in : cleanup the includes a bit and make the libole2
requirement specific to the XL plugin. Tidy up the gda, and gb
tests to be consistent and more informative.
* src/main.c : remove ole debug flag.
* src/gnumeric-graph.c (gnm_graph_new) : return a GObject
makes it easier to handle NULL.
2002-01-31 Andreas J. Guelzow <aguelzow@taliesin.ca>
* src/analysis-tools.h : add `warning' to GENERIC_TOOL_STATE
......
2002-02-01 Jody Goldberg <jody@gnome.org>
* configure.in : cleanup the includes a bit and make the libole2
requirement specific to the XL plugin. Tidy up the gda, and gb
tests to be consistent and more informative.
* src/main.c : remove ole debug flag.
* src/gnumeric-graph.c (gnm_graph_new) : return a GObject
makes it easier to handle NULL.
2002-01-31 Andreas J. Guelzow <aguelzow@taliesin.ca>
* src/analysis-tools.h : add `warning' to GENERIC_TOOL_STATE
......
......@@ -32,7 +32,6 @@ libgnomeprint-2.0 >= 1.106.0
libgnomeprintui-2.0 >= 1.106.0
libglade-2.0 >= 1.99.4
libxml-2.0 >= 2.4.12
libole2-2.0 >= 2.2.7
])
AC_SUBST(GNUMERIC_LIBS)
AC_SUBST(GNUMERIC_CFLAGS)
......@@ -61,10 +60,73 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
unset option
fi
dnl
dnl Check whether we need to pass defines to get compliance with a standard
dnl we expect.
dnl
dnl ****************************
dnl MS Excel (tm) Plugin
dnl ****************************
try_ole=true
excel_msg=yes
AC_ARG_WITH(excel,
[--{with,without}-excel Compile the Excel plugin],
if test "x$withval" = xno; then
try_ole=false
excel_msg="Disabled by request"
fi
)
if test "$try_ole" = "true"; then
PKG_CHECK_MODULES(LIBOLE2, [libole2-2.0 >= 2.2.7],
[excel_msg="yes"],
[excel_msg="NO. libole2 problem"])
fi
AM_CONDITIONAL(WITH_EXCEL, test x"$excel_msg" = "xyes")
AC_SUBST(LIBOLE2_CFLAGS)
AC_SUBST(LIBOLE2_LIBS)
dnl ****************************
dnl GDA Plugin
dnl ****************************
try_gda=true
gda_msg=yes
AC_ARG_WITH(gda,
[--{with,without}-gda Compile the Gnome Database Access plugin],
if test "x$withval" = xyes; then
try_gda=true
gda_msg="Disabled by request"
fi
)
if test "$try_gda" = "true"; then
PKG_CHECK_MODULES(GDA, [libgda >= 0.8.102 ],
[gda_msg=yes],
[gda_msg="NO. libdga problem"])
fi
AM_CONDITIONAL(WITH_GDA, test x"$gda_msg" = "xyes")
AC_SUBST(GDA_CFLAGS)
AC_SUBST(GDA_LIBS)
dnl ****************************
dnl GB Plugin
dnl ****************************
#try_gda=true
#gb_msg=yes
try_gda=no
gb_msg="Temporarily disabled during gnome2 porting"
AC_ARG_WITH(gb,
[--{with,without}-gda Compile the Gnome Database Access plugin],
if test "x$withval" = xyes; then
#try_gda=true
gb_msg="We are not joking, it is temporarily disabled during gnome2 porting"
#gb_msg="Disabled by request"
fi
)
if test "$try_gb" = "true"; then
PKG_CHECK_MODULES(GB, [libgb == 1.17 ],
[gb_msg=yes],
[gb_msg="NO. gb problem"])
fi
AM_CONDITIONAL(WITH_GB, test x"$gb_msg" = "xyes")
AC_SUBST(GB_CFLAGS)
AC_SUBST(GB_LIBS)
dnl ****************************
dnl src/functions/fn-math.c uses M_PI
dnl src/plugin-util.c uses caddr_t
......@@ -91,7 +153,7 @@ guile_msg="temporarily disabled in gnome2 branch"
enable_guile=false
AC_ARG_WITH(guile,
[--{with,without}-guile Compile with Guile support or without it],
if test x$withval = xyes; then
if test "x$withval" = xyes; then
try_guile=true
fi
)
......@@ -349,11 +411,6 @@ AC_SUBST(gnumeric_gladedir)
AC_SUBST(gnumeric_autoformatdir)
AC_SUBST(gnumeric_bonobo_enabled)
have_gb=false
AM_CONDITIONAL(WITH_GB, $have_gb)
AC_SUBST(GB_CFLAGS)
AC_SUBST(GB_LIBS)
dnl ******************************
dnl Check for Evolution
dnl ******************************
......@@ -361,7 +418,7 @@ try_evolution=false
evolution=no
AC_ARG_WITH(evolution,
[--{with,without}-evolution Use evolution to send spreadsheets (bonobo needed).],
if test x$withval = xyes; then
if test "x$withval" = xyes; then
try_evolution=true
fi
)
......@@ -383,7 +440,7 @@ dnl applix_shelf_msg=no
dnl have_applix_shelf=false
dnl AC_ARG_WITH(applix_shelf,
dnl [--{with,without}-shelf Compile with Applix SHELF support or without it],
dnl if test x$withval = xyes; then
dnl if test "x$withval" = xyes; then
dnl try_applix_shelf=true
dnl fi
dnl)
......@@ -394,30 +451,9 @@ BONOBO_ACTIVATION_IDL_DIR="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`
ORBIT_IDL="${ORBIT} -I${BONOBO_IDL_DIR} -I${BONOBO_ACTIVATION_IDL_DIR}"
AC_SUBST(ORBIT_IDL)
dnl ****************************
dnl Check for libgda
dnl ****************************
try_gda=true
gda_modules="libgda >= 0.8.102"
AC_ARG_WITH(gda,
[--{with,without}-gda Compile the Gnome Database Access plugin],
if test x$withval = xyes; then
try_gda=true
fi
)
have_gda=no
if test "$try_gda" = "true"; then
PKG_CHECK_MODULES(GDA, [$gda_modules], [
have_gda=yes
], have_gda=no)
fi
AM_CONDITIONAL(WITH_GDA, test x"$have_gda" = "xyes")
AC_SUBST(GDA_CFLAGS)
AC_SUBST(GDA_LIBS)
dnl ====================================
dnl = Plan Perfect Plugin
dnl ====================================
AM_CONDITIONAL(WITH_PLAN_PERFECT, false)
dnl ====================================
......@@ -501,8 +537,11 @@ Configuration:
Source code location: ${srcdir}
Compiler: ${CC}
MS Excel Support : ${excel_msg}
GDA support: ${gda_msg}
GB support: ${gb_msg}
Bonobo Support: ${bonobo_msg}
Guile Support: ${guile_msg}
Evolution Support: ${evolution}
GDA support: ${have_gda}
"
......@@ -12,6 +12,12 @@ PYFUNC_DIR =
GNOME_GLOSSARY_DIR =
endif
if WITH_EXCEL
EXCEL_DIR=excel
else
EXCEL_DIR=
endif
if WITH_PERL
PERL_DIR = perl
else
......@@ -42,7 +48,7 @@ else
PSICONV_DIR=
endif
SUBDIRS_FILE_FORMATS = excel lotus-123 oleo sc sylk xbase html dif plan-perfect \
SUBDIRS_FILE_FORMATS = $(EXCEL_DIR) lotus-123 oleo sc sylk xbase html dif plan-perfect \
xml_sax applix mps $(GNOME_GLOSSARY_DIR) $(PSICONV_DIR)
SUBDIRS_FUNCTIONS = $(PYTHON_DIR) $(PERL_DIR) $(GUILE_DIR) $(GB_DIR) \
......
INCLUDES = \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-I$(top_srcdir)/src -I$(top_builddir)/src \
$(LIBOLE2_CFLAGS) \
$(GNUMERIC_CFLAGS)
gnumeric_plugin_exceldir = $(gnumeric_plugindir)/excel
xmldir = $(gnumeric_plugin_exceldir)
gnumeric_plugin_excel_LTLIBRARIES = excel.la
excel_la_LDFLAGS = -module -avoid-version
excel_la_LDFLAGS = -module -avoid-version $(LIBOLE2_LIBS)
excel_la_SOURCES = \
boot.c \
boot.h \
......
......@@ -3836,7 +3836,7 @@ ms_excel_read_sheet (BiffQuery *q, ExcelWorkbook *wb,
* at the NEXT record.
*/
if (q->opcode == BIFF_CHART_units) {
GnmGraph *graph =
GObject *graph =
#ifdef ENABLE_BONOBO
gnm_graph_new (esheet->wb->gnum_wb);
#else
......@@ -3844,7 +3844,7 @@ ms_excel_read_sheet (BiffQuery *q, ExcelWorkbook *wb,
#endif
ms_excel_chart (q, sheet_container (esheet),
esheet->container.ver,
G_OBJECT (graph));
graph);
} else
puts ("EXCEL: How are we seeing chart records in a sheet ?");
continue;
......@@ -4476,7 +4476,7 @@ ms_excel_read_bof (BiffQuery *q,
} else
printf ("Sheet offset in stream of %x not found in list\n", q->streamPos);
} else if (ver->type == MS_BIFF_TYPE_Chart) {
GnmGraph *graph =
GObject *graph =
#if 0
/* enable when we support workbooklevel objects */
gnm_graph_new (wb->gnum_wb);
......@@ -4484,7 +4484,7 @@ ms_excel_read_bof (BiffQuery *q,
NULL;
#endif
ms_excel_chart (q, &wb->container, ver->version,
G_OBJECT (graph));
graph);
} else if (ver->type == MS_BIFF_TYPE_VBModule ||
ver->type == MS_BIFF_TYPE_Macrosheet) {
/* Skip contents of Module, or MacroSheet */
......
2002-01-31 Jody Goldberg <jody@gnome.org>
* dialog-graph-guru.c (graph_guru_state_destroy) : convert graphs to
GObjects.
2002-01-31 Andreas J. Guelzow <aguelzow@taliesin.ca>
* plugin-manager.glade : first port to gnome2
......
......@@ -499,7 +499,7 @@ graph_guru_state_destroy (GraphGuruState *state)
wbcg_edit_detach_guru (state->wbcg);
if (state->graph != NULL) {
gtk_object_unref (GTK_OBJECT (state->graph));
g_object_unref (G_OBJECT (state->graph));
state->graph = NULL;
}
......@@ -835,7 +835,7 @@ cb_graph_guru_clicked (GtkWidget *button, GraphGuruState *state)
/* apply the changes in the guru back to the main graph */
graph_guru_apply_changes (state);
if (state->initial_page == 0) {
gtk_object_ref (GTK_OBJECT (state->graph));
g_object_ref (G_OBJECT (state->graph));
scg_mode_create_object (state->scg, SHEET_OBJECT (state->graph));
}
}
......@@ -844,7 +844,7 @@ cb_graph_guru_clicked (GtkWidget *button, GraphGuruState *state)
}
static GtkWidget *
graph_guru_init_button (GraphGuruState *state, const char *widget_name)
graph_guru_init_button (GraphGuruState *state, char const *widget_name)
{
GtkWidget *tmp = glade_xml_get_widget (state->gui, widget_name);
gtk_signal_connect (GTK_OBJECT (tmp),
......@@ -1081,9 +1081,9 @@ dialog_graph_guru (WorkbookControlGUI *wbcg, GnmGraph *graph, int page)
g_return_if_fail (IS_GNUMERIC_GRAPH (graph));
state->graph = graph;
gtk_object_ref (GTK_OBJECT (state->graph));
g_object_ref (G_OBJECT (state->graph));
} else
state->graph = gnm_graph_new (state->wb);
state->graph = GNM_GRAPH (gnm_graph_new (state->wb));
if (state->graph != NULL && page == 0) {
GList *ptr = g_list_last (state->sheet->selections);
......
......@@ -763,15 +763,18 @@ gnm_graph_setup (GnmGraph *graph, Workbook *wb)
}
/* FIXME : Should we take a CommandContext to report errors to ? */
GnmGraph *
/* FIXME : should take a DependentContainer when we create one
* so that we can handle standalone graphs.
*/
GObject *
gnm_graph_new (Workbook *wb)
{
GnmGraph *graph = gtk_type_new (GNUMERIC_GRAPH_TYPE);
GObject *graph = g_object_new (GNUMERIC_GRAPH_TYPE, NULL);
d(printf ("gnumeric : graph new %p\n", graph));
if (gnm_graph_setup (graph, wb)) {
gtk_object_destroy (GTK_OBJECT (graph));
if (gnm_graph_setup (GNM_GRAPH (graph), wb)) {
g_object_unref (graph);
return NULL;
}
return graph;
......
......@@ -20,7 +20,7 @@ typedef enum {
GtkType gnm_graph_get_type (void);
GnmGraph *gnm_graph_new (Workbook *wb);
GObject *gnm_graph_new (Workbook *wb);
void gnm_graph_clear_vectors (GnmGraph *g);
void gnm_graph_arrange_vectors (GnmGraph *g);
void gnm_graph_range_to_vectors (GnmGraph *g, Sheet *sheet,
......
......@@ -66,7 +66,6 @@ int dependency_debugging = 0;
int immediate_exit_flag = 0;
int print_debugging = 0;
gboolean initial_workbook_open_complete = FALSE;
extern gboolean libole2_debug;
static char *dump_file_name = NULL;
static const char **startup_files = NULL;
......@@ -95,11 +94,6 @@ gnumeric_popt_options[] = {
{ "debug_print", '\0', POPT_ARG_INT, &print_debugging, 0,
N_("Enables some print debugging behavior"), N_("LEVEL") },
{ "debug_ole", '\0', POPT_ARG_NONE,
&libole2_debug, 0,
N_("Enables extra consistency checking while reading ole files"),
NULL },
{ "geometry", 'g', POPT_ARG_STRING, &x_geometry, 0,
N_("Specify the size and location of the initial window"), N_("WIDTHxHEIGHT+XOFF+YOFF")
},
......
......@@ -66,7 +66,6 @@ int dependency_debugging = 0;
int immediate_exit_flag = 0;
int print_debugging = 0;
gboolean initial_workbook_open_complete = FALSE;
extern gboolean libole2_debug;
static char *dump_file_name = NULL;
static const char **startup_files = NULL;
......@@ -95,11 +94,6 @@ gnumeric_popt_options[] = {
{ "debug_print", '\0', POPT_ARG_INT, &print_debugging, 0,
N_("Enables some print debugging behavior"), N_("LEVEL") },
{ "debug_ole", '\0', POPT_ARG_NONE,
&libole2_debug, 0,
N_("Enables extra consistency checking while reading ole files"),
NULL },
{ "geometry", 'g', POPT_ARG_STRING, &x_geometry, 0,
N_("Specify the size and location of the initial window"), N_("WIDTHxHEIGHT+XOFF+YOFF")
},
......
......@@ -45,6 +45,7 @@
#include <gal/util/e-xml-utils.h>
#define PLUGIN_INFO_FILE_NAME "plugin.xml"
#define PLUGIN_DEBUG 10
typedef struct _PluginLoaderStaticInfo PluginLoaderStaticInfo;
struct _PluginLoaderStaticInfo {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment