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

Fix Bug 7948 Fix

Fix Bug 7948
Fix http://www.gnome.org/mailing-lists/archives/gnumeric-list/2000-March/0073.shtml

2000-03-29  Jody Goldberg <jgoldberg@home.com>

	* src/dialogs/dialog-cell-format.c (cb_font_changed) : Use the size
	  from the selector rather than the display size with is zoom and
	  resolution dependant.

	* src/main.c (has_gnumeric_been_compiled_with_guile_support) :
	  A little test to circumvent the problems associated with the guile
	  pluging requiring changes to gnumeric's main().
parent 1775a506
2000-03-29 Jody Goldberg <jgoldberg@home.com>
* src/dialogs/dialog-cell-format.c (cb_font_changed) : Use the size
from the selector rather than the display size with is zoom and
resolution dependant.
* src/main.c (has_gnumeric_been_compiled_with_guile_support) :
A little test to circumvent the problems associated with the guile
pluging requiring changes to gnumeric's main().
2000-03-30 Kjartan Maraas <kmaraas@online.no>
* gnumeric.spec.in: Make it build a RPM.
......
2000-03-29 Jody Goldberg <jgoldberg@home.com>
* src/dialogs/dialog-cell-format.c (cb_font_changed) : Use the size
from the selector rather than the display size with is zoom and
resolution dependant.
* src/main.c (has_gnumeric_been_compiled_with_guile_support) :
A little test to circumvent the problems associated with the guile
pluging requiring changes to gnumeric's main().
2000-03-30 Kjartan Maraas <kmaraas@online.no>
* gnumeric.spec.in: Make it build a RPM.
......
2000-03-29 Jody Goldberg <jgoldberg@home.com>
* src/dialogs/dialog-cell-format.c (cb_font_changed) : Use the size
from the selector rather than the display size with is zoom and
resolution dependant.
* src/main.c (has_gnumeric_been_compiled_with_guile_support) :
A little test to circumvent the problems associated with the guile
pluging requiring changes to gnumeric's main().
2000-03-30 Kjartan Maraas <kmaraas@online.no>
* gnumeric.spec.in: Make it build a RPM.
......
2000-03-29 Jody Goldberg <jgoldberg@home.com>
* src/dialogs/dialog-cell-format.c (cb_font_changed) : Use the size
from the selector rather than the display size with is zoom and
resolution dependant.
* src/main.c (has_gnumeric_been_compiled_with_guile_support) :
A little test to circumvent the problems associated with the guile
pluging requiring changes to gnumeric's main().
2000-03-30 Kjartan Maraas <kmaraas@online.no>
* gnumeric.spec.in: Make it build a RPM.
......
2000-03-29 Jody Goldberg <jgoldberg@home.com>
* src/dialogs/dialog-cell-format.c (cb_font_changed) : Use the size
from the selector rather than the display size with is zoom and
resolution dependant.
* src/main.c (has_gnumeric_been_compiled_with_guile_support) :
A little test to circumvent the problems associated with the guile
pluging requiring changes to gnumeric's main().
2000-03-30 Kjartan Maraas <kmaraas@online.no>
* gnumeric.spec.in: Make it build a RPM.
......
2000-03-29 Jody Goldberg <jgoldberg@home.com>
* src/dialogs/dialog-cell-format.c (cb_font_changed) : Use the size
from the selector rather than the display size with is zoom and
resolution dependant.
* src/main.c (has_gnumeric_been_compiled_with_guile_support) :
A little test to circumvent the problems associated with the guile
pluging requiring changes to gnumeric's main().
2000-03-30 Kjartan Maraas <kmaraas@online.no>
* gnumeric.spec.in: Make it build a RPM.
......
2000-03-29 Jody Goldberg <jgoldberg@home.com>
* src/dialogs/dialog-cell-format.c (cb_font_changed) : Use the size
from the selector rather than the display size with is zoom and
resolution dependant.
* src/main.c (has_gnumeric_been_compiled_with_guile_support) :
A little test to circumvent the problems associated with the guile
pluging requiring changes to gnumeric's main().
2000-03-30 Kjartan Maraas <kmaraas@online.no>
* gnumeric.spec.in: Make it build a RPM.
......
2000-03-29 Jody Goldberg <jgoldberg@home.com>
* plugin.c (init_plugin) : Add check to ensure that gnumeric was
compiled with guile support so that stale plugins do not crash.
2000-03-08 Ariel Rios <ariel@arcavia.com>
* plugin.c (init_plugin): Corrected the number of arguments
......
......@@ -22,6 +22,8 @@
#include "func.h"
#include "cell.h"
#include "value.h"
#include "main.h"
#include "command-context.h"
/* This is damn ugly.
* However, it will get things working again (I hope)
......@@ -474,6 +476,12 @@ init_plugin (CommandContext *context, PluginData *pd)
if (plugin_version_mismatch (context, pd, GNUMERIC_VERSION))
return PLUGIN_QUIET_ERROR;
if (!has_gnumeric_been_compiled_with_guile_support ()) {
gnumeric_error_plugin_problem (context,
_("Gnumeric has not been compiled with support for guile."));
return PLUGIN_QUIET_ERROR;
}
/* Initialize just in case. */
eval_pos = NULL;
......
......@@ -1140,25 +1140,22 @@ cb_font_changed (GtkWidget *widget, GtkStyle *previous_style, FormatState *state
{
FontSelector *font_sel;
GnomeDisplayFont *gnome_display_font;
GnomeFont *gnome_font;
char *family_name;
double height;
g_return_if_fail (state != NULL);
font_sel = state->font.selector;
g_return_if_fail (font_sel != NULL);
gnome_display_font = font_sel->display_font;
gnome_display_font = font_sel->display_font;
if (!gnome_display_font)
return;
gnome_font = gnome_display_font->gnome_font;
family_name = gnome_font->fontmap_entry->familyname;
height = gnome_display_font->gnome_font->size;
if (state->enable_edit) {
GnomeFont const * const gnome_font = gnome_display_font->gnome_font;
char const * const family_name = gnome_font->fontmap_entry->familyname;
mstyle_set_font_name (state->result, family_name);
mstyle_set_font_size (state->result, gnome_font->size);
mstyle_set_font_size (state->result, font_sel->size);
mstyle_set_font_bold (state->result,
gnome_font->fontmap_entry->weight_code >=
GNOME_FONT_BOLD);
......
......@@ -214,6 +214,12 @@ gnumeric_main (void *closure, int argc, char *argv [])
}
#ifdef HAVE_GUILE
gboolean
has_gnumeric_been_compiled_with_guile_support ()
{
return TRUE;
}
int
main (int argc, char *argv [])
{
......@@ -250,6 +256,12 @@ main (int argc, char *argv [])
return 0;
}
#else
gboolean
has_gnumeric_been_compiled_with_guile_support ()
{
return FALSE;
}
int
main (int argc, char *argv [])
{
......
......@@ -11,4 +11,10 @@ extern int dependency_debugging;
void gnumeric_arg_parse (int argc, char *argv []);
/* A necessary bogosity that is required to avoid bug #7948 with current
* versions of guile
*/
gboolean
has_gnumeric_been_compiled_with_guile_support ();
#endif
......@@ -214,6 +214,12 @@ gnumeric_main (void *closure, int argc, char *argv [])
}
#ifdef HAVE_GUILE
gboolean
has_gnumeric_been_compiled_with_guile_support ()
{
return TRUE;
}
int
main (int argc, char *argv [])
{
......@@ -250,6 +256,12 @@ main (int argc, char *argv [])
return 0;
}
#else
gboolean
has_gnumeric_been_compiled_with_guile_support ()
{
return FALSE;
}
int
main (int argc, char *argv [])
{
......
......@@ -11,4 +11,10 @@ extern int dependency_debugging;
void gnumeric_arg_parse (int argc, char *argv []);
/* A necessary bogosity that is required to avoid bug #7948 with current
* versions of guile
*/
gboolean
has_gnumeric_been_compiled_with_guile_support ();
#endif
......@@ -1120,15 +1120,16 @@ static GnomeUIInfo workbook_menu_file [] = {
GNOMEUIINFO_MENU_SAVE_AS_ITEM(file_save_as_cmd, NULL),
{ GNOME_APP_UI_ITEM, N_("Su_mmary..."), N_("Summary information"),
summary_cmd },
GNOMEUIINFO_ITEM_NONE(N_("Su_mmary..."),
N_("Summary information"),
&summary_cmd),
GNOMEUIINFO_SEPARATOR,
GNOMEUIINFO_MENU_PRINT_SETUP_ITEM(print_setup_cmd, NULL),
GNOMEUIINFO_MENU_PRINT_ITEM(file_print_cmd, NULL),
{ GNOME_APP_UI_ITEM, N_("Print pre_view"), N_("Print preview"),
file_print_preview_cmd },
GNOMEUIINFO_ITEM(N_("Print pre_view"), N_("Print preview"),
&file_print_preview_cmd, preview_xpm),
GNOMEUIINFO_SEPARATOR,
......@@ -1143,22 +1144,21 @@ static GnomeUIInfo workbook_menu_file [] = {
/* Edit menu */
static GnomeUIInfo workbook_menu_edit_clear [] = {
{ GNOME_APP_UI_ITEM, N_("_All"),
N_("Clear the selected cells' formats, comments, and contents"),
clear_all_cmd },
{ GNOME_APP_UI_ITEM, N_("_Formats"),
N_("Clear the selected cells' formats"),
clear_formats_cmd },
{ GNOME_APP_UI_ITEM, N_("Co_mments"),
N_("Clear the selected cells' comments"),
clear_comments_cmd },
{ GNOME_APP_UI_ITEM, N_("_Content"),
N_("Clear the selected cells' contents"),
clear_content_cmd },
GNOMEUIINFO_ITEM_NONE(N_("_All"),
N_("Clear the selected cells' formats, comments, and contents"),
&clear_all_cmd),
GNOMEUIINFO_ITEM_NONE(N_("_Formats"),
N_("Clear the selected cells' formats"),
&clear_formats_cmd),
GNOMEUIINFO_ITEM_NONE(N_("Co_mments"),
N_("Clear the selected cells' comments"),
&clear_comments_cmd),
GNOMEUIINFO_ITEM_NONE(N_("_Content"),
N_("Clear the selected cells' contents"),
&clear_content_cmd),
GNOMEUIINFO_END
};
#define PASTE_SPECIAL_NAME N_("P_aste special...")
#define GNOME_MENU_EDIT_PATH D_("_Edit/")
static GnomeUIInfo workbook_menu_edit [] = {
......@@ -1173,20 +1173,25 @@ static GnomeUIInfo workbook_menu_edit [] = {
GNOMEUIINFO_SEPARATOR,
{ GNOME_APP_UI_ITEM, PASTE_SPECIAL_NAME, NULL,
paste_special_cmd },
{ GNOME_APP_UI_SUBTREE, N_("C_lear"),
N_("Clear the selected cell(s)"), workbook_menu_edit_clear },
{ GNOME_APP_UI_ITEM, N_("_Delete..."), NULL,
delete_cells_cmd },
{ GNOME_APP_UI_ITEM, N_("De_lete Sheet"), NULL,
delete_sheet_cmd },
GNOMEUIINFO_ITEM_NONE(N_("P_aste special..."),
N_("Paste with optional filters and transformations"),
&paste_special_cmd),
GNOMEUIINFO_SUBTREE(N_("C_lear"), &workbook_menu_edit_clear),
GNOMEUIINFO_ITEM_NONE(N_("_Delete..."),
N_("Remove selected cells, shifting other into their place"),
&delete_cells_cmd),
GNOMEUIINFO_ITEM_NONE(N_("De_lete Sheet"),
N_("Irrevocably remove an entire sheet"),
&delete_sheet_cmd),
GNOMEUIINFO_SEPARATOR,
{ GNOME_APP_UI_ITEM, N_("_Select All"),
N_("Select all cells in the spreadsheet"), select_all_cmd, NULL,
NULL, 0, 0, 'a', GDK_CONTROL_MASK },
{ GNOME_APP_UI_ITEM, N_("_Goto cell..."),
N_("Jump to a specified cell"), goto_cell_cmd, NULL, NULL,
0, 0, 'i', GDK_CONTROL_MASK },
......@@ -1200,8 +1205,9 @@ static GnomeUIInfo workbook_menu_edit [] = {
/* View menu */
static GnomeUIInfo workbook_menu_view [] = {
{ GNOME_APP_UI_ITEM, N_("_Zoom..."),
N_("Zoom the spreadsheet in or out"), zoom_cmd },
GNOMEUIINFO_ITEM_NONE(N_("_Zoom..."),
N_("Zoom the spreadsheet in or out"),
&zoom_cmd),
GNOMEUIINFO_END
};
......
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