callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup up the code that shows the toolbox when the last display is

Browse Source 
2006-12-18  Sven Neumann  <sven@gimp.org>

	* app/gui/gui.c: cleanup up the code that shows the toolbox when
	the last display is closed.
This commit is contained in:
Sven Neumann
2006-12-18 11:57:29 +00:00
committed by Sven Neumann
parent 2e3bd47b6f
commit f35d1ffe1c
2 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2006-12-18 Sven Neumann <sven@gimp.org>
* app/gui/gui.c: cleanup up the code that shows the toolbox when
the last display is closed.
2006-12-18 Sven Neumann <sven@gimp.org> 2006-12-18 Sven Neumann <sven@gimp.org>
* app/paint/gimpbrushcore.c (gimp_brush_core_interpolate): applied * app/paint/gimpbrushcore.c (gimp_brush_core_interpolate): applied

41
app/gui/gui.c
View File

@ -124,15 +124,13 @@ static void gui_menu_hide_tooltip (GimpUIManager *manager,
static void gui_display_changed (GimpContext *context, static void gui_display_changed (GimpContext *context,
GimpDisplay *display, GimpDisplay *display,
Gimp *gimp); Gimp *gimp);
static void gui_image_disconnect (GimpImage *image, static void gui_display_remove (GimpContainer *displays);
Gimp *gimp);
/* private variables */ /* private variables */
static Gimp *the_gui_gimp = NULL; static Gimp *the_gui_gimp = NULL;
static GQuark image_disconnect_handler_id = 0; static GimpUIManager *image_ui_manager = NULL;
static GimpUIManager *image_ui_manager = NULL;
/* public functions */ /* public functions */
@ -362,11 +360,6 @@ gui_restore_callback (Gimp *gimp,
gui_vtable_init (gimp); gui_vtable_init (gimp);
image_disconnect_handler_id =
gimp_container_add_handler (gimp->images, "disconnect",
G_CALLBACK (gui_image_disconnect),
gimp);
if (! gui_config->show_tooltips) if (! gui_config->show_tooltips)
gimp_help_disable_tooltips (); gimp_help_disable_tooltips ();
@ -387,6 +380,9 @@ gui_restore_callback (Gimp *gimp,
g_signal_connect (gimp_get_user_context (gimp), "display-changed", g_signal_connect (gimp_get_user_context (gimp), "display-changed",
G_CALLBACK (gui_display_changed), G_CALLBACK (gui_display_changed),
gimp); gimp);
g_signal_connect (gimp->displays, "remove",
G_CALLBACK (gui_display_remove),
NULL);
/* make sure the monitor resolution is valid */ /* make sure the monitor resolution is valid */
if (display_config->monitor_res_from_gdk || if (display_config->monitor_res_from_gdk ||
@ -523,17 +519,17 @@ gui_exit_after_callback (Gimp *gimp,
g_signal_handlers_disconnect_by_func (gimp->config, g_signal_handlers_disconnect_by_func (gimp->config,
gui_show_help_button_notify, gui_show_help_button_notify,
gimp); gimp);
g_signal_handlers_disconnect_by_func (gimp->config, g_signal_handlers_disconnect_by_func (gimp->config,
gui_show_tooltips_notify, gui_show_tooltips_notify,
gimp); gimp);
gimp_container_remove_handler (gimp->images, image_disconnect_handler_id);
image_disconnect_handler_id = 0;
g_object_unref (image_ui_manager); g_object_unref (image_ui_manager);
image_ui_manager = NULL; image_ui_manager = NULL;
g_signal_handlers_disconnect_by_func (gimp->displays,
G_CALLBACK (gui_display_remove),
NULL);
session_exit (gimp); session_exit (gimp);
menus_exit (gimp); menus_exit (gimp);
actions_exit (gimp); actions_exit (gimp);
@ -663,8 +659,8 @@ gui_display_changed (GimpContext *context,
{ {
gimp_context_set_display (context, display2); gimp_context_set_display (context, display2);
/* stop the emission of the original signal (the emission of /* stop the emission of the original signal
* the recursive signal is finished) * (the emission of the recursive signal is finished)
*/ */
g_signal_stop_emission_by_name (context, "display-changed"); g_signal_stop_emission_by_name (context, "display-changed");
return; return;
@ -679,13 +675,10 @@ gui_display_changed (GimpContext *context,
} }
static void static void
gui_image_disconnect (GimpImage *image, gui_display_remove (GimpContainer *displays)
Gimp *gimp)
{ {
/* check if this is the last image and if it had a display */ /* show the toolbox when the last image window is closed */
if (gimp_container_num_children (gimp->images) == 1 &&
image->instance_count > 0) if (gimp_container_is_empty (displays))
{ dialogs_show_toolbox ();
dialogs_show_toolbox ();
}
} }