[gimp] app: Make gimp_session_info_dock_restore() take a GimpDockContainer
- From: Martin Nordholts <martinn src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: Make gimp_session_info_dock_restore() take a GimpDockContainer
- Date: Fri, 13 May 2011 19:28:38 +0000 (UTC)
commit cf4a4bf5a667b4b624695ab9fbaec75847646774
Author: Martin Nordholts <martinn src gnome org>
Date: Fri May 13 21:09:27 2011 +0200
app: Make gimp_session_info_dock_restore() take a GimpDockContainer
app/widgets/gimpsessioninfo-dock.c | 11 +++++------
app/widgets/gimpsessioninfo-dock.h | 2 +-
app/widgets/gimpsessioninfo.c | 2 +-
3 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/app/widgets/gimpsessioninfo-dock.c b/app/widgets/gimpsessioninfo-dock.c
index 05126f5..3c97f0b 100644
--- a/app/widgets/gimpsessioninfo-dock.c
+++ b/app/widgets/gimpsessioninfo-dock.c
@@ -194,13 +194,12 @@ GimpDock *
gimp_session_info_dock_restore (GimpSessionInfoDock *dock_info,
GimpDialogFactory *factory,
GdkScreen *screen,
- GimpDockWindow *dock_window)
+ GimpDockContainer *dock_container)
{
- GimpDockContainer *dock_container = GIMP_DOCK_CONTAINER (dock_window);
- gint n_books = 0;
- GtkWidget *dock;
- GList *iter;
- GimpUIManager *ui_manager;
+ gint n_books = 0;
+ GtkWidget *dock;
+ GList *iter;
+ GimpUIManager *ui_manager;
g_return_val_if_fail (GIMP_IS_DIALOG_FACTORY (factory), NULL);
g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
diff --git a/app/widgets/gimpsessioninfo-dock.h b/app/widgets/gimpsessioninfo-dock.h
index 1e35140..3738c6f 100644
--- a/app/widgets/gimpsessioninfo-dock.h
+++ b/app/widgets/gimpsessioninfo-dock.h
@@ -50,7 +50,7 @@ GimpSessionInfoDock * gimp_session_info_dock_from_widget (GimpDock *
GimpDock * gimp_session_info_dock_restore (GimpSessionInfoDock *dock_info,
GimpDialogFactory *factory,
GdkScreen *screen,
- GimpDockWindow *dock_window);
+ GimpDockContainer *dock_container);
#endif /* __GIMP_SESSION_INFO_DOCK_H__ */
diff --git a/app/widgets/gimpsessioninfo.c b/app/widgets/gimpsessioninfo.c
index 2350bda..9f0d479 100644
--- a/app/widgets/gimpsessioninfo.c
+++ b/app/widgets/gimpsessioninfo.c
@@ -514,7 +514,7 @@ gimp_session_info_restore (GimpSessionInfo *info,
gimp_session_info_dock_restore ((GimpSessionInfoDock *)iter->data,
factory,
screen,
- GIMP_DOCK_WINDOW (dialog));
+ GIMP_DOCK_CONTAINER (dialog));
g_object_unref (info);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]