[gedit/wip/gtef: 6/8] gtef: move metadata-manager to gtef
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit/wip/gtef: 6/8] gtef: move metadata-manager to gtef
- Date: Mon, 25 Apr 2016 18:22:48 +0000 (UTC)
commit d16f3bd299d026ad068d5e873706a4989482e963
Author: Sébastien Wilmet <swilmet gnome org>
Date: Mon Apr 25 17:47:40 2016 +0200
gtef: move metadata-manager to gtef
It's a private class, so we don't need to keep gedit-metadata-manager.
gedit/Makefile.am | 2 -
gedit/gedit-app.c | 6 +-
gedit/gedit-document.c | 6 +-
gedit/gtef/Makefile.am | 10 +-
.../gtef-metadata-manager.c} | 174 ++++++++++----------
.../gtef-metadata-manager.h} | 24 ++--
6 files changed, 111 insertions(+), 111 deletions(-)
---
diff --git a/gedit/Makefile.am b/gedit/Makefile.am
index f0e2219..4c1f79f 100644
--- a/gedit/Makefile.am
+++ b/gedit/Makefile.am
@@ -113,7 +113,6 @@ gedit_NOINST_H_FILES = \
gedit/gedit-history-entry.h \
gedit/gedit-io-error-info-bar.h \
gedit/gedit-menu-stack-switcher.h \
- gedit/gedit-metadata-manager.h \
gedit/gedit-multi-notebook.h \
gedit/gedit-notebook.h \
gedit/gedit-notebook-popup-menu.h \
@@ -185,7 +184,6 @@ gedit_libgedit_c_files = \
gedit/gedit-menu-stack-switcher.c \
gedit/gedit-message-bus.c \
gedit/gedit-message.c \
- gedit/gedit-metadata-manager.c \
gedit/gedit-multi-notebook.c \
gedit/gedit-notebook.c \
gedit/gedit-notebook-popup-menu.c \
diff --git a/gedit/gedit-app.c b/gedit/gedit-app.c
index 7b68e1a..4f7f9cf 100644
--- a/gedit/gedit-app.c
+++ b/gedit/gedit-app.c
@@ -53,7 +53,7 @@
#include "gedit-tab-private.h"
#ifndef ENABLE_GVFS_METADATA
-#include "gedit-metadata-manager.h"
+#include "gtef/gtef-metadata-manager.h"
#endif
#define GEDIT_PAGE_SETUP_FILE "gedit-page-setup"
@@ -792,7 +792,7 @@ gedit_app_startup (GApplication *application)
#ifndef ENABLE_GVFS_METADATA
cache_dir = gedit_dirs_get_user_cache_dir ();
metadata_filename = g_build_filename (cache_dir, "gedit-metadata.xml", NULL);
- gedit_metadata_manager_init (metadata_filename);
+ gtef_metadata_manager_init (metadata_filename);
g_free (metadata_filename);
#endif
@@ -1270,7 +1270,7 @@ gedit_app_shutdown (GApplication *app)
G_APPLICATION_CLASS (gedit_app_parent_class)->shutdown (app);
#ifndef ENABLE_GVFS_METADATA
- gedit_metadata_manager_shutdown ();
+ gtef_metadata_manager_shutdown ();
#endif
gedit_dirs_shutdown ();
diff --git a/gedit/gedit-document.c b/gedit/gedit-document.c
index 36e91ff..9cf5a5b 100644
--- a/gedit/gedit-document.c
+++ b/gedit/gedit-document.c
@@ -34,7 +34,7 @@
#include "gedit-settings.h"
#include "gedit-debug.h"
#include "gedit-utils.h"
-#include "gedit-metadata-manager.h"
+#include "gtef/gtef-metadata-manager.h"
#define METADATA_QUERY "metadata::*"
@@ -1624,7 +1624,7 @@ get_metadata_from_metadata_manager (GeditDocument *doc,
if (location != NULL)
{
- return gedit_metadata_manager_get (location, key);
+ return gtef_metadata_manager_get (location, key);
}
return NULL;
@@ -1752,7 +1752,7 @@ gedit_document_set_metadata (GeditDocument *doc,
}
else
{
- gedit_metadata_manager_set (location, key, value);
+ gtef_metadata_manager_set (location, key, value);
}
}
diff --git a/gedit/gtef/Makefile.am b/gedit/gtef/Makefile.am
index f63da28..06a222e 100644
--- a/gedit/gtef/Makefile.am
+++ b/gedit/gtef/Makefile.am
@@ -19,8 +19,10 @@ gedit_gtef_libgtef_la_LIBADD = \
gedit_gtef_libgtef_la_LDFLAGS = \
-no-undefined
-gedit_gtef_libgtef_la_SOURCES = \
- gedit/gtef/gtef-debug.c \
- gedit/gtef/gtef-debug.h \
- gedit/gtef/gtef-utils.c \
+gedit_gtef_libgtef_la_SOURCES = \
+ gedit/gtef/gtef-debug.c \
+ gedit/gtef/gtef-debug.h \
+ gedit/gtef/gtef-metadata-manager.c \
+ gedit/gtef/gtef-metadata-manager.h \
+ gedit/gtef/gtef-utils.c \
gedit/gtef/gtef-utils.h
diff --git a/gedit/gedit-metadata-manager.c b/gedit/gtef/gtef-metadata-manager.c
similarity index 65%
rename from gedit/gedit-metadata-manager.c
rename to gedit/gtef/gtef-metadata-manager.c
index ba584bf..a559f4b 100644
--- a/gedit/gedit-metadata-manager.c
+++ b/gedit/gtef/gtef-metadata-manager.c
@@ -1,7 +1,7 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * gedit-metadata-manager.c
- * This file is part of gedit
+ * gtef-metadata-manager.c
+ * This file is part of gtef
*
* Copyright (C) 2003-2007 Paolo Maggi
*
@@ -19,17 +19,17 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include "gedit-metadata-manager.h"
+#include "gtef-metadata-manager.h"
#include <libxml/xmlreader.h>
-#include "gedit-debug.h"
+#include "gtef-debug.h"
/*
-#define GEDIT_METADATA_VERBOSE_DEBUG 1
+#define GTEF_METADATA_VERBOSE_DEBUG 1
*/
#define MAX_ITEMS 50
-typedef struct _GeditMetadataManager GeditMetadataManager;
+typedef struct _GtefMetadataManager GtefMetadataManager;
typedef struct _Item Item;
@@ -41,7 +41,7 @@ struct _Item
GHashTable *values;
};
-struct _GeditMetadataManager
+struct _GtefMetadataManager
{
/* It is true if the file has been read. */
gboolean values_loaded;
@@ -53,9 +53,9 @@ struct _GeditMetadataManager
gchar *metadata_filename;
};
-static gboolean gedit_metadata_manager_save (gpointer data);
+static gboolean gtef_metadata_manager_save (gpointer data);
-static GeditMetadataManager *gedit_metadata_manager = NULL;
+static GtefMetadataManager *gtef_metadata_manager = NULL;
static void
item_free (gpointer data)
@@ -64,8 +64,8 @@ item_free (gpointer data)
g_return_if_fail (data != NULL);
-#ifdef GEDIT_METADATA_VERBOSE_DEBUG
- gedit_debug (DEBUG_METADATA);
+#ifdef GTEF_METADATA_VERBOSE_DEBUG
+ gtef_debug (DEBUG_METADATA);
#endif
item = (Item *)data;
@@ -77,77 +77,77 @@ item_free (gpointer data)
}
static void
-gedit_metadata_manager_arm_timeout (void)
+gtef_metadata_manager_arm_timeout (void)
{
- if (gedit_metadata_manager->timeout_id == 0)
+ if (gtef_metadata_manager->timeout_id == 0)
{
- gedit_metadata_manager->timeout_id =
+ gtef_metadata_manager->timeout_id =
g_timeout_add_seconds_full (G_PRIORITY_DEFAULT_IDLE,
2,
- (GSourceFunc)gedit_metadata_manager_save,
+ (GSourceFunc)gtef_metadata_manager_save,
NULL,
NULL);
}
}
/**
- * gedit_metadata_manager_init:
+ * gtef_metadata_manager_init:
* @metadata_filename: the filename where the metadata is stored.
*
* This function initializes the metadata manager.
- * See also gedit_metadata_manager_shutdown().
+ * See also gtef_metadata_manager_shutdown().
*/
void
-gedit_metadata_manager_init (const gchar *metadata_filename)
+gtef_metadata_manager_init (const gchar *metadata_filename)
{
- gedit_debug (DEBUG_METADATA);
+ gtef_debug (DEBUG_METADATA);
- if (gedit_metadata_manager != NULL)
+ if (gtef_metadata_manager != NULL)
{
return;
}
- gedit_metadata_manager = g_new0 (GeditMetadataManager, 1);
+ gtef_metadata_manager = g_new0 (GtefMetadataManager, 1);
- gedit_metadata_manager->values_loaded = FALSE;
+ gtef_metadata_manager->values_loaded = FALSE;
- gedit_metadata_manager->items =
+ gtef_metadata_manager->items =
g_hash_table_new_full (g_str_hash,
g_str_equal,
g_free,
item_free);
- gedit_metadata_manager->metadata_filename = g_strdup (metadata_filename);
+ gtef_metadata_manager->metadata_filename = g_strdup (metadata_filename);
}
/**
- * gedit_metadata_manager_shutdown:
+ * gtef_metadata_manager_shutdown:
*
* This function frees the internal data of the metadata manager.
- * See also gedit_metadata_manager_init().
+ * See also gtef_metadata_manager_init().
*/
void
-gedit_metadata_manager_shutdown (void)
+gtef_metadata_manager_shutdown (void)
{
- gedit_debug (DEBUG_METADATA);
+ gtef_debug (DEBUG_METADATA);
- if (gedit_metadata_manager == NULL)
+ if (gtef_metadata_manager == NULL)
return;
- if (gedit_metadata_manager->timeout_id)
+ if (gtef_metadata_manager->timeout_id)
{
- g_source_remove (gedit_metadata_manager->timeout_id);
- gedit_metadata_manager->timeout_id = 0;
- gedit_metadata_manager_save (NULL);
+ g_source_remove (gtef_metadata_manager->timeout_id);
+ gtef_metadata_manager->timeout_id = 0;
+ gtef_metadata_manager_save (NULL);
}
- if (gedit_metadata_manager->items != NULL)
- g_hash_table_destroy (gedit_metadata_manager->items);
+ if (gtef_metadata_manager->items != NULL)
+ g_hash_table_destroy (gtef_metadata_manager->items);
- g_free (gedit_metadata_manager->metadata_filename);
+ g_free (gtef_metadata_manager->metadata_filename);
- g_free (gedit_metadata_manager);
- gedit_metadata_manager = NULL;
+ g_free (gtef_metadata_manager);
+ gtef_metadata_manager = NULL;
}
static void
@@ -158,8 +158,8 @@ parseItem (xmlDocPtr doc, xmlNodePtr cur)
xmlChar *uri;
xmlChar *atime;
-#ifdef GEDIT_METADATA_VERBOSE_DEBUG
- gedit_debug (DEBUG_METADATA);
+#ifdef GTEF_METADATA_VERBOSE_DEBUG
+ gtef_debug (DEBUG_METADATA);
#endif
if (xmlStrcmp (cur->name, (const xmlChar *)"document") != 0)
@@ -213,7 +213,7 @@ parseItem (xmlDocPtr doc, xmlNodePtr cur)
cur = cur->next;
}
- g_hash_table_insert (gedit_metadata_manager->items,
+ g_hash_table_insert (gtef_metadata_manager->items,
g_strdup ((gchar *)uri),
item);
@@ -228,27 +228,27 @@ load_values (void)
xmlDocPtr doc;
xmlNodePtr cur;
- gedit_debug (DEBUG_METADATA);
+ gtef_debug (DEBUG_METADATA);
- g_return_val_if_fail (gedit_metadata_manager != NULL, FALSE);
- g_return_val_if_fail (gedit_metadata_manager->values_loaded == FALSE, FALSE);
+ g_return_val_if_fail (gtef_metadata_manager != NULL, FALSE);
+ g_return_val_if_fail (gtef_metadata_manager->values_loaded == FALSE, FALSE);
- gedit_metadata_manager->values_loaded = TRUE;
+ gtef_metadata_manager->values_loaded = TRUE;
xmlKeepBlanksDefault (0);
- if (gedit_metadata_manager->metadata_filename == NULL)
+ if (gtef_metadata_manager->metadata_filename == NULL)
{
return FALSE;
}
/* TODO: avoid races */
- if (!g_file_test (gedit_metadata_manager->metadata_filename, G_FILE_TEST_EXISTS))
+ if (!g_file_test (gtef_metadata_manager->metadata_filename, G_FILE_TEST_EXISTS))
{
return TRUE;
}
- doc = xmlParseFile (gedit_metadata_manager->metadata_filename);
+ doc = xmlParseFile (gtef_metadata_manager->metadata_filename);
if (doc == NULL)
{
@@ -259,7 +259,7 @@ load_values (void)
if (cur == NULL)
{
g_message ("The metadata file '%s' is empty",
- g_path_get_basename (gedit_metadata_manager->metadata_filename));
+ g_path_get_basename (gtef_metadata_manager->metadata_filename));
xmlFreeDoc (doc);
return TRUE;
@@ -268,7 +268,7 @@ load_values (void)
if (xmlStrcmp (cur->name, (const xmlChar *) "metadata"))
{
g_message ("File '%s' is of the wrong type",
- g_path_get_basename (gedit_metadata_manager->metadata_filename));
+ g_path_get_basename (gtef_metadata_manager->metadata_filename));
xmlFreeDoc (doc);
return FALSE;
@@ -290,15 +290,15 @@ load_values (void)
}
/**
- * gedit_metadata_manager_get:
+ * gtef_metadata_manager_get:
* @location: a #GFile.
* @key: a key.
*
* Gets the value associated with the specified @key for the file @location.
*/
gchar *
-gedit_metadata_manager_get (GFile *location,
- const gchar *key)
+gtef_metadata_manager_get (GFile *location,
+ const gchar *key)
{
Item *item;
gchar *value;
@@ -309,9 +309,9 @@ gedit_metadata_manager_get (GFile *location,
uri = g_file_get_uri (location);
- gedit_debug_message (DEBUG_METADATA, "URI: %s --- key: %s", uri, key );
+ gtef_debug_message (DEBUG_METADATA, "URI: %s --- key: %s", uri, key );
- if (!gedit_metadata_manager->values_loaded)
+ if (!gtef_metadata_manager->values_loaded)
{
gboolean res;
@@ -324,7 +324,7 @@ gedit_metadata_manager_get (GFile *location,
}
}
- item = (Item *)g_hash_table_lookup (gedit_metadata_manager->items,
+ item = (Item *)g_hash_table_lookup (gtef_metadata_manager->items,
uri);
g_free (uri);
@@ -346,7 +346,7 @@ gedit_metadata_manager_get (GFile *location,
}
/**
- * gedit_metadata_manager_set:
+ * gtef_metadata_manager_set:
* @location: a #GFile.
* @key: a key.
* @value: the value associated with the @key.
@@ -354,9 +354,9 @@ gedit_metadata_manager_get (GFile *location,
* Sets the @key to contain the given @value for the file @location.
*/
void
-gedit_metadata_manager_set (GFile *location,
- const gchar *key,
- const gchar *value)
+gtef_metadata_manager_set (GFile *location,
+ const gchar *key,
+ const gchar *value)
{
Item *item;
gchar *uri;
@@ -366,9 +366,9 @@ gedit_metadata_manager_set (GFile *location,
uri = g_file_get_uri (location);
- gedit_debug_message (DEBUG_METADATA, "URI: %s --- key: %s --- value: %s", uri, key, value);
+ gtef_debug_message (DEBUG_METADATA, "URI: %s --- key: %s --- value: %s", uri, key, value);
- if (!gedit_metadata_manager->values_loaded)
+ if (!gtef_metadata_manager->values_loaded)
{
gboolean ok;
@@ -381,14 +381,14 @@ gedit_metadata_manager_set (GFile *location,
}
}
- item = (Item *)g_hash_table_lookup (gedit_metadata_manager->items,
+ item = (Item *)g_hash_table_lookup (gtef_metadata_manager->items,
uri);
if (item == NULL)
{
item = g_new0 (Item, 1);
- g_hash_table_insert (gedit_metadata_manager->items,
+ g_hash_table_insert (gtef_metadata_manager->items,
g_strdup (uri),
item);
}
@@ -417,7 +417,7 @@ gedit_metadata_manager_set (GFile *location,
g_free (uri);
- gedit_metadata_manager_arm_timeout ();
+ gtef_metadata_manager_arm_timeout ();
}
static void
@@ -425,8 +425,8 @@ save_values (const gchar *key, const gchar *value, xmlNodePtr parent)
{
xmlNodePtr xml_node;
-#ifdef GEDIT_METADATA_VERBOSE_DEBUG
- gedit_debug (DEBUG_METADATA);
+#ifdef GTEF_METADATA_VERBOSE_DEBUG
+ gtef_debug (DEBUG_METADATA);
#endif
g_return_if_fail (key != NULL);
@@ -446,8 +446,8 @@ save_values (const gchar *key, const gchar *value, xmlNodePtr parent)
(const xmlChar *)"value",
(const xmlChar *)value);
-#ifdef GEDIT_METADATA_VERBOSE_DEBUG
- gedit_debug_message (DEBUG_METADATA, "entry: %s = %s", key, value);
+#ifdef GTEF_METADATA_VERBOSE_DEBUG
+ gtef_debug_message (DEBUG_METADATA, "entry: %s = %s", key, value);
#endif
}
@@ -458,8 +458,8 @@ save_item (const gchar *key, const gpointer *data, xmlNodePtr parent)
const Item *item = (const Item *)data;
gchar *atime;
-#ifdef GEDIT_METADATA_VERBOSE_DEBUG
- gedit_debug (DEBUG_METADATA);
+#ifdef GTEF_METADATA_VERBOSE_DEBUG
+ gtef_debug (DEBUG_METADATA);
#endif
g_return_if_fail (key != NULL);
@@ -471,15 +471,15 @@ save_item (const gchar *key, const gpointer *data, xmlNodePtr parent)
xmlSetProp (xml_node, (const xmlChar *)"uri", (const xmlChar *)key);
-#ifdef GEDIT_METADATA_VERBOSE_DEBUG
- gedit_debug_message (DEBUG_METADATA, "uri: %s", key);
+#ifdef GTEF_METADATA_VERBOSE_DEBUG
+ gtef_debug_message (DEBUG_METADATA, "uri: %s", key);
#endif
atime = g_strdup_printf ("%" G_GINT64_FORMAT, item->atime);
xmlSetProp (xml_node, (const xmlChar *)"atime", (const xmlChar *)atime);
-#ifdef GEDIT_METADATA_VERBOSE_DEBUG
- gedit_debug_message (DEBUG_METADATA, "atime: %s", atime);
+#ifdef GTEF_METADATA_VERBOSE_DEBUG
+ gtef_debug_message (DEBUG_METADATA, "atime: %s", atime);
#endif
g_free (atime);
@@ -501,7 +501,7 @@ get_oldest (const gchar *key, const gpointer value, const gchar ** key_to_remove
else
{
const Item *item_to_remove =
- g_hash_table_lookup (gedit_metadata_manager->items,
+ g_hash_table_lookup (gtef_metadata_manager->items,
*key_to_remove);
g_return_if_fail (item_to_remove != NULL);
@@ -516,30 +516,30 @@ get_oldest (const gchar *key, const gpointer value, const gchar ** key_to_remove
static void
resize_items (void)
{
- while (g_hash_table_size (gedit_metadata_manager->items) > MAX_ITEMS)
+ while (g_hash_table_size (gtef_metadata_manager->items) > MAX_ITEMS)
{
gpointer key_to_remove = NULL;
- g_hash_table_foreach (gedit_metadata_manager->items,
+ g_hash_table_foreach (gtef_metadata_manager->items,
(GHFunc)get_oldest,
&key_to_remove);
g_return_if_fail (key_to_remove != NULL);
- g_hash_table_remove (gedit_metadata_manager->items,
+ g_hash_table_remove (gtef_metadata_manager->items,
key_to_remove);
}
}
static gboolean
-gedit_metadata_manager_save (gpointer data)
+gtef_metadata_manager_save (gpointer data)
{
xmlDocPtr doc;
xmlNodePtr root;
- gedit_debug (DEBUG_METADATA);
+ gtef_debug (DEBUG_METADATA);
- gedit_metadata_manager->timeout_id = 0;
+ gtef_metadata_manager->timeout_id = 0;
resize_items ();
@@ -553,22 +553,22 @@ gedit_metadata_manager_save (gpointer data)
root = xmlNewDocNode (doc, NULL, (const xmlChar *)"metadata", NULL);
xmlDocSetRootElement (doc, root);
- g_hash_table_foreach (gedit_metadata_manager->items,
+ g_hash_table_foreach (gtef_metadata_manager->items,
(GHFunc)save_item,
root);
/* FIXME: lock file - Paolo */
- if (gedit_metadata_manager->metadata_filename != NULL)
+ if (gtef_metadata_manager->metadata_filename != NULL)
{
gchar *cache_dir;
int res;
/* make sure the cache dir exists */
- cache_dir = g_path_get_dirname (gedit_metadata_manager->metadata_filename);
+ cache_dir = g_path_get_dirname (gtef_metadata_manager->metadata_filename);
res = g_mkdir_with_parents (cache_dir, 0755);
if (res != -1)
{
- xmlSaveFormatFile (gedit_metadata_manager->metadata_filename,
+ xmlSaveFormatFile (gtef_metadata_manager->metadata_filename,
doc,
1);
}
@@ -578,7 +578,7 @@ gedit_metadata_manager_save (gpointer data)
xmlFreeDoc (doc);
- gedit_debug_message (DEBUG_METADATA, "DONE");
+ gtef_debug_message (DEBUG_METADATA, "DONE");
return FALSE;
}
diff --git a/gedit/gedit-metadata-manager.h b/gedit/gtef/gtef-metadata-manager.h
similarity index 63%
rename from gedit/gedit-metadata-manager.h
rename to gedit/gtef/gtef-metadata-manager.h
index 07eac78..4062502 100644
--- a/gedit/gedit-metadata-manager.h
+++ b/gedit/gtef/gtef-metadata-manager.h
@@ -1,7 +1,7 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * gedit-metadata-manager.h
- * This file is part of gedit
+ * gtef-metadata-manager.h
+ * This file is part of gtef
*
* Copyright (C) 2003 Paolo Maggi
*
@@ -19,26 +19,26 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __GEDIT_METADATA_MANAGER_H__
-#define __GEDIT_METADATA_MANAGER_H__
+#ifndef __GTEF_METADATA_MANAGER_H__
+#define __GTEF_METADATA_MANAGER_H__
#include <gio/gio.h>
G_BEGIN_DECLS
-void gedit_metadata_manager_init (const gchar *metadata_filename);
+void gtef_metadata_manager_init (const gchar *metadata_filename);
-void gedit_metadata_manager_shutdown (void);
+void gtef_metadata_manager_shutdown (void);
-gchar *gedit_metadata_manager_get (GFile *location,
- const gchar *key);
-void gedit_metadata_manager_set (GFile *location,
- const gchar *key,
- const gchar *value);
+gchar *gtef_metadata_manager_get (GFile *location,
+ const gchar *key);
+void gtef_metadata_manager_set (GFile *location,
+ const gchar *key,
+ const gchar *value);
G_END_DECLS
-#endif /* __GEDIT_METADATA_MANAGER_H__ */
+#endif /* __GTEF_METADATA_MANAGER_H__ */
/* ex:set ts=8 noet: */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
