From: fliep <fliep@ddfedd41-794f-dd11-ae45-00112f111e67>
Date: Sat, 24 Oct 2009 09:19:56 +0000 (+0000)
Subject: Avoid compilation warnings
X-Git-Tag: v0.9~316
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=81be5c1e527c60b34425844ca411cf07ac88650a;p=projects%2Fchimara%2Fchimara.git

Avoid compilation warnings
---

diff --git a/libchimara/chimara-glk.c b/libchimara/chimara-glk.c
index 45031d9..d8f071d 100644
--- a/libchimara/chimara-glk.c
+++ b/libchimara/chimara-glk.c
@@ -197,7 +197,10 @@ chimara_glk_finalize(GObject *object)
 	pango_font_description_free(priv->default_font_desc);
 	pango_font_description_free(priv->monospace_font_desc);
 	g_free(priv->current_dir);
-	g_hash_table_destroy(priv->default_styles);
+	g_hash_table_destroy(priv->default_styles->text_buffer);
+	g_hash_table_destroy(priv->default_styles->text_grid);
+	g_hash_table_destroy(priv->current_styles->text_buffer);
+	g_hash_table_destroy(priv->current_styles->text_grid);
 	
     G_OBJECT_CLASS(chimara_glk_parent_class)->finalize(object);
 }
diff --git a/libchimara/style.c b/libchimara/style.c
index f6093d9..1b13e61 100644
--- a/libchimara/style.c
+++ b/libchimara/style.c
@@ -33,6 +33,20 @@ glk_set_style(glui32 styl)
 	glk_set_style_stream(glk_data->current_stream, styl);
 }
 
+static const gchar* TAG_NAMES[] = {
+	"normal",
+	"emphasized",
+	"preformatted",
+	"header",
+	"subheader",
+	"alert",
+	"note",
+	"block-quote",
+	"input",
+	"user1",
+	"user2"
+};
+
 /* Internal function: mapping from style enum to tag name */
 static gchar*
 get_tag_name(glui32 style)
diff --git a/libchimara/style.h b/libchimara/style.h
index 4f67973..7dc507f 100644
--- a/libchimara/style.h
+++ b/libchimara/style.h
@@ -14,20 +14,6 @@ G_GNUC_INTERNAL void style_init_textbuffer(GtkTextBuffer *buffer);
 G_GNUC_INTERNAL void style_init_textgrid(GtkTextBuffer *buffer);
 G_GNUC_INTERNAL void style_init();
 
-static const gchar* TAG_NAMES[] = {
-	"normal",
-	"emphasized",
-	"preformatted",
-	"header",
-	"subheader",
-	"alert",
-	"note",
-	"block-quote",
-	"input",
-	"user1",
-	"user2"
-};
-
 typedef struct StyleSet {
 	GHashTable *text_grid;
 	GHashTable *text_buffer;