From 8a722d04938583dc3620de05fd52f0baecce9fbb Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Sun, 10 May 2009 14:21:20 +0200 Subject: Consolidate data types --- src/items.h | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'src/items.h') diff --git a/src/items.h b/src/items.h index b7be433..737d4ca 100644 --- a/src/items.h +++ b/src/items.h @@ -35,12 +35,12 @@ typedef enum { typedef struct { TGalleryType type; - char *ID; - char *title; - char *desc; - char *footnote; + gchar *ID; + gchar *title; + gchar *desc; + gchar *footnote; GPtrArray *items; - char *base_dir; + gchar *base_dir; void *parent_index; /* pointer to the parent TAlbum structure */ int parent_item_index; /* item index in the parent album */ int quality; @@ -48,33 +48,33 @@ typedef struct { unsigned long landscape_height; unsigned long portrait_width; unsigned long portrait_height; - char *border_style; - char *meta_author; - char *meta_description; - char *meta_keywords; + gchar *border_style; + gchar *meta_author; + gchar *meta_description; + gchar *meta_keywords; gboolean nofullsize; gboolean fullsize; - char **extra_files; + gchar **extra_files; } TAlbum; typedef struct { - char *path; - char *title; - char *title_description; - char *thumbnail; - char *preview; + gchar *path; + gchar *title; + gchar *title_description; + gchar *thumbnail; + gchar *preview; int quality; unsigned long width; unsigned long height; gboolean force_nofullsize; gboolean force_fullsize; - char *border_style; + gchar *border_style; TIndexItemType type; gboolean hidden; /* generated item info */ - char *gen_img_src; - char *gen_thumb; + gchar *gen_img_src; + gchar *gen_thumb; gboolean gen_portrait; gboolean gen_done; } TIndexItem; @@ -84,7 +84,7 @@ typedef struct { /* * parse_album_xml: XML parser for gallery index.xml files */ -gboolean parse_album_xml (const char *filename, TAlbum *index); +gboolean parse_album_xml (const gchar *filename, TAlbum *index); /* * free_album_data: free allocated album data @@ -94,11 +94,11 @@ void free_album_data (TAlbum *index); /* * get_album_objects_count: retrieve number of items in specified album */ -int get_album_objects_count (const char *filename); +int get_album_objects_count (const gchar *filename); /* * get_album_titles: retrieve title, description and first thumbnail from specified album */ -void get_album_titles (const char *filename, char **title, char **description, char **thumbnail); +void get_album_titles (const gchar *filename, gchar **title, gchar **description, gchar **thumbnail); #endif /* __ITEMS_H__ */ -- cgit v1.2.3