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

Init the updating_toolbar flag.


2000-10-10  Jody Goldberg <jgoldberg@home.com>

	* src/workbook-private.c (workbook_private_init) : Init the
	  updating_toolbar flag.

	* src/workbook-format-toolbar.c (set_selection_halign) : Use the
	  updating toolbar flag so that the bonobo version (which does not
	  disable the callbacks) works correctly.
	(change_selection_font) : Ditto.
	(workbook_format_toolbutton_update) : Remove the hackish static and use a real flag.

	* src/gnumeric.xml : Update for the new bonobo.

	* configure.in (AM_INIT_AUTOMAKE) : follow new protocol and bump
	  version immediately after release rather than before.
parent dd0ff0e9
2000-10-10 Jody Goldberg <jgoldberg@home.com>
* src/workbook-private.c (workbook_private_init) : Init the
updating_toolbar flag.
* src/workbook-format-toolbar.c (set_selection_halign) : Use the
updating toolbar flag so that the bonobo version (which does not
disable the callbacks) works correctly.
(change_selection_font) : Ditto.
(workbook_format_toolbutton_update) : Remove the hackish static and use a real flag.
* src/gnumeric.xml : Update for the new bonobo.
* configure.in (AM_INIT_AUTOMAKE) : follow new protocol and bump
version immediately after release rather than before.
2000-10-10 Jody Goldberg <jgoldberg@home.com>
* Release 0.57
......
2000-10-10 Jody Goldberg <jgoldberg@home.com>
* src/workbook-private.c (workbook_private_init) : Init the
updating_toolbar flag.
* src/workbook-format-toolbar.c (set_selection_halign) : Use the
updating toolbar flag so that the bonobo version (which does not
disable the callbacks) works correctly.
(change_selection_font) : Ditto.
(workbook_format_toolbutton_update) : Remove the hackish static and use a real flag.
* src/gnumeric.xml : Update for the new bonobo.
* configure.in (AM_INIT_AUTOMAKE) : follow new protocol and bump
version immediately after release rather than before.
2000-10-10 Jody Goldberg <jgoldberg@home.com>
* Release 0.57
......
2000-10-10 Jody Goldberg <jgoldberg@home.com>
* src/workbook-private.c (workbook_private_init) : Init the
updating_toolbar flag.
* src/workbook-format-toolbar.c (set_selection_halign) : Use the
updating toolbar flag so that the bonobo version (which does not
disable the callbacks) works correctly.
(change_selection_font) : Ditto.
(workbook_format_toolbutton_update) : Remove the hackish static and use a real flag.
* src/gnumeric.xml : Update for the new bonobo.
* configure.in (AM_INIT_AUTOMAKE) : follow new protocol and bump
version immediately after release rather than before.
2000-10-10 Jody Goldberg <jgoldberg@home.com>
* Release 0.57
......
2000-10-10 Jody Goldberg <jgoldberg@home.com>
* src/workbook-private.c (workbook_private_init) : Init the
updating_toolbar flag.
* src/workbook-format-toolbar.c (set_selection_halign) : Use the
updating toolbar flag so that the bonobo version (which does not
disable the callbacks) works correctly.
(change_selection_font) : Ditto.
(workbook_format_toolbutton_update) : Remove the hackish static and use a real flag.
* src/gnumeric.xml : Update for the new bonobo.
* configure.in (AM_INIT_AUTOMAKE) : follow new protocol and bump
version immediately after release rather than before.
2000-10-10 Jody Goldberg <jgoldberg@home.com>
* Release 0.57
......
2000-10-10 Jody Goldberg <jgoldberg@home.com>
* src/workbook-private.c (workbook_private_init) : Init the
updating_toolbar flag.
* src/workbook-format-toolbar.c (set_selection_halign) : Use the
updating toolbar flag so that the bonobo version (which does not
disable the callbacks) works correctly.
(change_selection_font) : Ditto.
(workbook_format_toolbutton_update) : Remove the hackish static and use a real flag.
* src/gnumeric.xml : Update for the new bonobo.
* configure.in (AM_INIT_AUTOMAKE) : follow new protocol and bump
version immediately after release rather than before.
2000-10-10 Jody Goldberg <jgoldberg@home.com>
* Release 0.57
......
2000-10-10 Jody Goldberg <jgoldberg@home.com>
* src/workbook-private.c (workbook_private_init) : Init the
updating_toolbar flag.
* src/workbook-format-toolbar.c (set_selection_halign) : Use the
updating toolbar flag so that the bonobo version (which does not
disable the callbacks) works correctly.
(change_selection_font) : Ditto.
(workbook_format_toolbutton_update) : Remove the hackish static and use a real flag.
* src/gnumeric.xml : Update for the new bonobo.
* configure.in (AM_INIT_AUTOMAKE) : follow new protocol and bump
version immediately after release rather than before.
2000-10-10 Jody Goldberg <jgoldberg@home.com>
* Release 0.57
......
2000-10-10 Jody Goldberg <jgoldberg@home.com>
* src/workbook-private.c (workbook_private_init) : Init the
updating_toolbar flag.
* src/workbook-format-toolbar.c (set_selection_halign) : Use the
updating toolbar flag so that the bonobo version (which does not
disable the callbacks) works correctly.
(change_selection_font) : Ditto.
(workbook_format_toolbutton_update) : Remove the hackish static and use a real flag.
* src/gnumeric.xml : Update for the new bonobo.
* configure.in (AM_INIT_AUTOMAKE) : follow new protocol and bump
version immediately after release rather than before.
2000-10-10 Jody Goldberg <jgoldberg@home.com>
* Release 0.57
......
AC_INIT(src/gnumeric.h)
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(gnumeric,0.57)
AM_INIT_AUTOMAKE(gnumeric,0.58)
AM_MAINTAINER_MODE
AM_ACLOCAL_INCLUDE(macros)
......
This diff is collapsed.
This diff is collapsed.
......@@ -44,6 +44,13 @@ set_selection_halign (Workbook *wb, StyleHAlignFlags align)
MStyle *mstyle;
Sheet *sheet;
/* If the user did not initiate this action ignore it.
* This happens whenever the ui updates and the current cell makes a
* change to the toolbar indicators.
*/
if (wb->priv->updating_toolbar)
return;
sheet = wb->current_sheet;
application_clipboard_unant ();
......@@ -89,6 +96,13 @@ change_selection_font (Workbook *wb,
MStyle *new_style, *current_style;
Sheet *sheet;
/* If the user did not initiate this action ignore it.
* This happens whenever the ui updates and the current cell makes a
* change to the toolbar indicators.
*/
if (wb->priv->updating_toolbar)
return;
application_clipboard_unant ();
sheet = wb->current_sheet;
......@@ -753,13 +767,12 @@ static void
workbook_format_toolbutton_update (Workbook const *wb, char const * const path,
gboolean state)
{
static gboolean hack = FALSE;
if (hack)
return;
hack = TRUE;
g_return_if_fail (!wb->priv->updating_toolbar);
wb->priv->updating_toolbar = TRUE;
bonobo_ui_component_set_prop (BONOBO_UI_COMPONENT (wb->priv->uih),
path, "state", state ? "1" : "0", NULL);
hack = FALSE;
wb->priv->updating_toolbar = FALSE;
}
static void
......
......@@ -45,6 +45,8 @@ workbook_private_init (GtkObject *object)
{
WorkbookPrivate *wbp;
wbp = WORKBOOK_PRIVATE (object);
wbp->updating_toolbar = FALSE;
}
static void
......
......@@ -106,6 +106,7 @@ struct _WorkbookPrivate {
GtkWidget *menu_item_redo;
GtkWidget *menu_item_paste_special;
#endif
gboolean updating_toolbar;
};
WorkbookPrivate *workbook_private_new (void);
......
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