[gimp] app: Call gimp_session_info_aux_set_list() generically



commit b4ed281f9a289f897c578cee15b7488588a8f7a7
Author: Martin Nordholts <martinn src gnome org>
Date:   Tue May 31 22:36:04 2011 +0200

    app: Call gimp_session_info_aux_set_list() generically
    
    gimp_session_info_aux_set_list() is not a per-GimpDialogRestoreFunc
    thing.

 app/dialogs/dialogs.c         |    4 ----
 app/widgets/gimpsessioninfo.c |   12 ++++--------
 app/widgets/gimpsessioninfo.h |    1 -
 3 files changed, 4 insertions(+), 13 deletions(-)
---
diff --git a/app/dialogs/dialogs.c b/app/dialogs/dialogs.c
index cb97b0e..1ba92c9 100644
--- a/app/dialogs/dialogs.c
+++ b/app/dialogs/dialogs.c
@@ -442,10 +442,6 @@ dialogs_restore_dialog (GimpDialogFactory *factory,
                                       GIMP_DIALOG_VISIBILITY_HIDDEN :
                                       GIMP_DIALOG_VISIBILITY_VISIBLE));
 
-  if (GIMP_IS_SESSION_MANAGED (dialog) && gimp_session_info_get_aux_info (info))
-    gimp_session_managed_set_aux_info (GIMP_SESSION_MANAGED (dialog),
-                                       gimp_session_info_get_aux_info (info));
-
   return dialog;
 }
 
diff --git a/app/widgets/gimpsessioninfo.c b/app/widgets/gimpsessioninfo.c
index b4aad8c..5d07d15 100644
--- a/app/widgets/gimpsessioninfo.c
+++ b/app/widgets/gimpsessioninfo.c
@@ -488,6 +488,10 @@ gimp_session_info_restore (GimpSessionInfo   *info,
                                                      info);
     }
 
+  if (GIMP_IS_SESSION_MANAGED (dialog) && info->p->aux_info)
+    gimp_session_managed_set_aux_info (GIMP_SESSION_MANAGED (dialog),
+                                       info->p->aux_info);
+
   if (GIMP_IS_DOCK_CONTAINER (dialog))
     {
       GList *iter;
@@ -801,14 +805,6 @@ gimp_session_info_get_info_with_widget (GimpSessionInfo *info,
   gimp_session_info_set_widget (info, old_widget);
 }
 
-GList *
-gimp_session_info_get_aux_info (GimpSessionInfo *info)
-{
-  g_return_val_if_fail (GIMP_IS_SESSION_INFO (info), NULL);
-
-  return info->p->aux_info;
-}
-
 void
 gimp_session_info_clear_info (GimpSessionInfo *info)
 {
diff --git a/app/widgets/gimpsessioninfo.h b/app/widgets/gimpsessioninfo.h
index 7a6fb63..5f0c88f 100644
--- a/app/widgets/gimpsessioninfo.h
+++ b/app/widgets/gimpsessioninfo.h
@@ -67,7 +67,6 @@ void                     gimp_session_info_read_geometry                 (GimpSe
 void                     gimp_session_info_get_info                      (GimpSessionInfo        *info);
 void                     gimp_session_info_get_info_with_widget          (GimpSessionInfo        *info,
                                                                           GtkWidget              *widget);
-GList                  * gimp_session_info_get_aux_info                  (GimpSessionInfo        *info);
 void                     gimp_session_info_clear_info                    (GimpSessionInfo        *info);
 gboolean                 gimp_session_info_is_singleton                  (GimpSessionInfo        *info);
 gboolean                 gimp_session_info_is_session_managed            (GimpSessionInfo        *info);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]