Commit 36a30eef authored by Jody Goldberg's avatar Jody Goldberg Committed by Jody Goldberg

clean names before deps so that we don't end up with stale deps in a name


2002-08-09  Jody Goldberg <jody@gnome.org>

	* src/dependent.c (sheet_deps_destroy) : clean names before deps
	  so that we don't end up with stale deps in a name dep list.
	(workbook_deps_destroy) : clear sheet names too.

	* src/expr-name.c (expr_name_shutdown) : deactivate the builtins
	  before freeing them.

2002-06-28  J.H.M. Dassen (Ray) <jdassen@debian.org>

	MIME consistency improvements
	* icons/gnome-application-vnd.lotus-1-2-3.png,
	  icons/gnome-application-x-applix-spreadsheet.png,
	  icons/gnome-application-x-generic-spreadsheet.png,
	  icons/gnome-application-x-generic-spreadsheet.png: New (from mc and
	  gnome-mime-data).
	* icons/Makefile.am: Updated for new icons.
	* gnumeric.keys.in: Added application/vnd.lotus-1-2-3,
	  application/x-applix-spreadsheet, application/x-oleo,
	  application/x-xbase
	* gnumeric.mime: Changed application/x-applix to
	  application/x-applix-spreadsheet to be consistent with the type
	  elsewhere; added application/vnd.lotus-1-2-3 with extensions as per
	  http://www.iana.org/assignments/media-types/application/vnd.lotus-1-2-3

