summaryrefslogtreecommitdiff
path: root/gtk/gtkicontheme.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2011-04-12 12:33:04 -0400
committerMatthias Clasen <mclasen@redhat.com>2011-04-12 12:33:04 -0400
commit800fff748b49d1663e01fcf684f0e02e8f43eb7a (patch)
treea4a76dc0a374c718185b6491630f272d25b9e498 /gtk/gtkicontheme.c
parentb3ca94a44ed967fd5888f63a70a78130e0b07989 (diff)
downloadgtk+-800fff748b49d1663e01fcf684f0e02e8f43eb7a.tar.gz
GtkIconThemePrivate: Improve struct packing
Diffstat (limited to 'gtk/gtkicontheme.c')
-rw-r--r--gtk/gtkicontheme.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index 7a0a55771b..db65d5171e 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -72,24 +72,24 @@ typedef enum
struct _GtkIconThemePrivate
{
+ gchar *current_theme;
+ gchar *fallback_theme;
+ gchar **search_path;
+ gint search_path_len;
+
guint custom_theme : 1;
guint is_screen_singleton : 1;
guint pixbuf_supports_svg : 1;
guint themes_valid : 1;
guint check_reload : 1;
guint loading_themes : 1;
-
- char *current_theme;
- char *fallback_theme;
- char **search_path;
- int search_path_len;
/* A list of all the themes needed to look up icons.
* In search order, without duplicates
*/
GList *themes;
GHashTable *unthemed_icons;
-
+
/* Note: The keys of this hashtable are owned by the
* themedir and unthemed hashtables.
*/
@@ -98,9 +98,9 @@ struct _GtkIconThemePrivate
/* GdkScreen for the icon theme (may be NULL)
*/
GdkScreen *screen;
-
+
/* time when we last stat:ed for theme changes */
- long last_stat_time;
+ glong last_stat_time;
GList *dir_mtimes;
gulong reset_styles_idle;
@@ -118,7 +118,7 @@ struct _GtkIconInfo
GdkPixbuf *cache_pixbuf;
GtkIconData *data;
-
+
/* Information about the directory where
* the source was found
*/
@@ -131,6 +131,9 @@ struct _GtkIconInfo
gint desired_size;
guint raw_coordinates : 1;
guint forced_size : 1;
+ guint emblems_applied : 1;
+
+ guint ref_count;
/* Cached information if we go ahead and try to load
* the icon.
@@ -138,9 +141,6 @@ struct _GtkIconInfo
GdkPixbuf *pixbuf;
GError *load_error;
gdouble scale;
- gboolean emblems_applied;
-
- guint ref_count;
};
typedef struct