[metacity] theme: destroy float_constants and color_constants hash tables



commit a40139f882e501bc76f66e5c056862233aadf346
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sat Jan 23 17:35:53 2016 +0200

    theme: destroy float_constants and color_constants hash tables

 src/ui/theme-private.h |    2 ++
 src/ui/theme.c         |   22 ++++++++++------------
 2 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/src/ui/theme-private.h b/src/ui/theme-private.h
index 9e05880..252b83f 100644
--- a/src/ui/theme-private.h
+++ b/src/ui/theme-private.h
@@ -723,11 +723,13 @@ struct _MetaTheme
    * plus alpha).
    * */
   GHashTable *color_constants;
+
   GHashTable *images_by_filename;
   GHashTable *layouts_by_name;
   GHashTable *draw_op_lists_by_name;
   GHashTable *styles_by_name;
   GHashTable *style_sets_by_name;
+
   MetaFrameStyleSet *style_sets_by_type[META_FRAME_TYPE_LAST];
 };
 
diff --git a/src/ui/theme.c b/src/ui/theme.c
index aa2f2c1..20f4546 100644
--- a/src/ui/theme.c
+++ b/src/ui/theme.c
@@ -5621,20 +5621,18 @@ meta_theme_free (MetaTheme *theme)
   if (theme->titlebar_font)
     pango_font_description_free (theme->titlebar_font);
 
-  /* be more careful when destroying the theme hash tables,
-     since they are only constructed as needed, and may be NULL. */
   if (theme->integer_constants)
     g_hash_table_destroy (theme->integer_constants);
-  if (theme->images_by_filename)
-    g_hash_table_destroy (theme->images_by_filename);
-  if (theme->layouts_by_name)
-    g_hash_table_destroy (theme->layouts_by_name);
-  if (theme->draw_op_lists_by_name)
-    g_hash_table_destroy (theme->draw_op_lists_by_name);
-  if (theme->styles_by_name)
-    g_hash_table_destroy (theme->styles_by_name);
-  if (theme->style_sets_by_name)
-    g_hash_table_destroy (theme->style_sets_by_name);
+  if (theme->float_constants)
+    g_hash_table_destroy (theme->float_constants);
+  if (theme->color_constants)
+    g_hash_table_destroy (theme->color_constants);
+
+  g_hash_table_destroy (theme->images_by_filename);
+  g_hash_table_destroy (theme->layouts_by_name);
+  g_hash_table_destroy (theme->draw_op_lists_by_name);
+  g_hash_table_destroy (theme->styles_by_name);
+  g_hash_table_destroy (theme->style_sets_by_name);
 
   for (i = 0; i < META_FRAME_TYPE_LAST; i++)
     if (theme->style_sets_by_type[i])


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