Commit 98d8e0c3 authored by Jody Goldberg's avatar Jody Goldberg Committed by Jody Goldberg

some final life cycle tweaks before moving on the workbook.

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

	* corba-sheet.c : some final life cycle tweaks before moving on the
	  workbook.

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

	* configure.in : extend the tests for graphing libraries.
	  Enable the corba plugin if the tools are in place.
parent a6c8ee6e
2002-09-20 Jody Goldberg <jody@gnome.org>
* configure.in : extend the tests for graphing libraries.
Enable the corba plugin if the tools are in place.
2002-09-20 Jody Goldberg <jody@gnome.org>
* src/GNOME_Gnumeric.xml : Use the stock jump-to icon
* src/workbook-control-gui.c : ditto
2002-09-20 Jody Goldberg <jody@gnome.org>
* src/plugin-util.c (gnumeric_mmap_error_info) : delete.
......
2002-09-20 Jody Goldberg <jody@gnome.org>
* configure.in : extend the tests for graphing libraries.
Enable the corba plugin if the tools are in place.
2002-09-20 Jody Goldberg <jody@gnome.org>
* src/GNOME_Gnumeric.xml : Use the stock jump-to icon
* src/workbook-control-gui.c : ditto
2002-09-20 Jody Goldberg <jody@gnome.org>
* src/plugin-util.c (gnumeric_mmap_error_info) : delete.
......
2002-09-20 Jody Goldberg <jody@gnome.org>
* configure.in : extend the tests for graphing libraries.
Enable the corba plugin if the tools are in place.
2002-09-20 Jody Goldberg <jody@gnome.org>
* src/GNOME_Gnumeric.xml : Use the stock jump-to icon
* src/workbook-control-gui.c : ditto
2002-09-20 Jody Goldberg <jody@gnome.org>
* src/plugin-util.c (gnumeric_mmap_error_info) : delete.
......
......@@ -50,27 +50,47 @@ gal-2.0 >= 0.0.6
libgnome-2.0 >= 1.105.0
libgnomeui-2.0 >= 1.106.0
libgnomeprint-2.0 < 1.120.0
libgnomeprint-2.0 >= 1.116.1
libgnomeprint-2.0 >= 1.116.0
libgnomeprintui-2.0 < 1.120.0
libgnomeprintui-2.0 >= 1.116.1
libgnomeprintui-2.0 >= 1.116.0
"
try_graphs=false
try_graphs=auto
graph_msg="disabled by default"
AC_ARG_WITH(graphs,
[--{with,without}-graphs ],
if test "x$withval" = xyes -o "x$withval" = xguppi -o "x$withval" = xGuppi -o "x$withval" = xGUPPI; then
if test "x$withval" = xyes ; then
try_graphs=auto
elif test "x$withval" = xgtkextra -o "x$withval" = xGtkExtra -o "x$withval" = xGTKEXTRA; then
try_graphs=gtkextra
elif test "x$withval" = xguppi -o "x$withval" = xGuppi -o "x$withval" = xGUPPI; then
try_graphs=guppi
graph_msg=Guppi
fi
if test "x$withval" = xgtkextra -o "x$withval" = xGtkExtra -o "x$withval" = xGTKEXTRA; then
try_graphs=gtkextra
)
if test "x$try_graphs" = "xgtkextra" -o "x$try_graphs" = "xauto" ; then
PKG_CHECK_MODULES(LIBGTKEXTRA, [gtkextra-2.0 >= 1.1.0],
[found_gtkextra="yes"],
[found_gtkextra="no"])
if test "x$found_gtkextra" = "xyes"; then
gnumeric_reqs="$gnumeric_reqs gtkextra-2.0 >= 1.1.0"
graph_msg=GtkExtra-2
try_graphs=gtkextra # in case we were auto
elif test "x$try_graphs" = "xgtkextra"; then
graph_msg="GtkExtra not found"
fi
fi
if test "x$try_graphs" = "xguppi" -o "x$try_graphs" = "xauto" ; then
PKG_CHECK_MODULES(LIBGUPPI, [libguppi-2 >= 0.50.0],
[found_guppi="yes"],
[found_guppi="no"])
if test "x$found_guppi" = "xyes"; then
gnumeric_reqs="$gnumeric_reqs libguppi-2 >= 0.50.0"
graph_msg=Guppi
try_graphs=guppi # in case we were auto
elif test "x$try_graphs" = "xguppi"; then
graph_msg="Guppi not found"
else
graph_msg="Neither GtkExtra nor Guppi was found"
fi
)
if test "$try_graphs" = "guppi"; then
gnumeric_reqs="$gnumeric_reqs libguppi-2 >= 0.50.0"
elif test "$try_graphs" = "gtkextra"; then
gnumeric_reqs="$gnumeric_reqs gtkextra-2.0 >= 1.1.0"
fi
dnl **************
......@@ -580,12 +600,6 @@ if test "x$pygtk_msg" = "xyes"; then
AC_DEFINE(WITH_PYGTK)
fi
dnl *************
dnl Corba support
dnl *************
AM_CONDITIONAL(WITH_CORBA, false)
dnl **************************************************
dnl * Config defaults (Must be after bonobo)
dnl **************************************************
......@@ -654,25 +668,23 @@ if test x"$evolution" = "xyes" ; then
AC_DEFINE(ENABLE_EVOLUTION)
fi
dnl ******************************
dnl Check for Applix SHELF
dnl ******************************
dnl try_applix_shelf=false
dnl applix_shelf=
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 try_applix_shelf=true
dnl fi
dnl)
ORBIT="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`"
BONOBO_IDL_DIR="`$PKG_CONFIG --variable=idldir libbonobo-2.0`"
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 Corba support
dnl *************
with_corba=false
PKG_CHECK_MODULES(CORBA_LIBS, [ORBit-2.0 >= 2.4.2
libbonobo-2.0 >= 2.0.0
bonobo-activation-2.0 >= 1.0.2
],[with_corba=true])
AM_CONDITIONAL(WITH_CORBA, $with_corba)
if test "x$with_corba" = "xtrue" ; then
ORBIT="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`"
BONOBO_IDL_DIR="`$PKG_CONFIG --variable=idldir libbonobo-2.0`"
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)
fi
dnl ====================================
dnl = Test whether jw is installed
......
2002-09-20 Jody Goldberg <jody@gnome.org>
* corba-sheet.c : some final life cycle tweaks before moving on the
workbook.
2002-09-20 Jody Goldberg <jody@gnome.org>
* corba-sheet.c : rework yet again to use a 2 object system.
......
......@@ -47,6 +47,16 @@ typedef struct {
POA_GNOME_Gnumeric_Sheet__epv epv;
} CorbaSheetClass;
struct _SheetControlCORBA {
SheetControl base;
CorbaSheet *servant;
};
typedef struct {
SheetControlClass base;
} SheetControlCORBAClass;
static GType csheet_get_type (void);
static Sheet *
......@@ -93,7 +103,14 @@ csheet_set_index (PortableServer_Servant servant,
static void
csheet_dispose (GObject *obj)
{
/* FIXME : do we need to unref the container ? */
CorbaSheet *cs = CORBA_SHEET (obj);
SheetControlCORBA *scc = cs->container;
if (scc != NULL) {
cs->container = NULL;
scc->servant = NULL; /* break loop */
g_object_unref (G_OBJECT(scc));
}
}
static void
......@@ -122,25 +139,17 @@ BONOBO_TYPE_FUNC_FULL (CorbaSheet,
/*************************************************************************/
struct _SheetControlCORBA {
SheetControl base;
CorbaSheet *servant;
};
typedef struct {
SheetControlClass base;
} SheetControlCORBAClass;
static void
scc_finalize (GObject *obj)
{
GObjectClass *parent_class;
SheetControlCORBA *scc = SHEET_CONTROL_CORBA (obj);
CorbaSheet *cs = scc->servant;
if (scc->servant != NULL) {
bonobo_object_unref (BONOBO_OBJECT (scc->servant));
if (cs != NULL) {
scc->servant = NULL;
cs->container = NULL; /* break loop */
bonobo_object_unref (BONOBO_OBJECT (cs));
}
parent_class = g_type_class_peek (SHEET_CONTROL_TYPE);
......
......@@ -290,6 +290,7 @@
<menuitem name="EditGoto" verb=""
_label="_Goto cell..."
_tip="Jump to a specified cell"
pixtype="stock" pixname="gtk-jump-to"
accel="F5"/>
<menuitem name="EditRecalc" verb=""
......
......@@ -3057,7 +3057,7 @@ static GnomeUIInfo workbook_menu_edit [] = {
{ GNOME_APP_UI_ITEM, N_("_Goto cell..."),
N_("Jump to a specified cell"),
cb_edit_goto,
NULL, NULL, 0, 0, GDK_F5, 0 },
GNOME_APP_PIXMAP_STOCK, GTK_STOCK_JUMP_TO, 0, 0, GDK_F5, 0 },
{ GNOME_APP_UI_ITEM, N_("Recalculate"),
N_("Recalculate the spreadsheet"),
......
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