[tepl] Rename class TeplFileMetadata to TeplMetadataAttic
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tepl] Rename class TeplFileMetadata to TeplMetadataAttic
- Date: Sat, 18 Apr 2020 17:20:53 +0000 (UTC)
commit 0bcf98ddca6846da66005a53a93d83a65da9dd15
Author: Sébastien Wilmet <swilmet gnome org>
Date: Sat Apr 18 13:32:47 2020 +0200
Rename class TeplFileMetadata to TeplMetadataAttic
po/POTFILES.in | 4 +-
tepl/meson.build | 4 +-
tepl/tepl-file-metadata.c | 297 -------------------------------------------
tepl/tepl-file-metadata.h | 94 --------------
tepl/tepl-metadata-attic.c | 190 +++++++++++++++++++++++++++
tepl/tepl-metadata-attic.h | 76 +++++++++++
tepl/tepl-metadata-manager.c | 66 +++++-----
tepl/tepl-metadata-manager.h | 14 +-
tepl/tepl-metadata-parser.c | 28 ++--
tepl/tepl-metadata.c | 2 +-
tepl/tepl.h | 1 -
11 files changed, 321 insertions(+), 455 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9725d2a..4d45224 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -12,16 +12,16 @@ tepl/tepl-file.c
tepl/tepl-file-content.c
tepl/tepl-file-content-loader.c
tepl/tepl-file-loader.c
-tepl/tepl-file-metadata.c
tepl/tepl-file-saver.c
tepl/tepl-info-bar.c
tepl/tepl-init.c
tepl/tepl-io-error-info-bars.c
tepl/tepl-iter.c
tepl/tepl-menu-shell.c
+tepl/tepl-metadata-attic.c
tepl/tepl-metadata.c
-tepl/tepl-metadata-parser.c
tepl/tepl-metadata-manager.c
+tepl/tepl-metadata-parser.c
tepl/tepl-notebook.c
tepl/tepl-signal-group.c
tepl/tepl-tab.c
diff --git a/tepl/meson.build b/tepl/meson.build
index 344696f..a2fc71c 100644
--- a/tepl/meson.build
+++ b/tepl/meson.build
@@ -8,7 +8,6 @@ tepl_public_headers = [
'tepl-encoding.h',
'tepl-file.h',
'tepl-file-loader.h',
- 'tepl-file-metadata.h',
'tepl-file-saver.h',
'tepl-fold-region.h',
'tepl-gutter-renderer-folds.h',
@@ -36,7 +35,6 @@ tepl_public_c_files = [
'tepl-encoding.c',
'tepl-file.c',
'tepl-file-loader.c',
- 'tepl-file-metadata.c',
'tepl-file-saver.c',
'tepl-fold-region.c',
'tepl-gutter-renderer-folds.c',
@@ -63,6 +61,7 @@ TEPL_PRIVATE_HEADERS = [
'tepl-file-content.h',
'tepl-file-content-loader.h',
'tepl-io-error-info-bar.h',
+ 'tepl-metadata-attic.h',
'tepl-metadata-parser.h',
'tepl-progress-info-bar.h',
'tepl-signal-group.h',
@@ -76,6 +75,7 @@ tepl_private_c_files = [
'tepl-file-content.c',
'tepl-file-content-loader.c',
'tepl-io-error-info-bar.c',
+ 'tepl-metadata-attic.c',
'tepl-metadata-parser.c',
'tepl-progress-info-bar.c',
'tepl-signal-group.c',
diff --git a/tepl/tepl-metadata-attic.c b/tepl/tepl-metadata-attic.c
new file mode 100644
index 0000000..0ab67b8
--- /dev/null
+++ b/tepl/tepl-metadata-attic.c
@@ -0,0 +1,190 @@
+/*
+ * This file is part of Tepl, a text editor library.
+ *
+ * Copyright 2020 - Sébastien Wilmet <swilmet gnome org>
+ *
+ * Tepl is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ *
+ * Tepl is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "tepl-metadata-attic.h"
+#include "tepl-metadata.h"
+
+struct _TeplMetadataAtticPrivate
+{
+ /* Keys: not nullable gchar *
+ * Values: not nullable gchar *
+ * hash_table never NULL.
+ *
+ * Note that unlike TeplMetadata, here the values must never be NULL.
+ */
+ GHashTable *hash_table;
+
+ /* Time of last access in milliseconds since January 1, 1970 UTC.
+ * Useful for tepl_metadata_manager_trim().
+ */
+ gint64 atime;
+};
+
+G_DEFINE_TYPE_WITH_PRIVATE (TeplMetadataAttic, _tepl_metadata_attic, G_TYPE_OBJECT)
+
+static void
+set_current_atime (TeplMetadataAttic *metadata)
+{
+ metadata->priv->atime = g_get_real_time () / 1000;
+}
+
+static void
+_tepl_metadata_attic_finalize (GObject *object)
+{
+ TeplMetadataAttic *metadata = TEPL_METADATA_ATTIC (object);
+
+ g_hash_table_unref (metadata->priv->hash_table);
+
+ G_OBJECT_CLASS (_tepl_metadata_attic_parent_class)->finalize (object);
+}
+
+static void
+_tepl_metadata_attic_class_init (TeplMetadataAtticClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+ object_class->finalize = _tepl_metadata_attic_finalize;
+}
+
+static void
+_tepl_metadata_attic_init (TeplMetadataAttic *metadata)
+{
+ metadata->priv = _tepl_metadata_attic_get_instance_private (metadata);
+
+ metadata->priv->hash_table = g_hash_table_new_full (g_str_hash,
+ g_str_equal,
+ g_free,
+ g_free);
+}
+
+TeplMetadataAttic *
+_tepl_metadata_attic_new (void)
+{
+ return g_object_new (TEPL_TYPE_METADATA_ATTIC, NULL);
+}
+
+/* Returns: TRUE on success. */
+gboolean
+_tepl_metadata_attic_set_atime_str (TeplMetadataAttic *metadata,
+ const gchar *atime_str)
+{
+ g_return_val_if_fail (TEPL_IS_METADATA_ATTIC (metadata), FALSE);
+ g_return_val_if_fail (atime_str != NULL, FALSE);
+
+ return g_ascii_string_to_signed (atime_str,
+ 10,
+ 0, G_MAXINT64,
+ &metadata->priv->atime,
+ NULL);
+}
+
+/* See GCompareFunc. */
+gint
+_tepl_metadata_attic_compare_atime (TeplMetadataAttic *metadata1,
+ TeplMetadataAttic *metadata2)
+{
+ g_return_val_if_fail (TEPL_IS_METADATA_ATTIC (metadata1), 0);
+ g_return_val_if_fail (TEPL_IS_METADATA_ATTIC (metadata2), 0);
+
+ if (metadata1->priv->atime < metadata2->priv->atime)
+ {
+ return -1;
+ }
+ else if (metadata1->priv->atime > metadata2->priv->atime)
+ {
+ return 1;
+ }
+
+ return 0;
+}
+
+void
+_tepl_metadata_attic_insert_entry (TeplMetadataAttic *metadata,
+ const gchar *key,
+ const gchar *value)
+{
+ g_return_if_fail (TEPL_IS_METADATA_ATTIC (metadata));
+ g_return_if_fail (_tepl_metadata_key_is_valid (key));
+ g_return_if_fail (g_utf8_validate (value, -1, NULL));
+
+ g_hash_table_replace (metadata->priv->hash_table,
+ g_strdup (key),
+ g_strdup (value));
+}
+
+static void
+append_entries_to_string (TeplMetadataAttic *metadata,
+ GString *string)
+{
+ GHashTableIter iter;
+ gpointer key_p;
+ gpointer value_p;
+
+ g_hash_table_iter_init (&iter, metadata->priv->hash_table);
+ while (g_hash_table_iter_next (&iter, &key_p, &value_p))
+ {
+ const gchar *key = key_p;
+ const gchar *value = value_p;
+ gchar *value_escaped;
+
+ /* No need to escape the key. */
+
+ value_escaped = g_markup_escape_text (value, -1);
+
+ g_string_append_printf (string,
+ " <entry key=\"%s\" value=\"%s\"/>\n",
+ key,
+ value_escaped);
+
+ g_free (value_escaped);
+ }
+}
+
+void
+_tepl_metadata_attic_append_xml_to_string (TeplMetadataAttic *metadata,
+ GFile *location,
+ GString *string)
+{
+ gchar *uri;
+ gchar *uri_escaped;
+
+ g_return_if_fail (TEPL_IS_METADATA_ATTIC (metadata));
+ g_return_if_fail (G_IS_FILE (location));
+ g_return_if_fail (string != NULL);
+
+ if (g_hash_table_size (metadata->priv->hash_table) == 0)
+ {
+ return;
+ }
+
+ uri = g_file_get_uri (location);
+ uri_escaped = g_markup_escape_text (uri, -1);
+
+ g_string_append_printf (string,
+ " <document uri=\"%s\" atime=\"%" G_GINT64_FORMAT "\">\n",
+ uri_escaped,
+ metadata->priv->atime);
+
+ append_entries_to_string (metadata, string);
+
+ g_string_append (string, " </document>\n");
+
+ g_free (uri);
+ g_free (uri_escaped);
+}
diff --git a/tepl/tepl-metadata-attic.h b/tepl/tepl-metadata-attic.h
new file mode 100644
index 0000000..2819f10
--- /dev/null
+++ b/tepl/tepl-metadata-attic.h
@@ -0,0 +1,76 @@
+/*
+ * This file is part of Tepl, a text editor library.
+ *
+ * Copyright 2020 - Sébastien Wilmet <swilmet gnome org>
+ *
+ * Tepl is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ *
+ * Tepl is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef TEPL_METADATA_ATTIC_H
+#define TEPL_METADATA_ATTIC_H
+
+#include <gio/gio.h>
+
+G_BEGIN_DECLS
+
+#define TEPL_TYPE_METADATA_ATTIC (_tepl_metadata_attic_get_type ())
+#define TEPL_METADATA_ATTIC(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TEPL_TYPE_METADATA_ATTIC,
TeplMetadataAttic))
+#define TEPL_METADATA_ATTIC_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TEPL_TYPE_METADATA_ATTIC,
TeplMetadataAtticClass))
+#define TEPL_IS_METADATA_ATTIC(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TEPL_TYPE_METADATA_ATTIC))
+#define TEPL_IS_METADATA_ATTIC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TEPL_TYPE_METADATA_ATTIC))
+#define TEPL_METADATA_ATTIC_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TEPL_TYPE_METADATA_ATTIC,
TeplMetadataAtticClass))
+
+typedef struct _TeplMetadataAttic TeplMetadataAttic;
+typedef struct _TeplMetadataAtticClass TeplMetadataAtticClass;
+typedef struct _TeplMetadataAtticPrivate TeplMetadataAtticPrivate;
+
+struct _TeplMetadataAttic
+{
+ GObject parent;
+
+ TeplMetadataAtticPrivate *priv;
+};
+
+struct _TeplMetadataAtticClass
+{
+ GObjectClass parent_class;
+};
+
+G_GNUC_INTERNAL
+GType _tepl_metadata_attic_get_type (void);
+
+G_GNUC_INTERNAL
+TeplMetadataAttic * _tepl_metadata_attic_new (void);
+
+G_GNUC_INTERNAL
+gboolean _tepl_metadata_attic_set_atime_str (TeplMetadataAttic *metadata,
+ const gchar *atime_str);
+
+G_GNUC_INTERNAL
+gint _tepl_metadata_attic_compare_atime (TeplMetadataAttic *metadata1,
+ TeplMetadataAttic *metadata2);
+
+G_GNUC_INTERNAL
+void _tepl_metadata_attic_insert_entry (TeplMetadataAttic *metadata,
+ const gchar *key,
+ const gchar *value);
+
+G_GNUC_INTERNAL
+void _tepl_metadata_attic_append_xml_to_string (TeplMetadataAttic *metadata,
+ GFile *location,
+ GString *string);
+
+G_END_DECLS
+
+#endif /* TEPL_METADATA_ATTIC_H */
diff --git a/tepl/tepl-metadata-manager.c b/tepl/tepl-metadata-manager.c
index 5fd4dc5..23aaa39 100644
--- a/tepl/tepl-metadata-manager.c
+++ b/tepl/tepl-metadata-manager.c
@@ -18,6 +18,7 @@
*/
#include "tepl-metadata-manager.h"
+#include "tepl-metadata-attic.h"
#include "tepl-metadata-parser.h"
#include "tepl-utils.h"
@@ -47,7 +48,7 @@
struct _TeplMetadataManagerPrivate
{
/* Keys: GFile *
- * Values: TeplFileMetadata *
+ * Values: TeplMetadataAttic *
* Never NULL.
*/
GHashTable *hash_table;
@@ -168,19 +169,19 @@ tepl_metadata_manager_trim (TeplMetadataManager *manager,
gpointer key;
gpointer value;
GFile *oldest_location = NULL;
- TeplFileMetadata *oldest_file_metadata = NULL;
+ TeplMetadataAttic *oldest_metadata_attic = NULL;
g_hash_table_iter_init (&iter, manager->priv->hash_table);
while (g_hash_table_iter_next (&iter, &key, &value))
{
GFile *location = key;
- TeplFileMetadata *file_metadata = value;
+ TeplMetadataAttic *metadata_attic = value;
if (oldest_location == NULL ||
- _tepl_file_metadata_compare_atime (file_metadata, oldest_file_metadata) < 0)
+ _tepl_metadata_attic_compare_atime (metadata_attic, oldest_metadata_attic) < 0)
{
oldest_location = location;
- oldest_file_metadata = file_metadata;
+ oldest_metadata_attic = metadata_attic;
}
}
@@ -232,9 +233,9 @@ to_string (TeplMetadataManager *manager)
while (g_hash_table_iter_next (&iter, &key, &value))
{
GFile *location = key;
- TeplFileMetadata *file_metadata = value;
+ TeplMetadataAttic *metadata_attic = value;
- _tepl_file_metadata_append_xml_to_string (file_metadata, location, string);
+ _tepl_metadata_attic_append_xml_to_string (metadata_attic, location, string);
}
g_string_append (string, "</metadata>\n");
@@ -308,67 +309,58 @@ tepl_metadata_manager_save (TeplMetadataManager *manager,
}
/**
- * tepl_metadata_manager_load_file_metadata:
+ * tepl_metadata_manager_load_metadata:
* @manager: the #TeplMetadataManager.
* @location: a #GFile.
- * @file_metadata: a #TeplFileMetadata.
+ * @metadata: a #TeplMetadata.
*
- * Copies the metadata stored in @manager for @location into @file_metadata.
+ * Copies the metadata stored in @manager for @location into @metadata.
*
* Since: 5.0
*/
void
-tepl_metadata_manager_load_file_metadata (TeplMetadataManager *manager,
- GFile *location,
- TeplFileMetadata *file_metadata)
+tepl_metadata_manager_load_metadata (TeplMetadataManager *manager,
+ GFile *location,
+ TeplMetadata *metadata)
{
- TeplFileMetadata *file_metadata_from_manager;
+ TeplMetadataAttic *metadata_attic;
g_return_if_fail (TEPL_IS_METADATA_MANAGER (manager));
g_return_if_fail (G_IS_FILE (location));
- g_return_if_fail (TEPL_IS_FILE_METADATA (file_metadata));
+ g_return_if_fail (TEPL_IS_METADATA (metadata));
- file_metadata_from_manager = g_hash_table_lookup (manager->priv->hash_table, location);
+ metadata_attic = g_hash_table_lookup (manager->priv->hash_table, location);
- if (file_metadata_from_manager != NULL)
+ if (metadata_attic != NULL)
{
- _tepl_file_metadata_copy_into (file_metadata_from_manager, file_metadata);
+ /* TODO */
}
}
/**
- * tepl_metadata_manager_save_file_metadata:
+ * tepl_metadata_manager_save_metadata:
* @manager: the #TeplMetadataManager.
* @location: a #GFile.
- * @file_metadata: a #TeplFileMetadata.
+ * @metadata: a #TeplMetadata.
*
- * Copies the metadata from @file_metadata into @manager for @location.
+ * Copies the metadata from @metadata into @manager for @location.
*
* Since: 5.0
*/
void
-tepl_metadata_manager_save_file_metadata (TeplMetadataManager *manager,
- GFile *location,
- TeplFileMetadata *file_metadata)
+tepl_metadata_manager_save_metadata (TeplMetadataManager *manager,
+ GFile *location,
+ TeplMetadata *metadata)
{
- TeplFileMetadata *file_metadata_from_manager;
+ TeplMetadataAttic *metadata_attic;
g_return_if_fail (TEPL_IS_METADATA_MANAGER (manager));
g_return_if_fail (G_IS_FILE (location));
- g_return_if_fail (TEPL_IS_FILE_METADATA (file_metadata));
+ g_return_if_fail (TEPL_IS_METADATA (metadata));
- file_metadata_from_manager = g_hash_table_lookup (manager->priv->hash_table, location);
+ metadata_attic = g_hash_table_lookup (manager->priv->hash_table, location);
- if (file_metadata_from_manager == NULL)
- {
- file_metadata_from_manager = tepl_file_metadata_new ();
-
- g_hash_table_replace (manager->priv->hash_table,
- g_object_ref (location),
- file_metadata_from_manager);
- }
-
- _tepl_file_metadata_copy_into (file_metadata, file_metadata_from_manager);
+ /* TODO */
manager->priv->modified = TRUE;
}
diff --git a/tepl/tepl-metadata-manager.h b/tepl/tepl-metadata-manager.h
index 9754463..500d1db 100644
--- a/tepl/tepl-metadata-manager.h
+++ b/tepl/tepl-metadata-manager.h
@@ -25,7 +25,7 @@
#endif
#include <gio/gio.h>
-#include <tepl/tepl-file-metadata.h>
+#include <tepl/tepl-metadata.h>
G_BEGIN_DECLS
@@ -73,13 +73,13 @@ gboolean tepl_metadata_manager_save (TeplMetadataManager
*manager,
gboolean trim,
GError **error);
-void tepl_metadata_manager_load_file_metadata (TeplMetadataManager *manager,
- GFile *location,
- TeplFileMetadata *file_metadata);
+void tepl_metadata_manager_load_metadata (TeplMetadataManager *manager,
+ GFile *location,
+ TeplMetadata *metadata);
-void tepl_metadata_manager_save_file_metadata (TeplMetadataManager *manager,
- GFile *location,
- TeplFileMetadata *file_metadata);
+void tepl_metadata_manager_save_metadata (TeplMetadataManager *manager,
+ GFile *location,
+ TeplMetadata *metadata);
G_END_DECLS
diff --git a/tepl/tepl-metadata-parser.c b/tepl/tepl-metadata-parser.c
index 676933c..dfe9fa6 100644
--- a/tepl/tepl-metadata-parser.c
+++ b/tepl/tepl-metadata-parser.c
@@ -20,7 +20,7 @@
#include "config.h"
#include "tepl-metadata-parser.h"
#include <glib/gi18n-lib.h>
-#include "tepl-file-metadata.h"
+#include "tepl-metadata-attic.h"
typedef struct _ParsingData ParsingData;
struct _ParsingData
@@ -28,7 +28,7 @@ struct _ParsingData
GHashTable *hash_table;
gchar *cur_document_uri;
- TeplFileMetadata *cur_file_metadata;
+ TeplMetadataAttic *cur_metadata_attic;
guint metadata_element_open : 1;
guint document_element_open : 1;
@@ -52,19 +52,19 @@ parsing_data_check_invariants (ParsingData *parsing_data)
{
g_assert (!parsing_data->document_element_open);
g_assert (parsing_data->cur_document_uri == NULL);
- g_assert (parsing_data->cur_file_metadata == NULL);
+ g_assert (parsing_data->cur_metadata_attic == NULL);
return;
}
if (!parsing_data->document_element_open)
{
g_assert (parsing_data->cur_document_uri == NULL);
- g_assert (parsing_data->cur_file_metadata == NULL);
+ g_assert (parsing_data->cur_metadata_attic == NULL);
return;
}
g_assert (parsing_data->cur_document_uri != NULL);
- g_assert (parsing_data->cur_file_metadata != NULL);
+ g_assert (parsing_data->cur_metadata_attic != NULL);
}
static void
@@ -74,7 +74,7 @@ parsing_data_free (ParsingData *parsing_data)
{
g_hash_table_unref (parsing_data->hash_table);
g_free (parsing_data->cur_document_uri);
- g_clear_object (&parsing_data->cur_file_metadata);
+ g_clear_object (&parsing_data->cur_metadata_attic);
g_free (parsing_data);
}
@@ -119,7 +119,7 @@ parse_document_element (GMarkupParseContext *context,
g_assert (parsing_data->metadata_element_open);
g_assert (!parsing_data->document_element_open);
g_assert (parsing_data->cur_document_uri == NULL);
- g_assert (parsing_data->cur_file_metadata == NULL);
+ g_assert (parsing_data->cur_metadata_attic == NULL);
if (!g_str_equal (element_name, "document"))
{
@@ -132,7 +132,7 @@ parse_document_element (GMarkupParseContext *context,
return;
}
- parsing_data->cur_file_metadata = tepl_file_metadata_new ();
+ parsing_data->cur_metadata_attic = _tepl_metadata_attic_new ();
for (attr_num = 0; attribute_names[attr_num] != NULL; attr_num++)
{
@@ -146,8 +146,8 @@ parse_document_element (GMarkupParseContext *context,
}
else if (!got_atime && g_str_equal (cur_attr_name, "atime"))
{
- if (!_tepl_file_metadata_set_atime_str (parsing_data->cur_file_metadata,
- cur_attr_value))
+ if (!_tepl_metadata_attic_set_atime_str (parsing_data->cur_metadata_attic,
+ cur_attr_value))
{
g_set_error (error,
G_MARKUP_ERROR,
@@ -189,7 +189,7 @@ parse_entry_element (GMarkupParseContext *context,
g_assert (parsing_data->metadata_element_open);
g_assert (parsing_data->document_element_open);
- g_assert (parsing_data->cur_file_metadata != NULL);
+ g_assert (parsing_data->cur_metadata_attic != NULL);
if (!g_str_equal (element_name, "entry"))
{
@@ -227,7 +227,7 @@ parse_entry_element (GMarkupParseContext *context,
return;
}
- _tepl_file_metadata_insert_entry (parsing_data->cur_file_metadata, key, value);
+ _tepl_metadata_attic_insert_entry (parsing_data->cur_metadata_attic, key, value);
}
static void
@@ -283,11 +283,11 @@ insert_document_to_hash_table (ParsingData *parsing_data)
g_hash_table_replace (parsing_data->hash_table,
g_file_new_for_uri (parsing_data->cur_document_uri),
- parsing_data->cur_file_metadata);
+ parsing_data->cur_metadata_attic);
g_free (parsing_data->cur_document_uri);
parsing_data->cur_document_uri = NULL;
- parsing_data->cur_file_metadata = NULL;
+ parsing_data->cur_metadata_attic = NULL;
parsing_data->document_element_open = FALSE;
}
diff --git a/tepl/tepl-metadata.c b/tepl/tepl-metadata.c
index 775ce88..3d3cc9b 100644
--- a/tepl/tepl-metadata.c
+++ b/tepl/tepl-metadata.c
@@ -21,7 +21,7 @@
struct _TeplMetadataPrivate
{
- /* Keys: gchar *
+ /* Keys: not nullable gchar *
* Values: nullable gchar *
* hash_table never NULL.
*/
diff --git a/tepl/tepl.h b/tepl/tepl.h
index cde0488..df73f3b 100644
--- a/tepl/tepl.h
+++ b/tepl/tepl.h
@@ -34,7 +34,6 @@
#include <tepl/tepl-encoding.h>
#include <tepl/tepl-file.h>
#include <tepl/tepl-file-loader.h>
-#include <tepl/tepl-file-metadata.h>
#include <tepl/tepl-file-saver.h>
#include <tepl/tepl-fold-region.h>
#include <tepl/tepl-gutter-renderer-folds.h>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