2002-06-02  J.H.M. Dassen (Ray) <jdassen@debian.org>

	* debian/*: updated.
	* src/cell.h: made declaration of cell_new a prototype.
	* src/plugin.h: declare printf format attribute for plugin_message.
	* src/print.c: removed duplicate declaration of print_debugging (which
	  is already declared via libgnumeric.h .

2002-08-08  Jody Goldberg <jody@gnome.org>

	* src/expr-name.c (expr_name_shutdown) : fix
parent 7ddc71db
2002-08-09 Jody Goldberg <jody@gnome.org>
* src/dependent.c (sheet_deps_destroy) : clean names before deps
so that we don't end up with stale deps in a name dep list.
(workbook_deps_destroy) : clear sheet names too.
* src/expr-name.c (expr_name_shutdown) : deactivate the builtins
before freeing them.
2002-06-28 J.H.M. Dassen (Ray) <jdassen@debian.org>
MIME consistency improvements
* icons/gnome-application-vnd.lotus-1-2-3.png,
icons/gnome-application-x-applix-spreadsheet.png,
icons/gnome-application-x-generic-spreadsheet.png,
icons/gnome-application-x-generic-spreadsheet.png: New (from mc and
gnome-mime-data).
* icons/Makefile.am: Updated for new icons.
* gnumeric.keys.in: Added application/vnd.lotus-1-2-3,
application/x-applix-spreadsheet, application/x-oleo,
application/x-xbase
* gnumeric.mime: Changed application/x-applix to
application/x-applix-spreadsheet to be consistent with the type
elsewhere; added application/vnd.lotus-1-2-3 with extensions as per
http://www.iana.org/assignments/media-types/application/vnd.lotus-1-2-3
2002-06-02 J.H.M. Dassen (Ray) <jdassen@debian.org>
* debian/*: updated.
* src/cell.h: made declaration of cell_new a prototype.
* src/plugin.h: declare printf format attribute for plugin_message.
* src/print.c: removed duplicate declaration of print_debugging (which
is already declared via libgnumeric.h .
2002-08-08 Jody Goldberg <jody@gnome.org>
* src/expr-name.c (expr_name_shutdown) : fix
2002-08-08 Jody Goldberg <jody@gnome.org>
* src/workbook-view.c (wb_view_new_from_input) : its ok to have 0 sheets,
......
2002-08-09 Jody Goldberg <jody@gnome.org>
* src/dependent.c (sheet_deps_destroy) : clean names before deps
so that we don't end up with stale deps in a name dep list.
(workbook_deps_destroy) : clear sheet names too.
* src/expr-name.c (expr_name_shutdown) : deactivate the builtins
before freeing them.
2002-06-28 J.H.M. Dassen (Ray) <jdassen@debian.org>
MIME consistency improvements
* icons/gnome-application-vnd.lotus-1-2-3.png,
icons/gnome-application-x-applix-spreadsheet.png,
icons/gnome-application-x-generic-spreadsheet.png,
icons/gnome-application-x-generic-spreadsheet.png: New (from mc and
gnome-mime-data).
* icons/Makefile.am: Updated for new icons.
* gnumeric.keys.in: Added application/vnd.lotus-1-2-3,
application/x-applix-spreadsheet, application/x-oleo,
application/x-xbase
* gnumeric.mime: Changed application/x-applix to
application/x-applix-spreadsheet to be consistent with the type
elsewhere; added application/vnd.lotus-1-2-3 with extensions as per
http://www.iana.org/assignments/media-types/application/vnd.lotus-1-2-3
2002-06-02 J.H.M. Dassen (Ray) <jdassen@debian.org>
* debian/*: updated.
* src/cell.h: made declaration of cell_new a prototype.
* src/plugin.h: declare printf format attribute for plugin_message.
* src/print.c: removed duplicate declaration of print_debugging (which
is already declared via libgnumeric.h .
2002-08-08 Jody Goldberg <jody@gnome.org>
* src/expr-name.c (expr_name_shutdown) : fix
2002-08-08 Jody Goldberg <jody@gnome.org>
* src/workbook-view.c (wb_view_new_from_input) : its ok to have 0 sheets,
......
2002-08-09 Jody Goldberg <jody@gnome.org>
* src/dependent.c (sheet_deps_destroy) : clean names before deps
so that we don't end up with stale deps in a name dep list.
(workbook_deps_destroy) : clear sheet names too.
* src/expr-name.c (expr_name_shutdown) : deactivate the builtins
before freeing them.
2002-06-28 J.H.M. Dassen (Ray) <jdassen@debian.org>
MIME consistency improvements
* icons/gnome-application-vnd.lotus-1-2-3.png,
icons/gnome-application-x-applix-spreadsheet.png,
icons/gnome-application-x-generic-spreadsheet.png,
icons/gnome-application-x-generic-spreadsheet.png: New (from mc and
gnome-mime-data).
* icons/Makefile.am: Updated for new icons.
* gnumeric.keys.in: Added application/vnd.lotus-1-2-3,
application/x-applix-spreadsheet, application/x-oleo,
application/x-xbase
* gnumeric.mime: Changed application/x-applix to
application/x-applix-spreadsheet to be consistent with the type
elsewhere; added application/vnd.lotus-1-2-3 with extensions as per
http://www.iana.org/assignments/media-types/application/vnd.lotus-1-2-3
2002-06-02 J.H.M. Dassen (Ray) <jdassen@debian.org>
* debian/*: updated.
* src/cell.h: made declaration of cell_new a prototype.
* src/plugin.h: declare printf format attribute for plugin_message.
* src/print.c: removed duplicate declaration of print_debugging (which
is already declared via libgnumeric.h .
2002-08-08 Jody Goldberg <jody@gnome.org>
* src/expr-name.c (expr_name_shutdown) : fix
2002-08-08 Jody Goldberg <jody@gnome.org>
* src/workbook-view.c (wb_view_new_from_input) : its ok to have 0 sheets,
......
gnumeric (1.1.2-1) experimental; urgency=low
gnumeric (1.1.5-1) experimental; urgency=low
* UNRELEASED
* Waiting for libgsf to replace libole so we can support .xls without
needing to package libole CVS HEAD.
* Development version based on upstream CVS HEAD.
-- J.H.M. Dassen (Ray) <jdassen@debian.org> Sun, 2 Jun 2002 12:00:17 +0200
* TODO
* Port gda plugin fixes ?
gnumeric (1.0.6-2) unstable; urgency=high
-- J.H.M. Dassen (Ray) <jdassen@debian.org> Sun, 21 Apr 2002 15:13:22 +0200
* Fixed doc/{es,ja,no,ru}/topic.dat to refer to 'index.html' rather than
'gnumeric.html'. (Closes: #144141)
* No longer prevent the psiconv plugin Makefile from being generated, as
it no longer causes the build to fail.
-- J.H.M. Dassen (Ray) <jdassen@debian.org> Tue, 23 Apr 2002 18:02:30 +0200
gnumeric (1.0.6-1) unstable; urgency=high
......
......@@ -2,7 +2,7 @@ Source: gnumeric
Section: math
Priority: optional
Maintainer: J.H.M. Dassen (Ray) <jdassen@debian.org>
Build-Depends: debhelper (>= 3.0), libtool, automake (>= 1.4-p4-1), autoconf (>= 2.52), gettext, bison, flex, docbook-utils, intltool, libglib2.0-dev, libgtk2.0-dev, gnome-common, libxslt1-dev, libgnome2-dev (>= 1.105.0-1), liborbit2-dev (>= 2.3.102-2), libgnomeui-dev (>= 1.106.0-1), libgnomeprint2-dev (>= 1.106.0-1), libgnomeprintui-dev (>= 1.106.0-1), libglade2-dev (>= 1.99.4-1), libgal2-0-dev, libxml2-dev (>= 2.4.12-1), libole2-dev (>= 0.2.0), libgda2-dev, python2.2-dev (>= 2.2-1), gnome-doc-tools
Build-Depends: debhelper (>= 3.0), libtool, automake (>= 1.4-p4-1), autoconf (>= 2.52), gettext, bison, flex, docbook-utils, intltool, libglib2.0-dev, libgtk2.0-dev, gnome-common, libxslt1-dev, libgnome2-dev (>= 1.105.0-1), liborbit2-dev (>= 2.3.102-2), libgnomeui-dev (>= 1.106.0-1), libgnomeprint2-dev (>= 1.114.0-1), libgnomeprintui-dev (>= 1.114.0-1), libglade2-dev (>= 1.99.4-1), libgal2-0-dev, libbonobo2-dev (>= 1.115.0-1), libbonoboui2-dev (>= 1.117.1-1), libbonobo-activation-dev (>= 0.9.6-1), libxml2-dev (>= 2.4.12-1), libgda2-dev, python2.2-dev (>= 2.2-1), gnome-doc-tools
Standards-Version: 3.5.6
Package: gnumeric
......
......@@ -14,6 +14,9 @@ export DH_COMPAT=3
# Try to preserve timestamps as much as possible
export INSTALL=/usr/bin/install -p
# Are we building a release version, or are we doing development?
CVS_BUILD=$(shell test ! -d CVS; echo $$?)
# Features configuration
# ----------------------
......@@ -30,11 +33,8 @@ features+= --with-python=python2.2
# Bonobo allows us to use parts of other applications like Guppi and
# Evolution as components via CORBA, and allows us to work as a component
# for other applications.
#
# The bonobo support is currently disabled while the GNOME2 port is being
# worked on
features+= --without-bonobo
features+= --with-bonobo
# File -> Send functionality via Evolution's mail composer component. Note
# that this is achieved through Bonobo, so no additional library
......@@ -59,6 +59,15 @@ features+= --without-guile
features+= --without-gb
ifeq ($(CVS_BUILD),1)
CONFIGURE=autogen.sh
# For development, use a recent compiler and enable plenty of
# warnings.
export CC=gcc-3.1 -Wall -Wmultichar -Wsystem-headers -W -Wfloat-equal -Wundef -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wunreachable-code
else
CONFIGURE=configure -v
endif
configure: configure-stamp
configure-stamp:
dh_testdir
......@@ -75,7 +84,7 @@ configure-stamp:
mkdir build
cd build && env srcdir=`pwd`/.. \
sh ../autogen.sh \
sh ../$(CONFIGURE) \
$(features) \
--prefix=/usr --sysconfdir=/etc \
--localstatedir=/var/lib \
......@@ -98,21 +107,25 @@ clean:
rm -f build-stamp configure-stamp debian/*substvars debian/*~
rm -rf debian/tmp build
# Clean out files generated as part of the documentation generation
-rm -f doc/C/index.html omf-install/gnumeric-C.omf
-rm -rf doc/C/gnumeric doc/C/DBTOHTML_OUTPUT_DIR*
-rm -rf aclocal.m4 config.h.in stamp-h.in \
xml-i18n-extract* xml-i18n-merge* xml-i18n-update* \
doc/C/gnumeric.junk
ifeq ($(CVS_BUILD),1)
# Clean out files that autogen.sh may have changed
rm -f config.guess config.sub ltmain.sh
-rm -f configure
# Clean out files generated by autotools, intltool and the like
-find -type f -name 'Makefile.am' | sed -e 's/\.am$$/.in/' | xargs rm -f
-find -type f -name 'Makefile.am' | sed -e 's/\.am$$//' | xargs rm -f
-rm -f po/*.gmo
endif
-find -type f -name 'Makefile.am' | sed -e 's/\.am$$//' | xargs rm -f
# Clean out files generated as part of the documentation generation
-rm -f doc/C/index.html omf-install/gnumeric-C.omf
-rm -rf doc/C/gnumeric doc/C/DBTOHTML_OUTPUT_DIR*
-rm -rf aclocal.m4 config.h.in configure stamp-h.in \
xml-i18n-extract* xml-i18n-merge* xml-i18n-update* \
doc/C/gnumeric.junk
dh_clean
install: DH_OPTIONS=
......
......@@ -7,3 +7,23 @@ application/vnd.ms-excel:
open=gnumeric %f
view=gnumeric %f
icon-filename=@icondir@/gnome-application-x-xls.png
application/vnd.lotus-1-2-3:
open=gnumeric %f
view=gnumeric %f
icon-filename=@icondir@/gnome-application-vnd.lotus-1-2-3.png
application/x-applix-spreadsheet
open=gnumeric %f
view=gnumeric %f
icon-filename=@icondir@/gnome-application-x-applix-spreadsheet.png
application/x-oleo
open=gnumeric %f
view=gnumeric %f
icon-filename=@icondir@/gnome-application-x-generic-spreadsheet.png
application/x-xbase
open=gnumeric %f
view=gnumeric %f
icon-filename=@icondir@/gnome-application-x-generic-spreadsheet.png
......@@ -4,5 +4,8 @@ application/x-gnumeric
application/vnd.ms-excel
ext: xls xlw
application/x-applix
application/x-applix-spreadsheet
ext: as
application/vnd.lotus-1-2-3
ext: 123 wk4 wk3 wk1
......@@ -3,7 +3,10 @@ iconsdir = $(datadir)/pixmaps/gnumeric
appicondir = $(datadir)/pixmaps
appicon_DATA = gnome-gnumeric.png \
gnome-application-x-gnumeric.png \
gnome-application-x-xls.png
gnome-application-x-xls.png \
gnome-application-x-applix-spreadsheet.png \
gnome-application-vnd.lotus-1-2-3.png \
gnome-application-x-generic-spreadsheet.png
icons_DATA = \
$(appicon_DATA) \
......
......@@ -33,7 +33,7 @@ struct _Cell {
/**
* Manage cells
*/
Cell *cell_new ();
Cell *cell_new (void);
Cell *cell_copy (Cell const *cell);
void cell_destroy (Cell *cell);
void cell_relocate (Cell *cell, GnmExprRewriteInfo const *rwinfo);
......
......@@ -1721,11 +1721,14 @@ sheet_deps_destroy (Sheet *sheet)
/* The GnmDepContainer contains the names that reference this, not the
* names it contains. Remove them here. NOTE : they may continue to exist
* inactively for a bit.
* inactively for a bit. Be careful to remove them _before_ destroying
* the deps. This is a bit wasteful in that we unlink and relink a few
* things that are going to be deleted. However, it is necessary to
* catch all the different life cycles
*/
do_deps_destroy (sheet, &rwinfo);
expr_name_list_destroy (sheet->names);
sheet->names = NULL;
do_deps_destroy (sheet, &rwinfo);
}
void
......@@ -1744,9 +1747,14 @@ workbook_deps_destroy (Workbook *wb)
wb->sheet_order_dependents = NULL;
}
WORKBOOK_FOREACH_SHEET (wb, sheet, do_deps_destroy (sheet, &rwinfo););
/* See above for explantion */
expr_name_list_destroy (wb->names);
wb->names = NULL;
WORKBOOK_FOREACH_SHEET (wb, sheet, {
expr_name_list_destroy (sheet->names);
sheet->names = NULL;
do_deps_destroy (sheet, &rwinfo);
});
}
void
......
......@@ -65,7 +65,8 @@ static void
cb_add_clicked (GtkWidget *widget, AutoCorrectExceptionState *s)
{
gchar const *txt;
gchar *dumy[2], *str;
gchar const *dumy[2];
gchar const *str;
GSList *ptr;
gboolean new_flag = TRUE;
......
......@@ -623,6 +623,7 @@ expr_name_shutdown (void)
GnmNamedExpr *nexpr =
expr_name_lookup (NULL, builtins[lp].name);
if (nexpr) {
nexpr->active = FALSE;
expr_name_unref (nexpr);
global_names = g_list_remove (global_names, nexpr);
}
......
......@@ -52,6 +52,6 @@ gboolean plugin_db_is_plugin_marked_for_deactivation (GnmPlugin *pinfo);
void plugin_db_activate_plugin_list (GSList *plugins, ErrorInfo **ret_error);
void plugin_db_deactivate_plugin_list (GSList *plugins, ErrorInfo **ret_error);
void plugin_message (gint level, const gchar *format, ...);
void plugin_message (gint level, const gchar *format, ...) G_GNUC_PRINTF (2, 3);
#endif /* GNUMERIC_PLUGIN_H */
......@@ -36,8 +36,6 @@
#include <libgnomeprintui/gnome-print-dialog.h>
#include <libgnomeprintui/gnome-printer-dialog.h>
extern int print_debugging;
/*
* Margins
*
......
......@@ -3,6 +3,19 @@
#include "lpglob.h"
#include <stdarg.h>
void
lp_solve_debug_print_solution (lprec *lp);
void
lp_solve_debug_print_bounds (lprec *lp, gnum_float *upbo, gnum_float *lowbo);
void
lp_solve_debug_print (lprec *lp, const char *format, ...)
#ifdef __GNUC__
__attribute__ ((format (printf, 2, 3)))
#endif
;
static void
print_indent (void)
......@@ -84,7 +97,6 @@ lp_solve_debug_print_bounds (lprec *lp, gnum_float *upbo, gnum_float *lowbo)
}
}
void
lp_solve_debug_print (lprec *lp, const char *format, ...)
{
......
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