app: Make gimp_session_info_dock_restore() take a GimpDockContainer

This commit is contained in:
Martin Nordholts
2011-05-13 21:09:27 +02:00
parent 7edf717bae
commit cf4a4bf5a6
3 changed files with 7 additions and 8 deletions

View File

@ -194,13 +194,12 @@ GimpDock *
gimp_session_info_dock_restore (GimpSessionInfoDock *dock_info, gimp_session_info_dock_restore (GimpSessionInfoDock *dock_info,
GimpDialogFactory *factory, GimpDialogFactory *factory,
GdkScreen *screen, GdkScreen *screen,
GimpDockWindow *dock_window) GimpDockContainer *dock_container)
{ {
GimpDockContainer *dock_container = GIMP_DOCK_CONTAINER (dock_window); gint n_books = 0;
gint n_books = 0; GtkWidget *dock;
GtkWidget *dock; GList *iter;
GList *iter; GimpUIManager *ui_manager;
GimpUIManager *ui_manager;
g_return_val_if_fail (GIMP_IS_DIALOG_FACTORY (factory), NULL); g_return_val_if_fail (GIMP_IS_DIALOG_FACTORY (factory), NULL);
g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL); g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);

View File

@ -50,7 +50,7 @@ GimpSessionInfoDock * gimp_session_info_dock_from_widget (GimpDock *
GimpDock * gimp_session_info_dock_restore (GimpSessionInfoDock *dock_info, GimpDock * gimp_session_info_dock_restore (GimpSessionInfoDock *dock_info,
GimpDialogFactory *factory, GimpDialogFactory *factory,
GdkScreen *screen, GdkScreen *screen,
GimpDockWindow *dock_window); GimpDockContainer *dock_container);
#endif /* __GIMP_SESSION_INFO_DOCK_H__ */ #endif /* __GIMP_SESSION_INFO_DOCK_H__ */

View File

@ -514,7 +514,7 @@ gimp_session_info_restore (GimpSessionInfo *info,
gimp_session_info_dock_restore ((GimpSessionInfoDock *)iter->data, gimp_session_info_dock_restore ((GimpSessionInfoDock *)iter->data,
factory, factory,
screen, screen,
GIMP_DOCK_WINDOW (dialog)); GIMP_DOCK_CONTAINER (dialog));
g_object_unref (info); g_object_unref (info);
} }