dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

call actions_init() (gui_exit_after_callback): call actions_exit(). 

2004-04-27  Michael Natterer  <mitch@gimp.org>

	* app/gui/gui.c (gui_restore_callback): call actions_init()
	(gui_exit_after_callback): call actions_exit().

	* app/gui/menus.c (menus_init)
	(menu_exit): don't call them here.
This commit is contained in:
Michael Natterer 2004-04-27 10:23:35 +00:00 committed by Michael Natterer
parent bb0f359ac4
commit 11309f8e5e
4 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2004-04-27 Michael Natterer <mitch@gimp.org>
* app/gui/gui.c (gui_restore_callback): call actions_init()
(gui_exit_after_callback): call actions_exit().
* app/gui/menus.c (menus_init)
(menu_exit): don't call them here.
2004-04-26 Michael Natterer <mitch@gimp.org>
* app/widgets/widgets-types.h: added GimpUIManagerSetupFunc typedef.

3
app/gui/gui.c
View File

@ -54,6 +54,7 @@
#include "widgets/gimpsessioninfo.h"
#include "widgets/gimpwidgets-utils.h"
#include "actions/actions.h"
#include "actions/dialogs-commands.h"
#include "color-history.h"
@ -314,6 +315,7 @@ gui_restore_callback (Gimp *gimp,
NULL);
}
actions_init (gimp);
menus_init (gimp);
render_init (gimp);
@ -440,6 +442,7 @@ gui_exit_after_callback (Gimp *gimp,
image_item_factory = NULL;
menus_exit (gimp);
actions_exit (gimp);
render_exit (gimp);
dialogs_exit (gimp);

10
app/gui/menus.c
View File

@ -102,8 +102,6 @@ menus_init (Gimp *gimp)
menus_initialized = TRUE;
actions_init (gimp);
/* We need to make sure the property is installed before using it */
g_type_class_ref (GTK_TYPE_MENU);
@ -426,8 +424,6 @@ menus_exit (Gimp *gimp)
g_signal_handlers_disconnect_by_func (gimp->config,
menu_can_change_accels,
NULL);
actions_exit (gimp);
}
void
@ -466,9 +462,9 @@ void
menus_open_recent_add (GimpUIManager *manager,
const gchar *ui_path)
{
gint n_entries;
gint merge_id;
gint i;
gint n_entries;
guint merge_id;
gint i;
g_return_if_fail (GIMP_IS_UI_MANAGER (manager));
g_return_if_fail (ui_path != NULL);

10
app/menus/menus.c
View File

@ -102,8 +102,6 @@ menus_init (Gimp *gimp)
menus_initialized = TRUE;
actions_init (gimp);
/* We need to make sure the property is installed before using it */
g_type_class_ref (GTK_TYPE_MENU);
@ -426,8 +424,6 @@ menus_exit (Gimp *gimp)
g_signal_handlers_disconnect_by_func (gimp->config,
menu_can_change_accels,
NULL);
actions_exit (gimp);
}
void
@ -466,9 +462,9 @@ void
menus_open_recent_add (GimpUIManager *manager,
const gchar *ui_path)
{
gint n_entries;
gint merge_id;
gint i;
gint n_entries;
guint merge_id;
gint i;
g_return_if_fail (GIMP_IS_UI_MANAGER (manager));
g_return_if_fail (ui_path != NULL);