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

app/widgets/gimpcontainermenu.c ref/unref menu->context and view->context 

2002-10-09  Michael Natterer  <mitch@gimp.org>

	* app/widgets/gimpcontainermenu.c
	* app/widgets/gimpcontainerview.c: ref/unref menu->context and
	view->context in gimp_container_[menu|view]_real_set_context() so
	it can't be finalized under our feet.
This commit is contained in:
Michael Natterer 2002-10-09 11:49:01 +00:00 committed by Michael Natterer
parent c9ba88811f
commit 7b99dbac51
3 changed files with 71 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2002-10-09 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpcontainermenu.c
* app/widgets/gimpcontainerview.c: ref/unref menu->context and
view->context in gimp_container_[menu|view]_real_set_context() so
it can't be finalized under our feet.
2002-10-08 Michael Natterer <mitch@gimp.org>
* libgimpwidgets/gimpwidgets.[ch]: added utility function

42
app/widgets/gimpcontainermenu.c
View File

@ -307,32 +307,42 @@ gimp_container_menu_set_context (GimpContainerMenu *menu,
if (context == menu->context)
return;
if (menu->context && menu->container)
if (menu->context)
{
g_signal_handlers_disconnect_by_func (G_OBJECT (menu->context),
gimp_container_menu_context_changed,
menu);
if (menu->container)
{
g_signal_handlers_disconnect_by_func (G_OBJECT (menu->context),
gimp_container_menu_context_changed,
menu);
}
g_object_unref (G_OBJECT (menu->context));
}
menu->context = context;
if (menu->context && menu->container)
if (menu->context)
{
GimpObject *object;
const gchar *signal_name;
g_object_ref (G_OBJECT (menu->context));
signal_name =
gimp_context_type_to_signal_name (menu->container->children_type);
if (menu->container)
{
GimpObject *object;
const gchar *signal_name;
g_signal_connect (G_OBJECT (menu->context), signal_name,
G_CALLBACK (gimp_container_menu_context_changed),
menu);
signal_name =
gimp_context_type_to_signal_name (menu->container->children_type);
object = gimp_context_get_by_type (menu->context,
menu->container->children_type);
g_signal_connect (G_OBJECT (menu->context), signal_name,
G_CALLBACK (gimp_container_menu_context_changed),
menu);
gimp_container_menu_select_item (menu,
object ? GIMP_VIEWABLE (object) : NULL);
object = gimp_context_get_by_type (menu->context,
menu->container->children_type);
gimp_container_menu_select_item (menu,
object ? GIMP_VIEWABLE (object) : NULL);
}
}
}

66
app/widgets/gimpcontainerview.c
View File

@ -337,46 +337,56 @@ gimp_container_view_set_context (GimpContainerView *view,
if (context == view->context)
return;
if (view->context && view->container)
if (view->context)
{
g_signal_handlers_disconnect_by_func (G_OBJECT (view->context),
gimp_container_view_context_changed,
view);
if (view->container)
{
g_signal_handlers_disconnect_by_func (G_OBJECT (view->context),
gimp_container_view_context_changed,
view);
if (view->dnd_widget)
{
gtk_drag_dest_unset (GTK_WIDGET (view->dnd_widget));
gimp_dnd_viewable_dest_remove (GTK_WIDGET (view->dnd_widget),
view->container->children_type);
}
if (view->dnd_widget)
{
gtk_drag_dest_unset (GTK_WIDGET (view->dnd_widget));
gimp_dnd_viewable_dest_remove (GTK_WIDGET (view->dnd_widget),
view->container->children_type);
}
}
g_object_unref (G_OBJECT (view->context));
}
view->context = context;
if (view->context && view->container)
if (view->context)
{
GimpObject *object;
const gchar *signal_name;
g_object_ref (G_OBJECT (view->context));
signal_name =
gimp_context_type_to_signal_name (view->container->children_type);
if (view->container)
{
GimpObject *object;
const gchar *signal_name;
g_signal_connect_object (G_OBJECT (view->context), signal_name,
G_CALLBACK (gimp_container_view_context_changed),
G_OBJECT (view),
0);
signal_name =
gimp_context_type_to_signal_name (view->container->children_type);
object = gimp_context_get_by_type (view->context,
view->container->children_type);
g_signal_connect_object (G_OBJECT (view->context), signal_name,
G_CALLBACK (gimp_container_view_context_changed),
G_OBJECT (view),
0);
gimp_container_view_select_item (view,
object ? GIMP_VIEWABLE (object) : NULL);
object = gimp_context_get_by_type (view->context,
view->container->children_type);
if (view->dnd_widget)
gimp_dnd_viewable_dest_add (GTK_WIDGET (view->dnd_widget),
view->container->children_type,
gimp_container_view_viewable_dropped,
view);
gimp_container_view_select_item (view,
object ? GIMP_VIEWABLE (object) : NULL);
if (view->dnd_widget)
gimp_dnd_viewable_dest_add (GTK_WIDGET (view->dnd_widget),
view->container->children_type,
gimp_container_view_viewable_dropped,
view);
}
}
}