The unified diff between revisions [24286e63..] and [0930ec15..] is displayed below. It can also be downloaded as a raw diff.
#
#
# patch "sqlite-backend.c"
# from [74db82453bf277a45ef4c4e5763651b8e796a888]
# to [7a4eba4fcc8e67b93a93f9c74bf9e8f458b763f6]
#
============================================================
--- sqlite-backend.c 74db82453bf277a45ef4c4e5763651b8e796a888
+++ sqlite-backend.c 7a4eba4fcc8e67b93a93f9c74bf9e8f458b763f6
@@ -175,7 +175,6 @@ lock (GConfSource *source,
lock (GConfSource *source,
GError **err)
{
-
}
@@ -213,6 +212,7 @@ query_value (GConfSource *source,
GError **err)
{
+ return NULL;
}
static GConfMetaInfo*
@@ -221,6 +221,7 @@ query_metainfo (GConfSource *source,
GError **err)
{
+ return NULL;
}
static void
@@ -239,6 +240,7 @@ all_entries (GConfSource *source,
GError **err)
{
+ return NULL;
}
static GSList*
@@ -247,6 +249,7 @@ all_subdirs (GConfSource *source,
GError **err)
{
+ return NULL;
}
static void
@@ -264,6 +267,7 @@ dir_exists (GConfSource *source,
GError **err)
{
+ return FALSE;
}
static void
@@ -288,6 +292,7 @@ sync_all (GConfSource *source,
GError **err)
{
+ return FALSE;
}
static void
@@ -315,11 +320,14 @@ resolve_address (const char *address,
SqliteSource *new_source;
GConfLock *lock;
char *dbfile;
-
+
+ gconf_log (GCL_ERR, "sqlite module initialising, address=%s", address);
+
dbfile = gconf_address_resource (address);
if (!dbfile)
return NULL;
+
/* for now, let's ignore locking; sqlite does it anyway
* and probably better than we'd manage
*/
@@ -327,9 +335,27 @@ resolve_address (const char *address,
new_source = ss_new (dbfile, lock);
((GConfSource *)new_source)->flags = 0;
+ gconf_log (GCL_ERR, "sqlite dbfile at: %s\n", dbfile);
g_free (dbfile);
return (GConfSource *)new_source;
}
+/**************** EXPORT *********************/
+
+/* Initializer */
+
+G_MODULE_EXPORT const char*
+g_module_check_init (GModule *module)
+{
+ gconf_log (GCL_DEBUG, _("Initializing Markup backend module"));
+
+ return NULL;
+}
+
+G_MODULE_EXPORT GConfBackendVTable*
+gconf_backend_get_vtable (void)
+{
+ return &markup_vtable;
+}