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

app/widgets/gimpsessioninfo.[ch] app/widgets/gimpsessioninfoaux.[ch] 

2007-05-24  Michael Natterer  <mitch@gimp.org>

	* app/widgets/gimpsessioninfo.[ch]
	* app/widgets/gimpsessioninfoaux.[ch]
	* app/widgets/gimpsessioninfobook.[ch]
	* app/widgets/gimpsessioninfodock.c
	* app/widgets/gimpsessioninfodockable.[ch]: cleanup.


svn path=/trunk/; revision=22606
This commit is contained in:
Michael Natterer 2007-05-24 20:42:56 +00:00 committed by Michael Natterer
parent f98b0de0d6
commit 736b651d24
10 changed files with 86 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2007-05-24 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpsessioninfo.[ch]
* app/widgets/gimpsessioninfoaux.[ch]
* app/widgets/gimpsessioninfobook.[ch]
* app/widgets/gimpsessioninfodock.c
* app/widgets/gimpsessioninfodockable.[ch]: cleanup.
2007-05-24 Sven Neumann <sven@gimp.org>
* plug-ins/pygimp/pygimp-display.c: added an ID attribute and a

2
app/widgets/gimpsessioninfo.c
View File

@ -322,7 +322,7 @@ gimp_session_info_restore (GimpSessionInfo *info,
TRUE);
if (dialog && info->aux_info)
gimp_session_info_set_aux_info (dialog, info->aux_info);
gimp_session_info_aux_set_list (dialog, info->aux_info);
}
else
{

42
app/widgets/gimpsessioninfo.h
View File

@ -25,41 +25,43 @@
struct _GimpSessionInfo
{
gint x;
gint y;
gint width;
gint height;
gboolean open; /* only valid while restoring and saving the session */
gint screen; /* only valid while restoring and saving the session */
gint x;
gint y;
gint width;
gint height;
/* only valid while restoring and saving the session */
gboolean open;
gint screen;
/* dialog specific list of GimpSessionInfoAux */
GList *aux_info;
GList *aux_info;
GtkWidget *widget;
GtkWidget *widget;
/* only one of these is valid */
GimpDialogFactoryEntry *toplevel_entry;
GimpDialogFactoryEntry *dockable_entry;
/* list of GimpSessionInfoBook */
GList *books;
GList *books;
};
GimpSessionInfo * gimp_session_info_new (void);
void gimp_session_info_free (GimpSessionInfo *info);
GimpSessionInfo * gimp_session_info_new (void);
void gimp_session_info_free (GimpSessionInfo *info);
void gimp_session_info_serialize (GimpConfigWriter *writer,
GimpSessionInfo *info,
const gchar *factory_name);
GTokenType gimp_session_info_deserialize (GScanner *scanner,
gint scope);
void gimp_session_info_serialize (GimpConfigWriter *writer,
GimpSessionInfo *info,
const gchar *factory_name);
GTokenType gimp_session_info_deserialize (GScanner *scanner,
gint scope);
void gimp_session_info_restore (GimpSessionInfo *info,
GimpDialogFactory *factory);
void gimp_session_info_restore (GimpSessionInfo *info,
GimpDialogFactory *factory);
void gimp_session_info_set_geometry (GimpSessionInfo *info);
void gimp_session_info_get_geometry (GimpSessionInfo *info);
void gimp_session_info_set_geometry (GimpSessionInfo *info);
void gimp_session_info_get_geometry (GimpSessionInfo *info);
#endif /* __GIMP_SESSION_INFO_H__ */

12
app/widgets/gimpsessioninfoaux.c
View File

@ -210,7 +210,7 @@ gimp_session_info_aux_serialize (GimpConfigWriter *writer,
g_return_if_fail (writer != NULL);
g_return_if_fail (GTK_IS_WIDGET (widget));
aux_info = gimp_session_info_get_aux_info (widget);
aux_info = gimp_session_info_aux_get_list (widget);
if (aux_info)
{
@ -292,19 +292,19 @@ gimp_session_info_aux_deserialize (GScanner *scanner,
}
void
gimp_session_info_set_aux_info (GtkWidget *dialog,
GList *aux_info)
gimp_session_info_aux_set_list (GtkWidget *dialog,
GList *aux_list)
{
/* FIXME: make the aux-info stuff generic */
if (GIMP_IS_DOCK (dialog))
gimp_dock_set_aux_info (GIMP_DOCK (dialog), aux_info);
gimp_dock_set_aux_info (GIMP_DOCK (dialog), aux_list);
else if (GIMP_IS_DOCKABLE (dialog))
gimp_dockable_set_aux_info (GIMP_DOCKABLE (dialog), aux_info);
gimp_dockable_set_aux_info (GIMP_DOCKABLE (dialog), aux_list);
}
GList *
gimp_session_info_get_aux_info (GtkWidget *dialog)
gimp_session_info_aux_get_list (GtkWidget *dialog)
{
/* FIXME: make the aux-info stuff generic */

30
app/widgets/gimpsessioninfoaux.h
View File

@ -31,24 +31,24 @@ struct _GimpSessionInfoAux
GimpSessionInfoAux *
gimp_session_info_aux_new (const gchar *name,
const gchar *value);
void gimp_session_info_aux_free (GimpSessionInfoAux *aux);
gimp_session_info_aux_new (const gchar *name,
const gchar *value);
void gimp_session_info_aux_free (GimpSessionInfoAux *aux);
GList * gimp_session_info_aux_new_from_props (GObject *object,
...) G_GNUC_NULL_TERMINATED;
void gimp_session_info_aux_set_props (GObject *object,
GList *aux,
...) G_GNUC_NULL_TERMINATED;
GList * gimp_session_info_aux_new_from_props (GObject *object,
...) G_GNUC_NULL_TERMINATED;
void gimp_session_info_aux_set_props (GObject *object,
GList *aux,
...) G_GNUC_NULL_TERMINATED;
void gimp_session_info_aux_serialize (GimpConfigWriter *writer,
GtkWidget *widget);
GTokenType gimp_session_info_aux_deserialize (GScanner *scanner,
GList **aux_list);
void gimp_session_info_aux_serialize (GimpConfigWriter *writer,
GtkWidget *widget);
GTokenType gimp_session_info_aux_deserialize (GScanner *scanner,
GList **aux_list);
void gimp_session_info_set_aux_info (GtkWidget *dialog,
GList *aux_info);
GList * gimp_session_info_get_aux_info (GtkWidget *dialog);
void gimp_session_info_aux_set_list (GtkWidget *dialog,
GList *aux_info);
GList * gimp_session_info_aux_get_list (GtkWidget *dialog);
#endif /* __GIMP_SESSION_INFO_AUX_H__ */

12
app/widgets/gimpsessioninfobook.c
View File

@ -52,18 +52,18 @@ gimp_session_info_book_new (void)
}
void
gimp_session_info_book_free (GimpSessionInfoBook *book)
gimp_session_info_book_free (GimpSessionInfoBook *info)
{
g_return_if_fail (book != NULL);
g_return_if_fail (info != NULL);
if (book->dockables)
if (info->dockables)
{
g_list_foreach (book->dockables, (GFunc) gimp_session_info_dockable_free,
g_list_foreach (info->dockables, (GFunc) gimp_session_info_dockable_free,
NULL);
g_list_free (book->dockables);
g_list_free (info->dockables);
}
g_slice_free (GimpSessionInfoBook, book);
g_slice_free (GimpSessionInfoBook, info);
}
void

18
app/widgets/gimpsessioninfobook.h
View File

@ -36,17 +36,17 @@ struct _GimpSessionInfoBook
GimpSessionInfoBook *
gimp_session_info_book_new (void);
void gimp_session_info_book_free (GimpSessionInfoBook *book);
gimp_session_info_book_new (void);
void gimp_session_info_book_free (GimpSessionInfoBook *info);
void gimp_session_info_book_serialize (GimpConfigWriter *writer,
GimpDockbook *dockbook);
GTokenType gimp_session_info_book_deserialize (GScanner *scanner,
gint scope,
GimpSessionInfo *info);
void gimp_session_info_book_serialize (GimpConfigWriter *writer,
GimpDockbook *dockbook);
GTokenType gimp_session_info_book_deserialize (GScanner *scanner,
gint scope,
GimpSessionInfo *info);
void gimp_session_info_book_restore (GimpSessionInfoBook *info,
GimpDock *dock);
void gimp_session_info_book_restore (GimpSessionInfoBook *info,
GimpDock *dock);
#endif /* __GIMP_SESSION_INFO_BOOK_H__ */

2
app/widgets/gimpsessioninfodock.c
View File

@ -160,7 +160,7 @@ gimp_session_info_dock_restore (GimpSessionInfo *info,
dock = GIMP_DOCK (gimp_dialog_factory_dock_new (factory, screen));
if (dock && info->aux_info)
gimp_session_info_set_aux_info (GTK_WIDGET (dock), info->aux_info);
gimp_session_info_aux_set_list (GTK_WIDGET (dock), info->aux_info);
for (books = info->books; books; books = g_list_next (books))
gimp_session_info_book_restore (books->data, dock);

19
app/widgets/gimpsessioninfodockable.c
View File

@ -54,21 +54,20 @@ gimp_session_info_dockable_new (void)
}
void
gimp_session_info_dockable_free (GimpSessionInfoDockable *dockable)
gimp_session_info_dockable_free (GimpSessionInfoDockable *info)
{
g_return_if_fail (dockable != NULL);
g_return_if_fail (info != NULL);
if (dockable->identifier)
g_free (dockable->identifier);
if (info->identifier)
g_free (info->identifier);
if (dockable->aux_info)
if (info->aux_info)
{
g_list_foreach (dockable->aux_info, (GFunc) gimp_session_info_aux_free,
NULL);
g_list_free (dockable->aux_info);
g_list_foreach (info->aux_info, (GFunc) gimp_session_info_aux_free, NULL);
g_list_free (info->aux_info);
}
g_slice_free (GimpSessionInfoDockable, dockable);
g_slice_free (GimpSessionInfoDockable, info);
}
void
@ -257,7 +256,7 @@ gimp_session_info_dockable_restore (GimpSessionInfoDockable *info,
gimp_dockable_set_tab_style (GIMP_DOCKABLE (dockable), info->tab_style);
if (info->aux_info)
gimp_session_info_set_aux_info (dockable, info->aux_info);
gimp_session_info_aux_set_list (dockable, info->aux_info);
}
return GIMP_DOCKABLE (dockable);

18
app/widgets/gimpsessioninfodockable.h
View File

@ -35,17 +35,17 @@ struct _GimpSessionInfoDockable
GimpSessionInfoDockable *
gimp_session_info_dockable_new (void);
void gimp_session_info_dockable_free (GimpSessionInfoDockable *dockable);
gimp_session_info_dockable_new (void);
void gimp_session_info_dockable_free (GimpSessionInfoDockable *info);
void gimp_session_info_dockable_serialize (GimpConfigWriter *writer,
GimpDockable *dockable);
GTokenType gimp_session_info_dockable_deserialize (GScanner *scanner,
gint scope,
GimpSessionInfoBook *book);
void gimp_session_info_dockable_serialize (GimpConfigWriter *writer,
GimpDockable *dockable);
GTokenType gimp_session_info_dockable_deserialize (GScanner *scanner,
gint scope,
GimpSessionInfoBook *book);
GimpDockable * gimp_session_info_dockable_restore (GimpSessionInfoDockable *info,
GimpDock *dock);
GimpDockable * gimp_session_info_dockable_restore (GimpSessionInfoDockable *info,
GimpDock *dock);
#endif /* __GIMP_SESSION_INFO_DOCKABLE_H__ */