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

app: Handle dock windows without docks in action_data_get_foo()

This commit is contained in:
Martin Nordholts 2009-10-03 16:23:12 +02:00
parent 750c11f001
commit 2d1d2aae17
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/actions/actions.c
View File

@ -271,7 +271,10 @@ action_data_get_gimp (gpointer data)
else if (GIMP_IS_DOCK (data))
context = gimp_dock_get_context (((GimpDock *) data));
else if (GIMP_IS_DOCK_WINDOW (data))
context = gimp_dock_get_context (gimp_dock_window_get_dock (((GimpDockWindow *) data)));
{
GimpDock *dock = gimp_dock_window_get_dock (((GimpDockWindow *) data));
context = dock ? gimp_dock_get_context (dock) : NULL;
}
else if (GIMP_IS_CONTAINER_VIEW (data))
context = gimp_container_view_get_context ((GimpContainerView *) data);
else if (GIMP_IS_CONTAINER_EDITOR (data))
@ -302,7 +305,10 @@ action_data_get_context (gpointer data)
else if (GIMP_IS_DOCK (data))
return gimp_dock_get_context ((GimpDock *) data);
else if (GIMP_IS_DOCK_WINDOW (data))
return gimp_dock_get_context (gimp_dock_window_get_dock (((GimpDockWindow *) data)));
{
GimpDock *dock = gimp_dock_window_get_dock (((GimpDockWindow *) data));
return dock ? gimp_dock_get_context (dock) : NULL;
}
else if (GIMP_IS_CONTAINER_VIEW (data))
return gimp_container_view_get_context ((GimpContainerView *) data);
else if (GIMP_IS_CONTAINER_EDITOR (data))
@ -332,7 +338,10 @@ action_data_get_image (gpointer data)
else if (GIMP_IS_DOCK (data))
context = gimp_dock_get_context ((GimpDock *) data);
else if (GIMP_IS_DOCK_WINDOW (data))
context = gimp_dock_get_context (gimp_dock_window_get_dock (((GimpDockWindow *) data)));
{
GimpDock *dock = gimp_dock_window_get_dock (((GimpDockWindow *) data));
context = dock ? gimp_dock_get_context (dock) : NULL;
}
else if (GIMP_IS_ITEM_TREE_VIEW (data))
return gimp_item_tree_view_get_image ((GimpItemTreeView *) data);
else if (GIMP_IS_IMAGE_EDITOR (data))
@ -363,7 +372,10 @@ action_data_get_display (gpointer data)
else if (GIMP_IS_DOCK (data))
context = gimp_dock_get_context ((GimpDock *) data);
else if (GIMP_IS_DOCK_WINDOW (data))
context = gimp_dock_get_context (gimp_dock_window_get_dock (((GimpDockWindow *) data)));
{
GimpDock *dock = gimp_dock_window_get_dock (((GimpDockWindow *) data));
context = dock ? gimp_dock_get_context (dock) : NULL;
}
else if (GIMP_IS_NAVIGATION_EDITOR (data))
context = ((GimpNavigationEditor *) data)->context;