From 624bb78c4c8da3a48aad560cc2d490bec9ba9eeb Mon Sep 17 00:00:00 2001 From: Martin Nordholts Date: Mon, 26 Oct 2009 07:52:07 +0100 Subject: [PATCH] app: Move down gimp_dock_window_from_dock() in the file Move down gimp_dock_window_from_dock() in the file as it is a special kind of function. --- app/widgets/gimpdockwindow.c | 49 ++++++++++++++++++------------------ app/widgets/gimpdockwindow.h | 3 ++- 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/app/widgets/gimpdockwindow.c b/app/widgets/gimpdockwindow.c index 35cdbc1420..2bbf2f6440 100644 --- a/app/widgets/gimpdockwindow.c +++ b/app/widgets/gimpdockwindow.c @@ -601,30 +601,6 @@ gimp_dock_window_get_ui_manager (GimpDockWindow *dock_window) return dock_window->p->ui_manager; } -/** - * gimp_dock_window_from_dock: - * @dock: - * - * For convenience. - * - * Returns: If the toplevel widget for the dock is a GimpDockWindow, - * return that. Otherwise return %NULL. - **/ -GimpDockWindow * -gimp_dock_window_from_dock (GimpDock *dock) -{ - GtkWidget *toplevel = NULL; - - g_return_val_if_fail (GIMP_IS_DOCK (dock), NULL); - - toplevel = gtk_widget_get_toplevel (GTK_WIDGET (dock)); - - if (GIMP_IS_DOCK_WINDOW (toplevel)) - return GIMP_DOCK_WINDOW (toplevel); - else - return NULL; -} - /** * gimp_dock_window_get_docks: * @dock_window: @@ -656,3 +632,28 @@ gimp_dock_window_get_dock (GimpDockWindow *dock_window) return g_list_length (docks) > 0 ? GIMP_DOCK (docks->data) : NULL; } + + +/** + * gimp_dock_window_from_dock: + * @dock: + * + * For convenience. + * + * Returns: If the toplevel widget for the dock is a GimpDockWindow, + * return that. Otherwise return %NULL. + **/ +GimpDockWindow * +gimp_dock_window_from_dock (GimpDock *dock) +{ + GtkWidget *toplevel = NULL; + + g_return_val_if_fail (GIMP_IS_DOCK (dock), NULL); + + toplevel = gtk_widget_get_toplevel (GTK_WIDGET (dock)); + + if (GIMP_IS_DOCK_WINDOW (toplevel)) + return GIMP_DOCK_WINDOW (toplevel); + else + return NULL; +} diff --git a/app/widgets/gimpdockwindow.h b/app/widgets/gimpdockwindow.h index f82368b867..707403ae0c 100644 --- a/app/widgets/gimpdockwindow.h +++ b/app/widgets/gimpdockwindow.h @@ -63,9 +63,10 @@ void gimp_dock_window_add_dock (GimpDockWindow *dock_wind void gimp_dock_window_remove_dock (GimpDockWindow *dock_window, GimpDock *dock); GimpUIManager * gimp_dock_window_get_ui_manager (GimpDockWindow *dock_window); -GimpDockWindow * gimp_dock_window_from_dock (GimpDock *dock); GList * gimp_dock_window_get_docks (GimpDockWindow *dock_window); GimpDock * gimp_dock_window_get_dock (GimpDockWindow *dock_window); +GimpDockWindow * gimp_dock_window_from_dock (GimpDock *dock); + #endif /* __GIMP_DOCK_WINDOW_H__ */