[couchdb-glib: 3/6] Rename CouchDB to Couchdb.
- From: Rodrigo Moya <rodrigo src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [couchdb-glib: 3/6] Rename CouchDB to Couchdb.
- Date: Thu, 7 Jan 2010 13:44:06 +0000 (UTC)
commit b3642e861087f265d30b26c47f0efd4511422780
Author: Johan Dahlin <johan gnome org>
Date: Tue Dec 8 22:16:09 2009 -0200
Rename CouchDB to Couchdb.
This is necessary to make the introspection generation
work, since the api is called couchdb_* and not couch_db_*
couchdb-glib/couchdb-database-info.c | 32 +++---
couchdb-glib/couchdb-database-info.h | 20 ++--
couchdb-glib/couchdb-document-contact.c | 190 +++++++++++++++---------------
couchdb-glib/couchdb-document-contact.h | 172 ++++++++++++++--------------
couchdb-glib/couchdb-document-info.c | 24 ++--
couchdb-glib/couchdb-document-info.h | 10 +-
couchdb-glib/couchdb-document.c | 76 ++++++------
couchdb-glib/couchdb-document.h | 68 ++++++------
couchdb-glib/couchdb-struct-field.c | 62 +++++-----
couchdb-glib/couchdb-struct-field.h | 42 ++++----
couchdb-glib/couchdb-types.h | 10 +-
couchdb-glib/couchdb.c | 60 +++++-----
couchdb-glib/couchdb.h | 42 ++++----
couchdb-glib/dbwatch.c | 4 +-
couchdb-glib/dbwatch.h | 4 +-
tests/test-couchdb-glib.c | 22 ++--
tests/test-list-databases.c | 14 +-
tests/test-oauth.c | 4 +-
18 files changed, 428 insertions(+), 428 deletions(-)
---
diff --git a/couchdb-glib/couchdb-database-info.c b/couchdb-glib/couchdb-database-info.c
index 0b87952..b859b24 100644
--- a/couchdb-glib/couchdb-database-info.c
+++ b/couchdb-glib/couchdb-database-info.c
@@ -23,7 +23,7 @@
#include "couchdb-database-info.h"
-struct _CouchDBDatabaseInfo {
+struct _CouchdbDatabaseInfo {
gint ref_count;
char *dbname;
@@ -35,7 +35,7 @@ struct _CouchDBDatabaseInfo {
};
/*
- * CouchDBDatabaseInfo object
+ * CouchdbDatabaseInfo object
*/
GType
@@ -44,14 +44,14 @@ couchdb_database_info_get_type (void)
static GType object_type = 0;
if (G_UNLIKELY (!object_type))
- object_type = g_boxed_type_register_static (g_intern_static_string ("CouchDBDatabaseInfo"),
+ object_type = g_boxed_type_register_static (g_intern_static_string ("CouchdbDatabaseInfo"),
(GBoxedCopyFunc) couchdb_database_info_ref,
(GBoxedFreeFunc) couchdb_database_info_unref);
return object_type;
}
-CouchDBDatabaseInfo *
+CouchdbDatabaseInfo *
couchdb_database_info_new (const char *dbname,
gint doc_count,
gint doc_del_count,
@@ -59,9 +59,9 @@ couchdb_database_info_new (const char *dbname,
gboolean compact_running,
gint disk_size)
{
- CouchDBDatabaseInfo *dbinfo;
+ CouchdbDatabaseInfo *dbinfo;
- dbinfo = g_slice_new (CouchDBDatabaseInfo);
+ dbinfo = g_slice_new (CouchdbDatabaseInfo);
dbinfo->ref_count = 1;
dbinfo->dbname = g_strdup (dbname);
dbinfo->doc_count = doc_count;
@@ -73,8 +73,8 @@ couchdb_database_info_new (const char *dbname,
return dbinfo;
}
-CouchDBDatabaseInfo *
-couchdb_database_info_ref (CouchDBDatabaseInfo *dbinfo)
+CouchdbDatabaseInfo *
+couchdb_database_info_ref (CouchdbDatabaseInfo *dbinfo)
{
g_return_val_if_fail (dbinfo != NULL, NULL);
g_return_val_if_fail (dbinfo->ref_count > 0, NULL);
@@ -85,7 +85,7 @@ couchdb_database_info_ref (CouchDBDatabaseInfo *dbinfo)
}
void
-couchdb_database_info_unref (CouchDBDatabaseInfo *dbinfo)
+couchdb_database_info_unref (CouchdbDatabaseInfo *dbinfo)
{
gint old_ref;
@@ -97,12 +97,12 @@ couchdb_database_info_unref (CouchDBDatabaseInfo *dbinfo)
g_atomic_int_compare_and_exchange (&dbinfo->ref_count, old_ref, old_ref - 1);
else {
g_free (dbinfo->dbname);
- g_slice_free (CouchDBDatabaseInfo, dbinfo);
+ g_slice_free (CouchdbDatabaseInfo, dbinfo);
}
}
const char *
-couchdb_database_info_get_dbname (CouchDBDatabaseInfo *dbinfo)
+couchdb_database_info_get_dbname (CouchdbDatabaseInfo *dbinfo)
{
g_return_val_if_fail (dbinfo != NULL, NULL);
@@ -110,7 +110,7 @@ couchdb_database_info_get_dbname (CouchDBDatabaseInfo *dbinfo)
}
gint
-couchdb_database_info_get_documents_count (CouchDBDatabaseInfo *dbinfo)
+couchdb_database_info_get_documents_count (CouchdbDatabaseInfo *dbinfo)
{
g_return_val_if_fail (dbinfo != NULL, 0);
@@ -118,7 +118,7 @@ couchdb_database_info_get_documents_count (CouchDBDatabaseInfo *dbinfo)
}
gint
-couchdb_database_info_get_deleted_documents_count (CouchDBDatabaseInfo *dbinfo)
+couchdb_database_info_get_deleted_documents_count (CouchdbDatabaseInfo *dbinfo)
{
g_return_val_if_fail (dbinfo != NULL, 0);
@@ -126,7 +126,7 @@ couchdb_database_info_get_deleted_documents_count (CouchDBDatabaseInfo *dbinfo)
}
gint
-couchdb_database_info_get_update_sequence (CouchDBDatabaseInfo *dbinfo)
+couchdb_database_info_get_update_sequence (CouchdbDatabaseInfo *dbinfo)
{
g_return_val_if_fail (dbinfo != NULL, 0);
@@ -134,7 +134,7 @@ couchdb_database_info_get_update_sequence (CouchDBDatabaseInfo *dbinfo)
}
gboolean
-couchdb_database_info_is_compact_running (CouchDBDatabaseInfo *dbinfo)
+couchdb_database_info_is_compact_running (CouchdbDatabaseInfo *dbinfo)
{
g_return_val_if_fail (dbinfo != NULL, FALSE);
@@ -142,7 +142,7 @@ couchdb_database_info_is_compact_running (CouchDBDatabaseInfo *dbinfo)
}
gint
-couchdb_database_info_get_disk_size (CouchDBDatabaseInfo *dbinfo)
+couchdb_database_info_get_disk_size (CouchdbDatabaseInfo *dbinfo)
{
g_return_val_if_fail (dbinfo != NULL, 0);
diff --git a/couchdb-glib/couchdb-database-info.h b/couchdb-glib/couchdb-database-info.h
index d2361bd..071b06b 100644
--- a/couchdb-glib/couchdb-database-info.h
+++ b/couchdb-glib/couchdb-database-info.h
@@ -33,21 +33,21 @@ G_BEGIN_DECLS
#define COUCHDB_TYPE_DATABASE_INFO (couchdb_database_info_get_type ())
/*
- * CouchDBDatabaseInfo
+ * CouchdbDatabaseInfo
*/
GType couchdb_database_info_get_type (void);
-CouchDBDatabaseInfo *couchdb_database_info_ref (CouchDBDatabaseInfo *dbinfo);
-void couchdb_database_info_unref (CouchDBDatabaseInfo *dbinfo);
+CouchdbDatabaseInfo *couchdb_database_info_ref (CouchdbDatabaseInfo *dbinfo);
+void couchdb_database_info_unref (CouchdbDatabaseInfo *dbinfo);
-const char *couchdb_database_info_get_dbname (CouchDBDatabaseInfo *dbinfo);
-gint couchdb_database_info_get_documents_count (CouchDBDatabaseInfo *dbinfo);
-gint couchdb_database_info_get_deleted_documents_count (CouchDBDatabaseInfo *dbinfo);
-gint couchdb_database_info_get_update_sequence (CouchDBDatabaseInfo *dbinfo);
-gboolean couchdb_database_info_is_compact_running (CouchDBDatabaseInfo *dbinfo);
-gint couchdb_database_info_get_disk_size (CouchDBDatabaseInfo *dbinfo);
+const char *couchdb_database_info_get_dbname (CouchdbDatabaseInfo *dbinfo);
+gint couchdb_database_info_get_documents_count (CouchdbDatabaseInfo *dbinfo);
+gint couchdb_database_info_get_deleted_documents_count (CouchdbDatabaseInfo *dbinfo);
+gint couchdb_database_info_get_update_sequence (CouchdbDatabaseInfo *dbinfo);
+gboolean couchdb_database_info_is_compact_running (CouchdbDatabaseInfo *dbinfo);
+gint couchdb_database_info_get_disk_size (CouchdbDatabaseInfo *dbinfo);
-CouchDBDatabaseInfo* couchdb_database_info_new (const char *dbname,
+CouchdbDatabaseInfo* couchdb_database_info_new (const char *dbname,
gint doc_count,
gint doc_del_count,
gint update_seq,
diff --git a/couchdb-glib/couchdb-document-contact.c b/couchdb-glib/couchdb-document-contact.c
index 47b3b3a..677a2e9 100644
--- a/couchdb-glib/couchdb-document-contact.c
+++ b/couchdb-glib/couchdb-document-contact.c
@@ -22,10 +22,10 @@
#include "couchdb-document-contact.h"
#include "utils.h"
-CouchDBDocument *
-couchdb_document_contact_new (CouchDB *couchdb)
+CouchdbDocument *
+couchdb_document_contact_new (Couchdb *couchdb)
{
- CouchDBDocument *document;
+ CouchdbDocument *document;
g_return_val_if_fail (COUCHDB_IS (couchdb), NULL);
@@ -37,7 +37,7 @@ couchdb_document_contact_new (CouchDB *couchdb)
}
gboolean
-couchdb_document_is_contact (CouchDBDocument *document)
+couchdb_document_is_contact (CouchdbDocument *document)
{
g_return_val_if_fail (COUCHDB_IS_DOCUMENT (document), FALSE);
@@ -46,7 +46,7 @@ couchdb_document_is_contact (CouchDBDocument *document)
}
const char *
-couchdb_document_contact_get_first_name (CouchDBDocument *document)
+couchdb_document_contact_get_first_name (CouchdbDocument *document)
{
g_return_val_if_fail (COUCHDB_IS_DOCUMENT (document), NULL);
g_return_val_if_fail (couchdb_document_is_contact (document), NULL);
@@ -55,7 +55,7 @@ couchdb_document_contact_get_first_name (CouchDBDocument *document)
}
void
-couchdb_document_contact_set_first_name (CouchDBDocument *document, const char *first_name)
+couchdb_document_contact_set_first_name (CouchdbDocument *document, const char *first_name)
{
g_return_if_fail (COUCHDB_IS_DOCUMENT (document));
g_return_if_fail (couchdb_document_is_contact (document));
@@ -65,7 +65,7 @@ couchdb_document_contact_set_first_name (CouchDBDocument *document, const char *
}
const char *
-couchdb_document_contact_get_last_name (CouchDBDocument *document)
+couchdb_document_contact_get_last_name (CouchdbDocument *document)
{
g_return_val_if_fail (COUCHDB_IS_DOCUMENT (document), NULL);
g_return_val_if_fail (couchdb_document_is_contact (document), NULL);
@@ -74,7 +74,7 @@ couchdb_document_contact_get_last_name (CouchDBDocument *document)
}
void
-couchdb_document_contact_set_last_name (CouchDBDocument *document, const char *last_name)
+couchdb_document_contact_set_last_name (CouchdbDocument *document, const char *last_name)
{
g_return_if_fail (COUCHDB_IS_DOCUMENT (document));
g_return_if_fail (couchdb_document_is_contact (document));
@@ -84,7 +84,7 @@ couchdb_document_contact_set_last_name (CouchDBDocument *document, const char *l
}
const char *
-couchdb_document_contact_get_nick_name (CouchDBDocument *document)
+couchdb_document_contact_get_nick_name (CouchdbDocument *document)
{
g_return_val_if_fail (COUCHDB_IS_DOCUMENT (document), NULL);
g_return_val_if_fail (couchdb_document_is_contact (document), NULL);
@@ -93,7 +93,7 @@ couchdb_document_contact_get_nick_name (CouchDBDocument *document)
}
void
-couchdb_document_contact_set_nick_name (CouchDBDocument *document, const char *nick_name)
+couchdb_document_contact_set_nick_name (CouchdbDocument *document, const char *nick_name)
{
g_return_if_fail (COUCHDB_IS_DOCUMENT (document));
g_return_if_fail (couchdb_document_is_contact (document));
@@ -103,7 +103,7 @@ couchdb_document_contact_set_nick_name (CouchDBDocument *document, const char *n
}
const char *
-couchdb_document_contact_get_spouse_name (CouchDBDocument *document)
+couchdb_document_contact_get_spouse_name (CouchdbDocument *document)
{
g_return_val_if_fail (COUCHDB_IS_DOCUMENT (document), NULL);
g_return_val_if_fail (couchdb_document_is_contact (document), NULL);
@@ -112,7 +112,7 @@ couchdb_document_contact_get_spouse_name (CouchDBDocument *document)
}
void
-couchdb_document_contact_set_spouse_name (CouchDBDocument *document, const char *spouse_name)
+couchdb_document_contact_set_spouse_name (CouchdbDocument *document, const char *spouse_name)
{
g_return_if_fail (COUCHDB_IS_DOCUMENT (document));
g_return_if_fail (couchdb_document_is_contact (document));
@@ -122,7 +122,7 @@ couchdb_document_contact_set_spouse_name (CouchDBDocument *document, const char
}
const char *
-couchdb_document_contact_get_birth_date (CouchDBDocument *document)
+couchdb_document_contact_get_birth_date (CouchdbDocument *document)
{
JsonObject *object;
@@ -133,7 +133,7 @@ couchdb_document_contact_get_birth_date (CouchDBDocument *document)
}
void
-couchdb_document_contact_set_birth_date (CouchDBDocument *document, const char *birth_date)
+couchdb_document_contact_set_birth_date (CouchdbDocument *document, const char *birth_date)
{
g_return_if_fail (COUCHDB_IS_DOCUMENT (document));
g_return_if_fail (couchdb_document_is_contact (document));
@@ -143,7 +143,7 @@ couchdb_document_contact_set_birth_date (CouchDBDocument *document, const char *
}
const char *
-couchdb_document_contact_get_wedding_date (CouchDBDocument *document)
+couchdb_document_contact_get_wedding_date (CouchdbDocument *document)
{
JsonObject *object;
@@ -154,7 +154,7 @@ couchdb_document_contact_get_wedding_date (CouchDBDocument *document)
}
void
-couchdb_document_contact_set_wedding_date (CouchDBDocument *document, const char *wedding_date)
+couchdb_document_contact_set_wedding_date (CouchdbDocument *document, const char *wedding_date)
{
g_return_if_fail (COUCHDB_IS_DOCUMENT (document));
g_return_if_fail (couchdb_document_is_contact (document));
@@ -164,7 +164,7 @@ couchdb_document_contact_set_wedding_date (CouchDBDocument *document, const char
}
const char *
-couchdb_document_contact_get_company (CouchDBDocument *document)
+couchdb_document_contact_get_company (CouchdbDocument *document)
{
g_return_val_if_fail (COUCHDB_IS_DOCUMENT (document), NULL);
g_return_val_if_fail (couchdb_document_is_contact (document), NULL);
@@ -173,7 +173,7 @@ couchdb_document_contact_get_company (CouchDBDocument *document)
}
void
-couchdb_document_contact_set_company (CouchDBDocument *document, const char *company)
+couchdb_document_contact_set_company (CouchdbDocument *document, const char *company)
{
g_return_if_fail (COUCHDB_IS_DOCUMENT (document));
g_return_if_fail (couchdb_document_is_contact (document));
@@ -183,7 +183,7 @@ couchdb_document_contact_set_company (CouchDBDocument *document, const char *com
}
const char *
-couchdb_document_contact_get_department (CouchDBDocument *document)
+couchdb_document_contact_get_department (CouchdbDocument *document)
{
g_return_val_if_fail (COUCHDB_IS_DOCUMENT (document), NULL);
g_return_val_if_fail (couchdb_document_is_contact (document), NULL);
@@ -192,7 +192,7 @@ couchdb_document_contact_get_department (CouchDBDocument *document)
}
void
-couchdb_document_contact_set_department (CouchDBDocument *document, const char *department)
+couchdb_document_contact_set_department (CouchdbDocument *document, const char *department)
{
g_return_if_fail (COUCHDB_IS_DOCUMENT (document));
g_return_if_fail (couchdb_document_is_contact (document));
@@ -202,7 +202,7 @@ couchdb_document_contact_set_department (CouchDBDocument *document, const char *
}
const char *
-couchdb_document_contact_get_title (CouchDBDocument *document)
+couchdb_document_contact_get_title (CouchdbDocument *document)
{
g_return_val_if_fail (COUCHDB_IS_DOCUMENT (document), NULL);
g_return_val_if_fail (couchdb_document_is_contact (document), NULL);
@@ -211,7 +211,7 @@ couchdb_document_contact_get_title (CouchDBDocument *document)
}
void
-couchdb_document_contact_set_title (CouchDBDocument *document, const char *title)
+couchdb_document_contact_set_title (CouchdbDocument *document, const char *title)
{
g_return_if_fail (COUCHDB_IS_DOCUMENT (document));
g_return_if_fail (couchdb_document_is_contact (document));
@@ -221,7 +221,7 @@ couchdb_document_contact_set_title (CouchDBDocument *document, const char *title
}
const char *
-couchdb_document_contact_get_job_title (CouchDBDocument *document)
+couchdb_document_contact_get_job_title (CouchdbDocument *document)
{
g_return_val_if_fail (COUCHDB_IS_DOCUMENT (document), NULL);
g_return_val_if_fail (couchdb_document_is_contact (document), NULL);
@@ -230,7 +230,7 @@ couchdb_document_contact_get_job_title (CouchDBDocument *document)
}
void
-couchdb_document_contact_set_job_title (CouchDBDocument *document, const char *job_title)
+couchdb_document_contact_set_job_title (CouchdbDocument *document, const char *job_title)
{
g_return_if_fail (COUCHDB_IS_DOCUMENT (document));
g_return_if_fail (couchdb_document_is_contact (document));
@@ -240,7 +240,7 @@ couchdb_document_contact_set_job_title (CouchDBDocument *document, const char *j
}
const char *
-couchdb_document_contact_get_manager_name (CouchDBDocument *document)
+couchdb_document_contact_get_manager_name (CouchdbDocument *document)
{
g_return_val_if_fail (COUCHDB_IS_DOCUMENT (document), NULL);
g_return_val_if_fail (couchdb_document_is_contact (document), NULL);
@@ -249,7 +249,7 @@ couchdb_document_contact_get_manager_name (CouchDBDocument *document)
}
void
-couchdb_document_contact_set_manager_name (CouchDBDocument *document, const char *manager_name)
+couchdb_document_contact_set_manager_name (CouchdbDocument *document, const char *manager_name)
{
g_return_if_fail (COUCHDB_IS_DOCUMENT (document));
g_return_if_fail (couchdb_document_is_contact (document));
@@ -259,7 +259,7 @@ couchdb_document_contact_set_manager_name (CouchDBDocument *document, const char
}
const char *
-couchdb_document_contact_get_assistant_name (CouchDBDocument *document)
+couchdb_document_contact_get_assistant_name (CouchdbDocument *document)
{
g_return_val_if_fail (COUCHDB_IS_DOCUMENT (document), NULL);
g_return_val_if_fail (couchdb_document_is_contact (document), NULL);
@@ -268,7 +268,7 @@ couchdb_document_contact_get_assistant_name (CouchDBDocument *document)
}
void
-couchdb_document_contact_set_assistant_name (CouchDBDocument *document, const char *assistant_name)
+couchdb_document_contact_set_assistant_name (CouchdbDocument *document, const char *assistant_name)
{
g_return_if_fail (COUCHDB_IS_DOCUMENT (document));
g_return_if_fail (couchdb_document_is_contact (document));
@@ -278,7 +278,7 @@ couchdb_document_contact_set_assistant_name (CouchDBDocument *document, const ch
}
const char *
-couchdb_document_contact_get_office (CouchDBDocument *document)
+couchdb_document_contact_get_office (CouchdbDocument *document)
{
g_return_val_if_fail (COUCHDB_IS_DOCUMENT (document), NULL);
g_return_val_if_fail (couchdb_document_is_contact (document), NULL);
@@ -287,7 +287,7 @@ couchdb_document_contact_get_office (CouchDBDocument *document)
}
void
-couchdb_document_contact_set_office (CouchDBDocument *document, const char *office)
+couchdb_document_contact_set_office (CouchdbDocument *document, const char *office)
{
g_return_if_fail (COUCHDB_IS_DOCUMENT (document));
g_return_if_fail (couchdb_document_is_contact (document));
@@ -305,7 +305,7 @@ foreach_object_cb (JsonObject *object,
GSList **list = (GSList **) user_data;
if (json_node_get_node_type (member_node) == JSON_NODE_OBJECT) {
- CouchDBStructField *sf;
+ CouchdbStructField *sf;
sf = couchdb_struct_field_new_from_json_object (
json_object_ref (json_node_get_object (member_node)));
@@ -316,19 +316,19 @@ foreach_object_cb (JsonObject *object,
/**
* couchdb_document_contact_get_email_addresses:
- * @document: A #CouchDBDocument object representing a contact
+ * @document: A #CouchdbDocument object representing a contact
*
* Retrieve a list of email addresses from the specified contact document.
- * Email addresses are returned in a GSList of #CouchDBStructField objects,
+ * Email addresses are returned in a GSList of #CouchdbStructField objects,
* which can be manipulated with the couchdb_document_contact_email_* functions
* and freed with:
* g_slist_foreach (list, (GFunc) couchdb_struct_field_unref, NULL);
* g_slist_free (list);
*
- * Return value: a #GSList of #CouchDBStructField objects.
+ * Return value: a #GSList of #CouchdbStructField objects.
*/
GSList *
-couchdb_document_contact_get_email_addresses (CouchDBDocument *document)
+couchdb_document_contact_get_email_addresses (CouchdbDocument *document)
{
GSList *list = NULL;
JsonObject *addresses_json;
@@ -348,7 +348,7 @@ couchdb_document_contact_get_email_addresses (CouchDBDocument *document)
}
void
-couchdb_document_contact_set_email_addresses (CouchDBDocument *document, GSList *list)
+couchdb_document_contact_set_email_addresses (CouchdbDocument *document, GSList *list)
{
GSList *l;
JsonObject *addresses_json;
@@ -358,7 +358,7 @@ couchdb_document_contact_set_email_addresses (CouchDBDocument *document, GSList
addresses_json = json_object_new ();
for (l = list; l != NULL; l = l->next) {
const gchar *address_str;
- CouchDBStructField *sf = (CouchDBStructField *) l->data;
+ CouchdbStructField *sf = (CouchdbStructField *) l->data;
address_str = couchdb_document_contact_email_get_address (sf);
if (address_str) {
@@ -379,7 +379,7 @@ couchdb_document_contact_set_email_addresses (CouchDBDocument *document, GSList
}
GSList *
-couchdb_document_contact_get_phone_numbers (CouchDBDocument *document)
+couchdb_document_contact_get_phone_numbers (CouchdbDocument *document)
{
GSList *list = NULL;
JsonObject *phone_numbers;
@@ -399,7 +399,7 @@ couchdb_document_contact_get_phone_numbers (CouchDBDocument *document)
}
void
-couchdb_document_contact_set_phone_numbers (CouchDBDocument *document, GSList *list)
+couchdb_document_contact_set_phone_numbers (CouchdbDocument *document, GSList *list)
{
GSList *l;
JsonObject *phone_numbers;
@@ -409,7 +409,7 @@ couchdb_document_contact_set_phone_numbers (CouchDBDocument *document, GSList *l
phone_numbers = json_object_new ();
for (l = list; l != NULL; l = l->next) {
const gchar *number_str;
- CouchDBStructField *sf = (CouchDBStructField *) l->data;
+ CouchdbStructField *sf = (CouchdbStructField *) l->data;
number_str = couchdb_document_contact_phone_get_number (sf);
if (number_str) {
@@ -432,7 +432,7 @@ couchdb_document_contact_set_phone_numbers (CouchDBDocument *document, GSList *l
}
GSList *
-couchdb_document_contact_get_addresses (CouchDBDocument *document)
+couchdb_document_contact_get_addresses (CouchdbDocument *document)
{
GSList *list = NULL;
JsonObject *addresses;
@@ -452,7 +452,7 @@ couchdb_document_contact_get_addresses (CouchDBDocument *document)
}
void
-couchdb_document_contact_set_addresses (CouchDBDocument *document, GSList *list)
+couchdb_document_contact_set_addresses (CouchdbDocument *document, GSList *list)
{
GSList *l;
JsonObject *addresses;
@@ -462,7 +462,7 @@ couchdb_document_contact_set_addresses (CouchDBDocument *document, GSList *list)
addresses = json_object_new ();
for (l = list; l != NULL; l = l->next) {
const gchar *street_str;
- CouchDBStructField *sf = (CouchDBStructField *) l->data;
+ CouchdbStructField *sf = (CouchdbStructField *) l->data;
street_str = couchdb_document_contact_address_get_street (sf);
if (street_str) {
@@ -493,7 +493,7 @@ couchdb_document_contact_set_addresses (CouchDBDocument *document, GSList *list)
}
GSList *
-couchdb_document_contact_get_im_addresses (CouchDBDocument *document)
+couchdb_document_contact_get_im_addresses (CouchdbDocument *document)
{
GSList *list = NULL;
JsonObject *im_addresses;
@@ -513,7 +513,7 @@ couchdb_document_contact_get_im_addresses (CouchDBDocument *document)
}
void
-couchdb_document_contact_set_im_addresses (CouchDBDocument *document, GSList *list)
+couchdb_document_contact_set_im_addresses (CouchdbDocument *document, GSList *list)
{
GSList *l;
JsonObject *im_addresses_json;
@@ -523,7 +523,7 @@ couchdb_document_contact_set_im_addresses (CouchDBDocument *document, GSList *li
im_addresses_json = json_object_new ();
for (l = list; l != NULL; l = l->next) {
const gchar *address_str;
- CouchDBStructField *sf = (CouchDBStructField *) l->data;
+ CouchdbStructField *sf = (CouchdbStructField *) l->data;
address_str = couchdb_document_contact_im_get_address (sf);
if (address_str != NULL) {
@@ -546,7 +546,7 @@ couchdb_document_contact_set_im_addresses (CouchDBDocument *document, GSList *li
}
GSList *
-couchdb_document_contact_get_urls (CouchDBDocument *document)
+couchdb_document_contact_get_urls (CouchdbDocument *document)
{
GSList *list = NULL;
JsonObject *urls;
@@ -566,7 +566,7 @@ couchdb_document_contact_get_urls (CouchDBDocument *document)
}
void
-couchdb_document_contact_set_urls (CouchDBDocument *document, GSList *list)
+couchdb_document_contact_set_urls (CouchdbDocument *document, GSList *list)
{
GSList *l;
JsonObject *urls_json;
@@ -576,7 +576,7 @@ couchdb_document_contact_set_urls (CouchDBDocument *document, GSList *list)
urls_json = json_object_new ();
for (l = list; l != NULL; l = l->next) {
const gchar *address_str;
- CouchDBStructField *sf = (CouchDBStructField *) l->data;
+ CouchdbStructField *sf = (CouchdbStructField *) l->data;
address_str = couchdb_document_contact_url_get_address (sf);
if (address_str) {
@@ -597,7 +597,7 @@ couchdb_document_contact_set_urls (CouchDBDocument *document, GSList *list)
}
const char *
-couchdb_document_contact_get_notes (CouchDBDocument *document)
+couchdb_document_contact_get_notes (CouchdbDocument *document)
{
g_return_val_if_fail (COUCHDB_IS_DOCUMENT (document), NULL);
g_return_val_if_fail (couchdb_document_is_contact (document), NULL);
@@ -606,7 +606,7 @@ couchdb_document_contact_get_notes (CouchDBDocument *document)
}
void
-couchdb_document_contact_set_notes (CouchDBDocument *document, const char *notes)
+couchdb_document_contact_set_notes (CouchdbDocument *document, const char *notes)
{
g_return_if_fail (COUCHDB_IS_DOCUMENT (document));
g_return_if_fail (couchdb_document_is_contact (document));
@@ -615,10 +615,10 @@ couchdb_document_contact_set_notes (CouchDBDocument *document, const char *notes
couchdb_document_set_string_field (document, "notes", notes);
}
-CouchDBStructField *
+CouchdbStructField *
couchdb_document_contact_email_new (const char *uuid, const char *address, const char *description)
{
- CouchDBStructField *sf;
+ CouchdbStructField *sf;
sf = couchdb_struct_field_new_from_json_object (json_object_new ());
if (uuid != NULL)
@@ -638,7 +638,7 @@ couchdb_document_contact_email_new (const char *uuid, const char *address, const
}
const char *
-couchdb_document_contact_email_get_address (CouchDBStructField *sf)
+couchdb_document_contact_email_get_address (CouchdbStructField *sf)
{
g_return_val_if_fail (sf != NULL, NULL);
@@ -646,7 +646,7 @@ couchdb_document_contact_email_get_address (CouchDBStructField *sf)
}
void
-couchdb_document_contact_email_set_address (CouchDBStructField *sf, const char *email)
+couchdb_document_contact_email_set_address (CouchdbStructField *sf, const char *email)
{
g_return_if_fail (sf != NULL);
g_return_if_fail (email != NULL);
@@ -655,7 +655,7 @@ couchdb_document_contact_email_set_address (CouchDBStructField *sf, const char *
}
const char *
-couchdb_document_contact_email_get_description (CouchDBStructField *sf)
+couchdb_document_contact_email_get_description (CouchdbStructField *sf)
{
g_return_val_if_fail (sf != NULL, NULL);
@@ -663,17 +663,17 @@ couchdb_document_contact_email_get_description (CouchDBStructField *sf)
}
void
-couchdb_document_contact_email_set_description (CouchDBStructField *sf, const char *description)
+couchdb_document_contact_email_set_description (CouchdbStructField *sf, const char *description)
{
g_return_if_fail (sf != NULL);
couchdb_struct_field_set_string_field (sf, "description", description);
}
-CouchDBStructField *
+CouchdbStructField *
couchdb_document_contact_phone_new (const char *uuid, const char *number, const char *description, gint priority)
{
- CouchDBStructField *sf;
+ CouchdbStructField *sf;
sf = couchdb_struct_field_new_from_json_object (json_object_new ());
if (uuid != NULL)
@@ -694,7 +694,7 @@ couchdb_document_contact_phone_new (const char *uuid, const char *number, const
}
gint
-couchdb_document_contact_phone_get_priority (CouchDBStructField *sf)
+couchdb_document_contact_phone_get_priority (CouchdbStructField *sf)
{
g_return_val_if_fail (sf != NULL, 0);
@@ -702,7 +702,7 @@ couchdb_document_contact_phone_get_priority (CouchDBStructField *sf)
}
void
-couchdb_document_contact_phone_set_priority (CouchDBStructField *sf, gint priority)
+couchdb_document_contact_phone_set_priority (CouchdbStructField *sf, gint priority)
{
g_return_if_fail (sf != NULL);
@@ -710,7 +710,7 @@ couchdb_document_contact_phone_set_priority (CouchDBStructField *sf, gint priori
}
const char *
-couchdb_document_contact_phone_get_number (CouchDBStructField *sf)
+couchdb_document_contact_phone_get_number (CouchdbStructField *sf)
{
g_return_val_if_fail (sf != NULL, NULL);
@@ -718,7 +718,7 @@ couchdb_document_contact_phone_get_number (CouchDBStructField *sf)
}
void
-couchdb_document_contact_phone_set_number (CouchDBStructField *sf, const char *number)
+couchdb_document_contact_phone_set_number (CouchdbStructField *sf, const char *number)
{
g_return_if_fail (sf != NULL);
g_return_if_fail (number != NULL);
@@ -727,7 +727,7 @@ couchdb_document_contact_phone_set_number (CouchDBStructField *sf, const char *n
}
const char *
-couchdb_document_contact_phone_get_description (CouchDBStructField *sf)
+couchdb_document_contact_phone_get_description (CouchdbStructField *sf)
{
g_return_val_if_fail (sf != NULL, NULL);
@@ -735,14 +735,14 @@ couchdb_document_contact_phone_get_description (CouchDBStructField *sf)
}
void
-couchdb_document_contact_phone_set_description (CouchDBStructField *sf, const char *description)
+couchdb_document_contact_phone_set_description (CouchdbStructField *sf, const char *description)
{
g_return_if_fail (sf != NULL);
couchdb_struct_field_set_string_field (sf, "description", description);
}
-CouchDBStructField *
+CouchdbStructField *
couchdb_document_contact_address_new (const char *uuid,
const char *street,
const char *city,
@@ -752,7 +752,7 @@ couchdb_document_contact_address_new (const char *uuid,
const char *pobox,
const char *description)
{
- CouchDBStructField *sf;
+ CouchdbStructField *sf;
sf = couchdb_struct_field_new_from_json_object (json_object_new ());
if (uuid != NULL)
@@ -782,7 +782,7 @@ couchdb_document_contact_address_new (const char *uuid,
}
const char *
-couchdb_document_contact_address_get_street (CouchDBStructField *sf)
+couchdb_document_contact_address_get_street (CouchdbStructField *sf)
{
g_return_val_if_fail (sf != NULL, NULL);
@@ -790,7 +790,7 @@ couchdb_document_contact_address_get_street (CouchDBStructField *sf)
}
void
-couchdb_document_contact_address_set_street (CouchDBStructField *sf, const char *street)
+couchdb_document_contact_address_set_street (CouchdbStructField *sf, const char *street)
{
g_return_if_fail (sf != NULL);
@@ -798,7 +798,7 @@ couchdb_document_contact_address_set_street (CouchDBStructField *sf, const char
}
const char *
-couchdb_document_contact_address_get_city (CouchDBStructField *sf)
+couchdb_document_contact_address_get_city (CouchdbStructField *sf)
{
g_return_val_if_fail (sf != NULL, NULL);
@@ -806,7 +806,7 @@ couchdb_document_contact_address_get_city (CouchDBStructField *sf)
}
void
-couchdb_document_contact_address_set_city (CouchDBStructField *sf, const char *city)
+couchdb_document_contact_address_set_city (CouchdbStructField *sf, const char *city)
{
g_return_if_fail (sf != NULL);
@@ -814,7 +814,7 @@ couchdb_document_contact_address_set_city (CouchDBStructField *sf, const char *c
}
const char *
-couchdb_document_contact_address_get_state (CouchDBStructField *sf)
+couchdb_document_contact_address_get_state (CouchdbStructField *sf)
{
g_return_val_if_fail (sf != NULL, NULL);
@@ -822,7 +822,7 @@ couchdb_document_contact_address_get_state (CouchDBStructField *sf)
}
void
-couchdb_document_contact_address_set_state (CouchDBStructField *sf, const char *state)
+couchdb_document_contact_address_set_state (CouchdbStructField *sf, const char *state)
{
g_return_if_fail (sf != NULL);
@@ -830,7 +830,7 @@ couchdb_document_contact_address_set_state (CouchDBStructField *sf, const char *
}
const char *
-couchdb_document_contact_address_get_country (CouchDBStructField *sf)
+couchdb_document_contact_address_get_country (CouchdbStructField *sf)
{
g_return_val_if_fail (sf != NULL, NULL);
@@ -838,7 +838,7 @@ couchdb_document_contact_address_get_country (CouchDBStructField *sf)
}
void
-couchdb_document_contact_address_set_country (CouchDBStructField *sf, const char *country)
+couchdb_document_contact_address_set_country (CouchdbStructField *sf, const char *country)
{
g_return_if_fail (sf != NULL);
@@ -846,7 +846,7 @@ couchdb_document_contact_address_set_country (CouchDBStructField *sf, const char
}
const char *
-couchdb_document_contact_address_get_postalcode (CouchDBStructField *sf)
+couchdb_document_contact_address_get_postalcode (CouchdbStructField *sf)
{
g_return_val_if_fail (sf != NULL, NULL);
@@ -854,7 +854,7 @@ couchdb_document_contact_address_get_postalcode (CouchDBStructField *sf)
}
void
-couchdb_document_contact_address_set_postalcode (CouchDBStructField *sf, const char *postalcode)
+couchdb_document_contact_address_set_postalcode (CouchdbStructField *sf, const char *postalcode)
{
g_return_if_fail (sf != NULL);
@@ -862,7 +862,7 @@ couchdb_document_contact_address_set_postalcode (CouchDBStructField *sf, const c
}
const char *
-couchdb_document_contact_address_get_pobox (CouchDBStructField *sf)
+couchdb_document_contact_address_get_pobox (CouchdbStructField *sf)
{
g_return_val_if_fail (sf != NULL, NULL);
@@ -870,7 +870,7 @@ couchdb_document_contact_address_get_pobox (CouchDBStructField *sf)
}
void
-couchdb_document_contact_address_set_pobox (CouchDBStructField *sf, const char *pobox)
+couchdb_document_contact_address_set_pobox (CouchdbStructField *sf, const char *pobox)
{
g_return_if_fail (sf != NULL);
@@ -878,7 +878,7 @@ couchdb_document_contact_address_set_pobox (CouchDBStructField *sf, const char *
}
const char *
-couchdb_document_contact_address_get_description (CouchDBStructField *sf)
+couchdb_document_contact_address_get_description (CouchdbStructField *sf)
{
g_return_val_if_fail (sf != NULL, NULL);
@@ -886,20 +886,20 @@ couchdb_document_contact_address_get_description (CouchDBStructField *sf)
}
void
-couchdb_document_contact_address_set_description (CouchDBStructField *sf, const char *description)
+couchdb_document_contact_address_set_description (CouchdbStructField *sf, const char *description)
{
g_return_if_fail (sf != NULL);
couchdb_struct_field_set_string_field (sf, "description", description);
}
-CouchDBStructField *
+CouchdbStructField *
couchdb_document_contact_im_new (const char *uuid,
const char *address,
const char *description,
const char *protocol)
{
- CouchDBStructField *sf;
+ CouchdbStructField *sf;
sf = couchdb_struct_field_new_from_json_object (json_object_new ());
if (uuid != NULL)
@@ -921,7 +921,7 @@ couchdb_document_contact_im_new (const char *uuid,
}
const char *
-couchdb_document_contact_im_get_address (CouchDBStructField *sf)
+couchdb_document_contact_im_get_address (CouchdbStructField *sf)
{
g_return_val_if_fail (sf != NULL, NULL);
@@ -929,7 +929,7 @@ couchdb_document_contact_im_get_address (CouchDBStructField *sf)
}
void
-couchdb_document_contact_im_set_address (CouchDBStructField *sf, const char *address)
+couchdb_document_contact_im_set_address (CouchdbStructField *sf, const char *address)
{
g_return_if_fail (sf != NULL);
g_return_if_fail (address != NULL);
@@ -938,7 +938,7 @@ couchdb_document_contact_im_set_address (CouchDBStructField *sf, const char *add
}
const char *
-couchdb_document_contact_im_get_description (CouchDBStructField *sf)
+couchdb_document_contact_im_get_description (CouchdbStructField *sf)
{
g_return_val_if_fail (sf != NULL, NULL);
@@ -946,7 +946,7 @@ couchdb_document_contact_im_get_description (CouchDBStructField *sf)
}
void
-couchdb_document_contact_im_set_description (CouchDBStructField *sf, const char *description)
+couchdb_document_contact_im_set_description (CouchdbStructField *sf, const char *description)
{
g_return_if_fail (sf != NULL);
g_return_if_fail (description != NULL);
@@ -955,7 +955,7 @@ couchdb_document_contact_im_set_description (CouchDBStructField *sf, const char
}
const char *
-couchdb_document_contact_im_get_protocol (CouchDBStructField *sf)
+couchdb_document_contact_im_get_protocol (CouchdbStructField *sf)
{
g_return_val_if_fail (sf != NULL, NULL);
@@ -963,7 +963,7 @@ couchdb_document_contact_im_get_protocol (CouchDBStructField *sf)
}
void
-couchdb_document_contact_im_set_protocol (CouchDBStructField *sf, const char *protocol)
+couchdb_document_contact_im_set_protocol (CouchdbStructField *sf, const char *protocol)
{
g_return_if_fail (sf != NULL);
g_return_if_fail (protocol != NULL);
@@ -971,10 +971,10 @@ couchdb_document_contact_im_set_protocol (CouchDBStructField *sf, const char *pr
couchdb_struct_field_set_string_field (sf, "protocol", protocol);
}
-CouchDBStructField *
+CouchdbStructField *
couchdb_document_contact_url_new (const char *uuid, const char *address, const char *description)
{
- CouchDBStructField *sf;
+ CouchdbStructField *sf;
sf = couchdb_struct_field_new_from_json_object (json_object_new ());
if (uuid != NULL)
@@ -994,7 +994,7 @@ couchdb_document_contact_url_new (const char *uuid, const char *address, const c
}
const char *
-couchdb_document_contact_url_get_address (CouchDBStructField *sf)
+couchdb_document_contact_url_get_address (CouchdbStructField *sf)
{
g_return_val_if_fail (sf != NULL, NULL);
@@ -1002,7 +1002,7 @@ couchdb_document_contact_url_get_address (CouchDBStructField *sf)
}
void
-couchdb_document_contact_url_set_address (CouchDBStructField *sf, const char *url)
+couchdb_document_contact_url_set_address (CouchdbStructField *sf, const char *url)
{
g_return_if_fail (sf != NULL);
g_return_if_fail (url != NULL);
@@ -1011,7 +1011,7 @@ couchdb_document_contact_url_set_address (CouchDBStructField *sf, const char *ur
}
const char *
-couchdb_document_contact_url_get_description (CouchDBStructField *sf)
+couchdb_document_contact_url_get_description (CouchdbStructField *sf)
{
g_return_val_if_fail (sf != NULL, NULL);
@@ -1019,7 +1019,7 @@ couchdb_document_contact_url_get_description (CouchDBStructField *sf)
}
void
-couchdb_document_contact_url_set_description (CouchDBStructField *sf, const char *description)
+couchdb_document_contact_url_set_description (CouchdbStructField *sf, const char *description)
{
g_return_if_fail (sf != NULL);
diff --git a/couchdb-glib/couchdb-document-contact.h b/couchdb-glib/couchdb-document-contact.h
index 602f69b..a24506e 100644
--- a/couchdb-glib/couchdb-document-contact.h
+++ b/couchdb-glib/couchdb-document-contact.h
@@ -30,83 +30,83 @@ G_BEGIN_DECLS
#define COUCHDB_RECORD_TYPE_CONTACT "http://www.freedesktop.org/wiki/Specifications/desktopcouch/contact";
-CouchDBDocument *couchdb_document_contact_new (CouchDB *couchdb);
-gboolean couchdb_document_is_contact (CouchDBDocument *document);
+CouchdbDocument *couchdb_document_contact_new (Couchdb *couchdb);
+gboolean couchdb_document_is_contact (CouchdbDocument *document);
/*
* Top level functions to manipulate documents representing a contact
*/
-const char *couchdb_document_contact_get_first_name (CouchDBDocument *document);
-void couchdb_document_contact_set_first_name (CouchDBDocument *document, const char *first_name);
-const char *couchdb_document_contact_get_last_name (CouchDBDocument *document);
-void couchdb_document_contact_set_last_name (CouchDBDocument *document, const char *last_name);
-const char *couchdb_document_contact_get_nick_name (CouchDBDocument *document);
-void couchdb_document_contact_set_nick_name (CouchDBDocument *document, const char *nick_name);
-const char *couchdb_document_contact_get_spouse_name (CouchDBDocument *document);
-void couchdb_document_contact_set_spouse_name (CouchDBDocument *document, const char *spouse_name);
-const char *couchdb_document_contact_get_birth_date (CouchDBDocument *document);
-void couchdb_document_contact_set_birth_date (CouchDBDocument *document, const char *birth_date);
-const char *couchdb_document_contact_get_wedding_date (CouchDBDocument *document);
-void couchdb_document_contact_set_wedding_date (CouchDBDocument *document, const char *wedding_date);
-
-const char *couchdb_document_contact_get_company (CouchDBDocument *document);
-void couchdb_document_contact_set_company (CouchDBDocument *document, const char *company);
-const char *couchdb_document_contact_get_department (CouchDBDocument *document);
-void couchdb_document_contact_set_department (CouchDBDocument *document, const char *department);
-const char *couchdb_document_contact_get_title (CouchDBDocument *document);
-void couchdb_document_contact_set_title (CouchDBDocument *document, const char *title);
-const char *couchdb_document_contact_get_job_title (CouchDBDocument *document);
-void couchdb_document_contact_set_job_title (CouchDBDocument *document, const char *job_title);
-const char *couchdb_document_contact_get_manager_name (CouchDBDocument *document);
-void couchdb_document_contact_set_manager_name (CouchDBDocument *document, const char *manager_name);
-const char *couchdb_document_contact_get_assistant_name (CouchDBDocument *document);
-void couchdb_document_contact_set_assistant_name (CouchDBDocument *document, const char *assistant_name);
-const char *couchdb_document_contact_get_office (CouchDBDocument *document);
-void couchdb_document_contact_set_office (CouchDBDocument *document, const char *office);
-
-GSList *couchdb_document_contact_get_email_addresses (CouchDBDocument *document);
-void couchdb_document_contact_set_email_addresses (CouchDBDocument *document, GSList *list);
-
-GSList *couchdb_document_contact_get_phone_numbers (CouchDBDocument *document);
-void couchdb_document_contact_set_phone_numbers (CouchDBDocument *document, GSList *list);
-
-GSList *couchdb_document_contact_get_addresses (CouchDBDocument *document);
-void couchdb_document_contact_set_addresses (CouchDBDocument *document, GSList *list);
-
-GSList *couchdb_document_contact_get_im_addresses (CouchDBDocument *document);
-void couchdb_document_contact_set_im_addresses (CouchDBDocument *document, GSList *list);
-
-GSList *couchdb_document_contact_get_urls (CouchDBDocument *document);
-void couchdb_document_contact_set_urls (CouchDBDocument *document, GSList *list);
-
-const char *couchdb_document_contact_get_notes (CouchDBDocument *document);
-void couchdb_document_contact_set_notes (CouchDBDocument *document, const char *notes);
+const char *couchdb_document_contact_get_first_name (CouchdbDocument *document);
+void couchdb_document_contact_set_first_name (CouchdbDocument *document, const char *first_name);
+const char *couchdb_document_contact_get_last_name (CouchdbDocument *document);
+void couchdb_document_contact_set_last_name (CouchdbDocument *document, const char *last_name);
+const char *couchdb_document_contact_get_nick_name (CouchdbDocument *document);
+void couchdb_document_contact_set_nick_name (CouchdbDocument *document, const char *nick_name);
+const char *couchdb_document_contact_get_spouse_name (CouchdbDocument *document);
+void couchdb_document_contact_set_spouse_name (CouchdbDocument *document, const char *spouse_name);
+const char *couchdb_document_contact_get_birth_date (CouchdbDocument *document);
+void couchdb_document_contact_set_birth_date (CouchdbDocument *document, const char *birth_date);
+const char *couchdb_document_contact_get_wedding_date (CouchdbDocument *document);
+void couchdb_document_contact_set_wedding_date (CouchdbDocument *document, const char *wedding_date);
+
+const char *couchdb_document_contact_get_company (CouchdbDocument *document);
+void couchdb_document_contact_set_company (CouchdbDocument *document, const char *company);
+const char *couchdb_document_contact_get_department (CouchdbDocument *document);
+void couchdb_document_contact_set_department (CouchdbDocument *document, const char *department);
+const char *couchdb_document_contact_get_title (CouchdbDocument *document);
+void couchdb_document_contact_set_title (CouchdbDocument *document, const char *title);
+const char *couchdb_document_contact_get_job_title (CouchdbDocument *document);
+void couchdb_document_contact_set_job_title (CouchdbDocument *document, const char *job_title);
+const char *couchdb_document_contact_get_manager_name (CouchdbDocument *document);
+void couchdb_document_contact_set_manager_name (CouchdbDocument *document, const char *manager_name);
+const char *couchdb_document_contact_get_assistant_name (CouchdbDocument *document);
+void couchdb_document_contact_set_assistant_name (CouchdbDocument *document, const char *assistant_name);
+const char *couchdb_document_contact_get_office (CouchdbDocument *document);
+void couchdb_document_contact_set_office (CouchdbDocument *document, const char *office);
+
+GSList *couchdb_document_contact_get_email_addresses (CouchdbDocument *document);
+void couchdb_document_contact_set_email_addresses (CouchdbDocument *document, GSList *list);
+
+GSList *couchdb_document_contact_get_phone_numbers (CouchdbDocument *document);
+void couchdb_document_contact_set_phone_numbers (CouchdbDocument *document, GSList *list);
+
+GSList *couchdb_document_contact_get_addresses (CouchdbDocument *document);
+void couchdb_document_contact_set_addresses (CouchdbDocument *document, GSList *list);
+
+GSList *couchdb_document_contact_get_im_addresses (CouchdbDocument *document);
+void couchdb_document_contact_set_im_addresses (CouchdbDocument *document, GSList *list);
+
+GSList *couchdb_document_contact_get_urls (CouchdbDocument *document);
+void couchdb_document_contact_set_urls (CouchdbDocument *document, GSList *list);
+
+const char *couchdb_document_contact_get_notes (CouchdbDocument *document);
+void couchdb_document_contact_set_notes (CouchdbDocument *document, const char *notes);
/*
* Utility functions to manipulate email addresses fields
*/
-CouchDBStructField *couchdb_document_contact_email_new (const char *uuid, const char *address, const char *description);
-const char *couchdb_document_contact_email_get_address (CouchDBStructField *sf);
-void couchdb_document_contact_email_set_address (CouchDBStructField *sf, const char *email);
+CouchdbStructField *couchdb_document_contact_email_new (const char *uuid, const char *address, const char *description);
+const char *couchdb_document_contact_email_get_address (CouchdbStructField *sf);
+void couchdb_document_contact_email_set_address (CouchdbStructField *sf, const char *email);
#define COUCHDB_DOCUMENT_CONTACT_EMAIL_DESCRIPTION_HOME "home"
#define COUCHDB_DOCUMENT_CONTACT_EMAIL_DESCRIPTION_OTHER "other"
#define COUCHDB_DOCUMENT_CONTACT_EMAIL_DESCRIPTION_WORK "work"
-const char *couchdb_document_contact_email_get_description (CouchDBStructField *sf);
-void couchdb_document_contact_email_set_description (CouchDBStructField *sf, const char *description);
+const char *couchdb_document_contact_email_get_description (CouchdbStructField *sf);
+void couchdb_document_contact_email_set_description (CouchdbStructField *sf, const char *description);
/*
* Utility functions to manipulate phone numbers
*/
-CouchDBStructField *couchdb_document_contact_phone_new (const char *uuid, const char *number, const char *description, gint priority);
-gint couchdb_document_contact_phone_get_priority (CouchDBStructField *sf);
-void couchdb_document_contact_phone_set_priority (CouchDBStructField *sf, gint priority);
-const char *couchdb_document_contact_phone_get_number (CouchDBStructField *sf);
-void couchdb_document_contact_phone_set_number (CouchDBStructField *sf, const char *number);
+CouchdbStructField *couchdb_document_contact_phone_new (const char *uuid, const char *number, const char *description, gint priority);
+gint couchdb_document_contact_phone_get_priority (CouchdbStructField *sf);
+void couchdb_document_contact_phone_set_priority (CouchdbStructField *sf, gint priority);
+const char *couchdb_document_contact_phone_get_number (CouchdbStructField *sf);
+void couchdb_document_contact_phone_set_number (CouchdbStructField *sf, const char *number);
#define COUCHDB_DOCUMENT_CONTACT_PHONE_DESCRIPTION_ASSISTANT "assistant"
#define COUCHDB_DOCUMENT_CONTACT_PHONE_DESCRIPTION_CALLBACK "callback"
@@ -124,13 +124,13 @@ void couchdb_document_contact_phone_set_number (CouchDBStructFiel
#define COUCHDB_DOCUMENT_CONTACT_PHONE_DESCRIPTION_WORK "work"
#define COUCHDB_DOCUMENT_CONTACT_PHONE_DESCRIPTION_WORK_FAX "work fax"
-const char *couchdb_document_contact_phone_get_description (CouchDBStructField *sf);
-void couchdb_document_contact_phone_set_description (CouchDBStructField *sf, const char *description);
+const char *couchdb_document_contact_phone_get_description (CouchdbStructField *sf);
+void couchdb_document_contact_phone_set_description (CouchdbStructField *sf, const char *description);
/*
* Utility functions to manipulate addresses
*/
-CouchDBStructField *couchdb_document_contact_address_new (const char *uuid,
+CouchdbStructField *couchdb_document_contact_address_new (const char *uuid,
const char *street,
const char *city,
const char *state,
@@ -138,37 +138,37 @@ CouchDBStructField *couchdb_document_contact_address_new (const char *uuid,
const char *postalcode,
const char *pobox,
const char *description);
-const char *couchdb_document_contact_address_get_street (CouchDBStructField *sf);
-void couchdb_document_contact_address_set_street (CouchDBStructField *sf, const char *street);
-const char *couchdb_document_contact_address_get_city (CouchDBStructField *sf);
-void couchdb_document_contact_address_set_city (CouchDBStructField *sf, const char *city);
-const char *couchdb_document_contact_address_get_state (CouchDBStructField *sf);
-void couchdb_document_contact_address_set_state (CouchDBStructField *sf, const char *state);
-const char *couchdb_document_contact_address_get_country (CouchDBStructField *sf);
-void couchdb_document_contact_address_set_country (CouchDBStructField *sf, const char *country);
-const char *couchdb_document_contact_address_get_postalcode (CouchDBStructField *sf);
-void couchdb_document_contact_address_set_postalcode (CouchDBStructField *sf, const char *postalcode);
-const char *couchdb_document_contact_address_get_pobox (CouchDBStructField *sf);
-void couchdb_document_contact_address_set_pobox (CouchDBStructField *sf, const char *pobox);
+const char *couchdb_document_contact_address_get_street (CouchdbStructField *sf);
+void couchdb_document_contact_address_set_street (CouchdbStructField *sf, const char *street);
+const char *couchdb_document_contact_address_get_city (CouchdbStructField *sf);
+void couchdb_document_contact_address_set_city (CouchdbStructField *sf, const char *city);
+const char *couchdb_document_contact_address_get_state (CouchdbStructField *sf);
+void couchdb_document_contact_address_set_state (CouchdbStructField *sf, const char *state);
+const char *couchdb_document_contact_address_get_country (CouchdbStructField *sf);
+void couchdb_document_contact_address_set_country (CouchdbStructField *sf, const char *country);
+const char *couchdb_document_contact_address_get_postalcode (CouchdbStructField *sf);
+void couchdb_document_contact_address_set_postalcode (CouchdbStructField *sf, const char *postalcode);
+const char *couchdb_document_contact_address_get_pobox (CouchdbStructField *sf);
+void couchdb_document_contact_address_set_pobox (CouchdbStructField *sf, const char *pobox);
#define COUCHDB_DOCUMENT_CONTACT_ADDRESS_DESCRIPTION_HOME "home"
#define COUCHDB_DOCUMENT_CONTACT_ADDRESS_DESCRIPTION_OTHER "other"
#define COUCHDB_DOCUMENT_CONTACT_ADDRESS_DESCRIPTION_WORK "work"
-const char *couchdb_document_contact_address_get_description (CouchDBStructField *sf);
-void couchdb_document_contact_address_set_description (CouchDBStructField *sf, const char *description);
+const char *couchdb_document_contact_address_get_description (CouchdbStructField *sf);
+void couchdb_document_contact_address_set_description (CouchdbStructField *sf, const char *description);
/*
* Utility functions to manipulate IM addresses
*/
-CouchDBStructField *couchdb_document_contact_im_new (const char *uuid,
+CouchdbStructField *couchdb_document_contact_im_new (const char *uuid,
const char *address,
const char *description,
const char *protocol);
-const char *couchdb_document_contact_im_get_address (CouchDBStructField *sf);
-void couchdb_document_contact_im_set_address (CouchDBStructField *sf, const char *address);
-const char *couchdb_document_contact_im_get_description (CouchDBStructField *sf);
-void couchdb_document_contact_im_set_description (CouchDBStructField *sf, const char *description);
+const char *couchdb_document_contact_im_get_address (CouchdbStructField *sf);
+void couchdb_document_contact_im_set_address (CouchdbStructField *sf, const char *address);
+const char *couchdb_document_contact_im_get_description (CouchdbStructField *sf);
+void couchdb_document_contact_im_set_description (CouchdbStructField *sf, const char *description);
#define COUCHDB_DOCUMENT_CONTACT_IM_PROTOCOL_AIM "aim"
#define COUCHDB_DOCUMENT_CONTACT_IM_PROTOCOL_GADU_GADU "gadu-gadu"
@@ -180,21 +180,21 @@ void couchdb_document_contact_im_set_description (CouchDBStructFi
#define COUCHDB_DOCUMENT_CONTACT_IM_PROTOCOL_SKYPE "skype"
#define COUCHDB_DOCUMENT_CONTACT_IM_PROTOCOL_YAHOO "yahoo"
-const char *couchdb_document_contact_im_get_protocol (CouchDBStructField *sf);
-void couchdb_document_contact_im_set_protocol (CouchDBStructField *sf, const char *protocol);
+const char *couchdb_document_contact_im_get_protocol (CouchdbStructField *sf);
+void couchdb_document_contact_im_set_protocol (CouchdbStructField *sf, const char *protocol);
/*
* Utility functions to manipulate URLs
*/
-CouchDBStructField *couchdb_document_contact_url_new (const char *uuid, const char *address, const char *description);
-const char *couchdb_document_contact_url_get_address (CouchDBStructField *sf);
-void couchdb_document_contact_url_set_address (CouchDBStructField *sf, const char *address);
+CouchdbStructField *couchdb_document_contact_url_new (const char *uuid, const char *address, const char *description);
+const char *couchdb_document_contact_url_get_address (CouchdbStructField *sf);
+void couchdb_document_contact_url_set_address (CouchdbStructField *sf, const char *address);
#define COUCHDB_DOCUMENT_CONTACT_URL_DESCRIPTION_BLOG "blog"
#define COUCHDB_DOCUMENT_CONTACT_URL_DESCRIPTION_HOMEPAGE "home page"
-const char *couchdb_document_contact_url_get_description (CouchDBStructField *sf);
-void couchdb_document_contact_url_set_description (CouchDBStructField *sf, const char *description);
+const char *couchdb_document_contact_url_get_description (CouchdbStructField *sf);
+void couchdb_document_contact_url_set_description (CouchdbStructField *sf, const char *description);
G_END_DECLS
diff --git a/couchdb-glib/couchdb-document-info.c b/couchdb-glib/couchdb-document-info.c
index eac5c10..961dc40 100644
--- a/couchdb-glib/couchdb-document-info.c
+++ b/couchdb-glib/couchdb-document-info.c
@@ -23,7 +23,7 @@
#include "couchdb-document-info.h"
-struct _CouchDBDocumentInfo {
+struct _CouchdbDocumentInfo {
gint ref_count;
char *docid;
@@ -31,7 +31,7 @@ struct _CouchDBDocumentInfo {
};
/*
- * CouchDBDocumentInfo object
+ * CouchdbDocumentInfo object
*/
GType
@@ -40,19 +40,19 @@ couchdb_document_info_get_type (void)
static GType object_type = 0;
if (G_UNLIKELY (!object_type))
- object_type = g_boxed_type_register_static (g_intern_static_string ("CouchDBDocumentInfo"),
+ object_type = g_boxed_type_register_static (g_intern_static_string ("CouchdbDocumentInfo"),
(GBoxedCopyFunc) couchdb_document_info_ref,
(GBoxedFreeFunc) couchdb_document_info_unref);
return object_type;
}
-CouchDBDocumentInfo *
+CouchdbDocumentInfo *
couchdb_document_info_new (const char *docid, const char *revision)
{
- CouchDBDocumentInfo *doc_info;
+ CouchdbDocumentInfo *doc_info;
- doc_info = g_slice_new (CouchDBDocumentInfo);
+ doc_info = g_slice_new (CouchdbDocumentInfo);
doc_info->ref_count = 1;
doc_info->docid = g_strdup (docid);
doc_info->revision = g_strdup (revision);
@@ -60,8 +60,8 @@ couchdb_document_info_new (const char *docid, const char *revision)
return doc_info;
}
-CouchDBDocumentInfo *
-couchdb_document_info_ref (CouchDBDocumentInfo *doc_info)
+CouchdbDocumentInfo *
+couchdb_document_info_ref (CouchdbDocumentInfo *doc_info)
{
g_return_val_if_fail (doc_info != NULL, NULL);
g_return_val_if_fail (doc_info->ref_count > 0, NULL);
@@ -72,7 +72,7 @@ couchdb_document_info_ref (CouchDBDocumentInfo *doc_info)
}
void
-couchdb_document_info_unref (CouchDBDocumentInfo *doc_info)
+couchdb_document_info_unref (CouchdbDocumentInfo *doc_info)
{
gint old_ref;
@@ -85,12 +85,12 @@ couchdb_document_info_unref (CouchDBDocumentInfo *doc_info)
else {
g_free (doc_info->docid);
g_free (doc_info->revision);
- g_slice_free (CouchDBDocumentInfo, doc_info);
+ g_slice_free (CouchdbDocumentInfo, doc_info);
}
}
const char *
-couchdb_document_info_get_docid (CouchDBDocumentInfo *doc_info)
+couchdb_document_info_get_docid (CouchdbDocumentInfo *doc_info)
{
g_return_val_if_fail (doc_info != NULL, NULL);
@@ -98,7 +98,7 @@ couchdb_document_info_get_docid (CouchDBDocumentInfo *doc_info)
}
const char *
-couchdb_document_info_get_revision (CouchDBDocumentInfo *doc_info)
+couchdb_document_info_get_revision (CouchdbDocumentInfo *doc_info)
{
g_return_val_if_fail (doc_info != NULL, NULL);
diff --git a/couchdb-glib/couchdb-document-info.h b/couchdb-glib/couchdb-document-info.h
index 6a8ad8c..49a2fcd 100644
--- a/couchdb-glib/couchdb-document-info.h
+++ b/couchdb-glib/couchdb-document-info.h
@@ -33,12 +33,12 @@ G_BEGIN_DECLS
#define COUCHDB_TYPE_DOCUMENT_INFO (couchdb_document_info_get_type ())
GType couchdb_document_info_get_type (void);
-CouchDBDocumentInfo *couchdb_document_info_new (const char *docid, const char *revision);
-CouchDBDocumentInfo *couchdb_document_info_ref (CouchDBDocumentInfo *dbinfo);
-void couchdb_document_info_unref (CouchDBDocumentInfo *dbinfo);
+CouchdbDocumentInfo *couchdb_document_info_new (const char *docid, const char *revision);
+CouchdbDocumentInfo *couchdb_document_info_ref (CouchdbDocumentInfo *dbinfo);
+void couchdb_document_info_unref (CouchdbDocumentInfo *dbinfo);
-const char *couchdb_document_info_get_docid (CouchDBDocumentInfo *doc_info);
-const char *couchdb_document_info_get_revision (CouchDBDocumentInfo *doc_info);
+const char *couchdb_document_info_get_docid (CouchdbDocumentInfo *doc_info);
+const char *couchdb_document_info_get_revision (CouchdbDocumentInfo *doc_info);
G_END_DECLS
diff --git a/couchdb-glib/couchdb-document.c b/couchdb-glib/couchdb-document.c
index 9cd4256..9f22923 100644
--- a/couchdb-glib/couchdb-document.c
+++ b/couchdb-glib/couchdb-document.c
@@ -28,20 +28,20 @@
#include "couchdb-document.h"
#include "utils.h"
-struct _CouchDBDocument {
+struct _CouchdbDocument {
GObject parent;
- CouchDB *couchdb;
+ Couchdb *couchdb;
char *dbname;
JsonNode *root_node;
};
-G_DEFINE_TYPE(CouchDBDocument, couchdb_document, G_TYPE_OBJECT);
+G_DEFINE_TYPE(CouchdbDocument, couchdb_document, G_TYPE_OBJECT);
static void
couchdb_document_finalize (GObject *object)
{
- CouchDBDocument *document = COUCHDB_DOCUMENT (object);
+ CouchdbDocument *document = COUCHDB_DOCUMENT (object);
g_free (document->dbname);
json_node_free (document->root_node);
@@ -50,7 +50,7 @@ couchdb_document_finalize (GObject *object)
}
static void
-couchdb_document_class_init (CouchDBDocumentClass *klass)
+couchdb_document_class_init (CouchdbDocumentClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
@@ -58,17 +58,17 @@ couchdb_document_class_init (CouchDBDocumentClass *klass)
}
static void
-couchdb_document_init (CouchDBDocument *document)
+couchdb_document_init (CouchdbDocument *document)
{
document->couchdb = NULL;
document->root_node = NULL;
document->dbname = NULL;
}
-CouchDBDocument *
-couchdb_document_new (CouchDB *couchdb)
+CouchdbDocument *
+couchdb_document_new (Couchdb *couchdb)
{
- CouchDBDocument *document;
+ CouchdbDocument *document;
document = g_object_new (COUCHDB_TYPE_DOCUMENT, NULL);
document->couchdb = couchdb;
@@ -80,15 +80,15 @@ couchdb_document_new (CouchDB *couchdb)
return document;
}
-CouchDBDocument *
-couchdb_document_get (CouchDB *couchdb,
+CouchdbDocument *
+couchdb_document_get (Couchdb *couchdb,
const char *dbname,
const char *docid,
GError **error)
{
char *url, *encoded_docid;
JsonParser *parser;
- CouchDBDocument *document = NULL;
+ CouchdbDocument *document = NULL;
g_return_val_if_fail (COUCHDB_IS (couchdb), NULL);
g_return_val_if_fail (dbname != NULL, NULL);
@@ -112,7 +112,7 @@ couchdb_document_get (CouchDB *couchdb,
}
gboolean
-couchdb_document_put (CouchDBDocument *document,
+couchdb_document_put (CouchdbDocument *document,
const char *dbname,
GError **error)
{
@@ -170,7 +170,7 @@ couchdb_document_put (CouchDBDocument *document,
}
gboolean
-couchdb_document_delete (CouchDBDocument *document, GError **error)
+couchdb_document_delete (CouchdbDocument *document, GError **error)
{
const char *id, *revision;
char *url;
@@ -198,7 +198,7 @@ couchdb_document_delete (CouchDBDocument *document, GError **error)
}
const char *
-couchdb_document_get_id (CouchDBDocument *document)
+couchdb_document_get_id (CouchdbDocument *document)
{
g_return_val_if_fail (COUCHDB_IS_DOCUMENT (document), NULL);
@@ -215,7 +215,7 @@ couchdb_document_get_id (CouchDBDocument *document)
}
void
-couchdb_document_set_id (CouchDBDocument *document, const char *id)
+couchdb_document_set_id (CouchdbDocument *document, const char *id)
{
g_return_if_fail (COUCHDB_IS_DOCUMENT (document));
g_return_if_fail (id != NULL);
@@ -226,7 +226,7 @@ couchdb_document_set_id (CouchDBDocument *document, const char *id)
}
const char *
-couchdb_document_get_revision (CouchDBDocument *document)
+couchdb_document_get_revision (CouchdbDocument *document)
{
g_return_val_if_fail (COUCHDB_IS_DOCUMENT (document), NULL);
@@ -241,7 +241,7 @@ couchdb_document_get_revision (CouchDBDocument *document)
}
void
-couchdb_document_set_revision (CouchDBDocument *document, const char *revision)
+couchdb_document_set_revision (CouchdbDocument *document, const char *revision)
{
g_return_if_fail (COUCHDB_IS_DOCUMENT (document));
g_return_if_fail (revision != NULL);
@@ -252,7 +252,7 @@ couchdb_document_set_revision (CouchDBDocument *document, const char *revision)
}
const char *
-couchdb_document_get_record_type (CouchDBDocument *document)
+couchdb_document_get_record_type (CouchdbDocument *document)
{
g_return_val_if_fail (COUCHDB_IS_DOCUMENT (document), NULL);
@@ -267,7 +267,7 @@ couchdb_document_get_record_type (CouchDBDocument *document)
}
void
-couchdb_document_set_record_type (CouchDBDocument *document, const char *record_type)
+couchdb_document_set_record_type (CouchdbDocument *document, const char *record_type)
{
g_return_if_fail (COUCHDB_IS_DOCUMENT (document));
g_return_if_fail (record_type != NULL);
@@ -278,7 +278,7 @@ couchdb_document_set_record_type (CouchDBDocument *document, const char *record_
}
gboolean
-couchdb_document_has_field (CouchDBDocument *document, const char *field)
+couchdb_document_has_field (CouchdbDocument *document, const char *field)
{
JsonNode *node;
@@ -289,7 +289,7 @@ couchdb_document_has_field (CouchDBDocument *document, const char *field)
}
void
-couchdb_document_remove_field (CouchDBDocument *document, const char *field)
+couchdb_document_remove_field (CouchdbDocument *document, const char *field)
{
g_return_if_fail (COUCHDB_IS_DOCUMENT (document));
g_return_if_fail (field != NULL);
@@ -298,7 +298,7 @@ couchdb_document_remove_field (CouchDBDocument *document, const char *field)
}
gboolean
-couchdb_document_get_boolean_field (CouchDBDocument *document, const char *field)
+couchdb_document_get_boolean_field (CouchdbDocument *document, const char *field)
{
g_return_val_if_fail (COUCHDB_IS_DOCUMENT (document), FALSE);
g_return_val_if_fail (field != NULL, FALSE);
@@ -311,7 +311,7 @@ couchdb_document_get_boolean_field (CouchDBDocument *document, const char *field
}
void
-couchdb_document_set_boolean_field (CouchDBDocument *document, const char *field, gboolean value)
+couchdb_document_set_boolean_field (CouchdbDocument *document, const char *field, gboolean value)
{
g_return_if_fail (COUCHDB_IS_DOCUMENT (document));
g_return_if_fail (field != NULL);
@@ -322,7 +322,7 @@ couchdb_document_set_boolean_field (CouchDBDocument *document, const char *field
}
gint
-couchdb_document_get_int_field (CouchDBDocument *document, const char *field)
+couchdb_document_get_int_field (CouchdbDocument *document, const char *field)
{
g_return_val_if_fail (COUCHDB_IS_DOCUMENT (document), -1);
g_return_val_if_fail (field != NULL, -1);
@@ -335,7 +335,7 @@ couchdb_document_get_int_field (CouchDBDocument *document, const char *field)
}
void
-couchdb_document_set_int_field (CouchDBDocument *document, const char *field, gint value)
+couchdb_document_set_int_field (CouchdbDocument *document, const char *field, gint value)
{
g_return_if_fail (COUCHDB_IS_DOCUMENT (document));
g_return_if_fail (field != NULL);
@@ -346,7 +346,7 @@ couchdb_document_set_int_field (CouchDBDocument *document, const char *field, gi
}
gdouble
-couchdb_document_get_double_field (CouchDBDocument *document, const char *field)
+couchdb_document_get_double_field (CouchdbDocument *document, const char *field)
{
g_return_val_if_fail (COUCHDB_IS_DOCUMENT (document), -1);
g_return_val_if_fail (field != NULL, -1);
@@ -358,7 +358,7 @@ couchdb_document_get_double_field (CouchDBDocument *document, const char *field)
}
void
-couchdb_document_set_double_field (CouchDBDocument *document, const char *field, gdouble value)
+couchdb_document_set_double_field (CouchdbDocument *document, const char *field, gdouble value)
{
g_return_if_fail (COUCHDB_IS_DOCUMENT (document));
g_return_if_fail (field != NULL);
@@ -369,7 +369,7 @@ couchdb_document_set_double_field (CouchDBDocument *document, const char *field,
}
const char *
-couchdb_document_get_string_field (CouchDBDocument *document, const char *field)
+couchdb_document_get_string_field (CouchdbDocument *document, const char *field)
{
g_return_val_if_fail (COUCHDB_IS_DOCUMENT (document), NULL);
g_return_val_if_fail (field != NULL, NULL);
@@ -382,7 +382,7 @@ couchdb_document_get_string_field (CouchDBDocument *document, const char *field)
}
void
-couchdb_document_set_string_field (CouchDBDocument *document, const char *field, const char *value)
+couchdb_document_set_string_field (CouchdbDocument *document, const char *field, const char *value)
{
g_return_if_fail (COUCHDB_IS_DOCUMENT (document));
g_return_if_fail (field != NULL);
@@ -397,8 +397,8 @@ couchdb_document_set_string_field (CouchDBDocument *document, const char *field,
}
}
-CouchDBStructField *
-couchdb_document_get_struct_field (CouchDBDocument *document, const char *field)
+CouchdbStructField *
+couchdb_document_get_struct_field (CouchdbDocument *document, const char *field)
{
g_return_val_if_fail (COUCHDB_IS_DOCUMENT (document), NULL);
g_return_val_if_fail (field != NULL, NULL);
@@ -412,7 +412,7 @@ couchdb_document_get_struct_field (CouchDBDocument *document, const char *field)
}
void
-couchdb_document_set_struct_field (CouchDBDocument *document, const char *field, CouchDBStructField *value)
+couchdb_document_set_struct_field (CouchdbDocument *document, const char *field, CouchdbStructField *value)
{
g_return_if_fail (COUCHDB_IS_DOCUMENT (document));
g_return_if_fail (field != NULL);
@@ -423,8 +423,8 @@ couchdb_document_set_struct_field (CouchDBDocument *document, const char *field,
json_object_ref (couchdb_struct_field_get_json_object (value)));
}
-CouchDBStructField *
-couchdb_document_get_application_annotations (CouchDBDocument *document)
+CouchdbStructField *
+couchdb_document_get_application_annotations (CouchdbDocument *document)
{
g_return_val_if_fail (COUCHDB_IS_DOCUMENT (document), NULL);
@@ -432,7 +432,7 @@ couchdb_document_get_application_annotations (CouchDBDocument *document)
}
void
-couchdb_document_set_application_annotations (CouchDBDocument *document, CouchDBStructField *annotations)
+couchdb_document_set_application_annotations (CouchdbDocument *document, CouchdbStructField *annotations)
{
g_return_if_fail (COUCHDB_IS_DOCUMENT (document));
@@ -440,7 +440,7 @@ couchdb_document_set_application_annotations (CouchDBDocument *document, CouchDB
}
char *
-couchdb_document_to_string (CouchDBDocument *document)
+couchdb_document_to_string (CouchdbDocument *document)
{
g_return_val_if_fail (COUCHDB_IS_DOCUMENT (document), NULL);
@@ -462,7 +462,7 @@ couchdb_document_to_string (CouchDBDocument *document)
}
JsonObject *
-couchdb_document_get_json_object (CouchDBDocument *document)
+couchdb_document_get_json_object (CouchdbDocument *document)
{
g_return_val_if_fail (COUCHDB_IS_DOCUMENT (document), NULL);
diff --git a/couchdb-glib/couchdb-document.h b/couchdb-glib/couchdb-document.h
index cacec47..4714958 100644
--- a/couchdb-glib/couchdb-document.h
+++ b/couchdb-glib/couchdb-document.h
@@ -33,101 +33,101 @@
G_BEGIN_DECLS
#define COUCHDB_TYPE_DOCUMENT (couchdb_document_get_type ())
-#define COUCHDB_DOCUMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), COUCHDB_TYPE_DOCUMENT, CouchDBDocument))
+#define COUCHDB_DOCUMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), COUCHDB_TYPE_DOCUMENT, CouchdbDocument))
#define COUCHDB_IS_DOCUMENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), COUCHDB_TYPE_DOCUMENT))
-#define COUCHDB_DOCUMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), COUCHDB_TYPE_DOCUMENT, CouchDBDocumentClass))
+#define COUCHDB_DOCUMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), COUCHDB_TYPE_DOCUMENT, CouchdbDocumentClass))
#define COUCHDB_IS_DOCUMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), COUCHDB_TYPE_DOCUMENT))
-#define COUCHDB_DOCUMENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), COUCHDB_TYPE_DOCUMENT, CouchDBDocumentClass))
+#define COUCHDB_DOCUMENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), COUCHDB_TYPE_DOCUMENT, CouchdbDocumentClass))
typedef struct {
GObjectClass parent_class;
-} CouchDBDocumentClass;
+} CouchdbDocumentClass;
GType couchdb_document_get_type (void);
-CouchDBDocument *couchdb_document_new (CouchDB *couchdb);
+CouchdbDocument *couchdb_document_new (Couchdb *couchdb);
-CouchDBDocument *couchdb_document_get (CouchDB *couchdb,
+CouchdbDocument *couchdb_document_get (Couchdb *couchdb,
const char *dbname,
const char *docid,
GError **error);
-gboolean couchdb_document_put (CouchDBDocument *document,
+gboolean couchdb_document_put (CouchdbDocument *document,
const char *dbname,
GError **error);
-gboolean couchdb_document_delete (CouchDBDocument *document,
+gboolean couchdb_document_delete (CouchdbDocument *document,
GError **error);
-const char *couchdb_document_get_id (CouchDBDocument *document);
+const char *couchdb_document_get_id (CouchdbDocument *document);
-void couchdb_document_set_id (CouchDBDocument *document,
+void couchdb_document_set_id (CouchdbDocument *document,
const char *id);
-const char *couchdb_document_get_revision (CouchDBDocument *document);
-void couchdb_document_set_revision (CouchDBDocument *document,
+const char *couchdb_document_get_revision (CouchdbDocument *document);
+void couchdb_document_set_revision (CouchdbDocument *document,
const char *revision);
-const char *couchdb_document_get_record_type (CouchDBDocument *document);
+const char *couchdb_document_get_record_type (CouchdbDocument *document);
-void couchdb_document_set_record_type (CouchDBDocument *document,
+void couchdb_document_set_record_type (CouchdbDocument *document,
const char *record_type);
-gboolean couchdb_document_has_field (CouchDBDocument *document,
+gboolean couchdb_document_has_field (CouchdbDocument *document,
const char *field);
-void couchdb_document_remove_field (CouchDBDocument *document,
+void couchdb_document_remove_field (CouchdbDocument *document,
const char *field);
-gboolean couchdb_document_get_boolean_field (CouchDBDocument *document,
+gboolean couchdb_document_get_boolean_field (CouchdbDocument *document,
const char *field);
-void couchdb_document_set_boolean_field (CouchDBDocument *document,
+void couchdb_document_set_boolean_field (CouchdbDocument *document,
const char *field,
gboolean value);
-gint couchdb_document_get_int_field (CouchDBDocument *document,
+gint couchdb_document_get_int_field (CouchdbDocument *document,
const char *field);
-void couchdb_document_set_int_field (CouchDBDocument *document,
+void couchdb_document_set_int_field (CouchdbDocument *document,
const char *field,
gint value);
-gdouble couchdb_document_get_double_field (CouchDBDocument *document,
+gdouble couchdb_document_get_double_field (CouchdbDocument *document,
const char *field);
-void couchdb_document_set_double_field (CouchDBDocument *document,
+void couchdb_document_set_double_field (CouchdbDocument *document,
const char *field,
gdouble value);
-const char *couchdb_document_get_string_field (CouchDBDocument *document,
+const char *couchdb_document_get_string_field (CouchdbDocument *document,
const char *field);
-void couchdb_document_set_string_field (CouchDBDocument *document,
+void couchdb_document_set_string_field (CouchdbDocument *document,
const char *field,
const char *value);
-CouchDBStructField*
- couchdb_document_get_struct_field (CouchDBDocument *document,
+CouchdbStructField*
+ couchdb_document_get_struct_field (CouchdbDocument *document,
const char *field);
-void couchdb_document_set_struct_field (CouchDBDocument *document,
+void couchdb_document_set_struct_field (CouchdbDocument *document,
const char *field,
- CouchDBStructField *value);
+ CouchdbStructField *value);
-CouchDBStructField*
+CouchdbStructField*
couchdb_document_get_application_annotations
- (CouchDBDocument *document);
+ (CouchdbDocument *document);
void couchdb_document_set_application_annotations
- (CouchDBDocument *document,
- CouchDBStructField *annotations);
+ (CouchdbDocument *document,
+ CouchdbStructField *annotations);
-char* couchdb_document_to_string (CouchDBDocument *document);
+char* couchdb_document_to_string (CouchdbDocument *document);
-JsonObject* couchdb_document_get_json_object (CouchDBDocument *document);
+JsonObject* couchdb_document_get_json_object (CouchdbDocument *document);
G_END_DECLS
diff --git a/couchdb-glib/couchdb-struct-field.c b/couchdb-glib/couchdb-struct-field.c
index 0335e73..b7d3d4a 100644
--- a/couchdb-glib/couchdb-struct-field.c
+++ b/couchdb-glib/couchdb-struct-field.c
@@ -23,7 +23,7 @@
#include "couchdb-struct-field.h"
-struct _CouchDBStructField {
+struct _CouchdbStructField {
gint ref_count;
JsonObject *json_object;
@@ -37,19 +37,19 @@ couchdb_struct_field_get_type (void)
static GType object_type = 0;
if (G_UNLIKELY (!object_type))
- object_type = g_boxed_type_register_static (g_intern_static_string ("CouchDBStructField"),
+ object_type = g_boxed_type_register_static (g_intern_static_string ("CouchdbStructField"),
(GBoxedCopyFunc) couchdb_struct_field_ref,
(GBoxedFreeFunc) couchdb_struct_field_unref);
return object_type;
}
-CouchDBStructField *
+CouchdbStructField *
couchdb_struct_field_new (void)
{
- CouchDBStructField *sf;
+ CouchdbStructField *sf;
- sf = g_slice_new (CouchDBStructField);
+ sf = g_slice_new (CouchdbStructField);
sf->ref_count = 1;
sf->json_object = json_object_new ();
sf->uuid = NULL;
@@ -57,12 +57,12 @@ couchdb_struct_field_new (void)
return sf;
}
-CouchDBStructField *
+CouchdbStructField *
couchdb_struct_field_new_from_string (const char *str)
{
JsonParser *parser;
GError *error = NULL;
- CouchDBStructField *sf = NULL;
+ CouchdbStructField *sf = NULL;
g_return_val_if_fail (str != NULL, NULL);
@@ -82,12 +82,12 @@ couchdb_struct_field_new_from_string (const char *str)
return sf;
}
-CouchDBStructField *
+CouchdbStructField *
couchdb_struct_field_new_from_json_object (JsonObject *json_object)
{
- CouchDBStructField *sf;
+ CouchdbStructField *sf;
- sf = g_slice_new (CouchDBStructField);
+ sf = g_slice_new (CouchdbStructField);
sf->ref_count = 1;
sf->json_object = json_object_ref (json_object);
sf->uuid = NULL;
@@ -95,8 +95,8 @@ couchdb_struct_field_new_from_json_object (JsonObject *json_object)
return sf;
}
-CouchDBStructField *
-couchdb_struct_field_ref (CouchDBStructField *sf)
+CouchdbStructField *
+couchdb_struct_field_ref (CouchdbStructField *sf)
{
g_return_val_if_fail (sf != NULL, NULL);
g_return_val_if_fail (sf->ref_count > 0, NULL);
@@ -107,7 +107,7 @@ couchdb_struct_field_ref (CouchDBStructField *sf)
}
void
-couchdb_struct_field_unref (CouchDBStructField *sf)
+couchdb_struct_field_unref (CouchdbStructField *sf)
{
gint old_ref;
@@ -119,12 +119,12 @@ couchdb_struct_field_unref (CouchDBStructField *sf)
g_atomic_int_compare_and_exchange (&sf->ref_count, old_ref, old_ref - 1);
else {
json_object_unref (sf->json_object);
- g_slice_free (CouchDBStructField, sf);
+ g_slice_free (CouchdbStructField, sf);
}
}
gboolean
-couchdb_struct_field_has_field (CouchDBStructField *sf, const char *field)
+couchdb_struct_field_has_field (CouchdbStructField *sf, const char *field)
{
g_return_val_if_fail (sf != NULL, FALSE);
g_return_val_if_fail (field != NULL, FALSE);
@@ -133,7 +133,7 @@ couchdb_struct_field_has_field (CouchDBStructField *sf, const char *field)
}
void
-couchdb_struct_field_remove_field (CouchDBStructField *sf, const char *field)
+couchdb_struct_field_remove_field (CouchdbStructField *sf, const char *field)
{
g_return_if_fail (sf != NULL);
g_return_if_fail (field != NULL);
@@ -142,7 +142,7 @@ couchdb_struct_field_remove_field (CouchDBStructField *sf, const char *field)
}
gboolean
-couchdb_struct_field_get_boolean_field (CouchDBStructField *sf, const char *field)
+couchdb_struct_field_get_boolean_field (CouchdbStructField *sf, const char *field)
{
g_return_val_if_fail (sf != NULL, 0);
g_return_val_if_fail (field != NULL, 0);
@@ -151,7 +151,7 @@ couchdb_struct_field_get_boolean_field (CouchDBStructField *sf, const char *fiel
}
void
-couchdb_struct_field_set_boolean_field (CouchDBStructField *sf, const char *field, gboolean value)
+couchdb_struct_field_set_boolean_field (CouchdbStructField *sf, const char *field, gboolean value)
{
g_return_if_fail (sf != NULL);
g_return_if_fail (field != NULL);
@@ -160,7 +160,7 @@ couchdb_struct_field_set_boolean_field (CouchDBStructField *sf, const char *fiel
}
gdouble
-couchdb_struct_field_get_double_field (CouchDBStructField *sf, const char *field)
+couchdb_struct_field_get_double_field (CouchdbStructField *sf, const char *field)
{
g_return_val_if_fail (sf != NULL, 0);
g_return_val_if_fail (field != NULL, 0);
@@ -169,7 +169,7 @@ couchdb_struct_field_get_double_field (CouchDBStructField *sf, const char *field
}
void
-couchdb_struct_field_set_double_field (CouchDBStructField *sf, const char *field, gdouble value)
+couchdb_struct_field_set_double_field (CouchdbStructField *sf, const char *field, gdouble value)
{
g_return_if_fail (sf != NULL);
g_return_if_fail (field != NULL);
@@ -178,7 +178,7 @@ couchdb_struct_field_set_double_field (CouchDBStructField *sf, const char *field
}
gint
-couchdb_struct_field_get_int_field (CouchDBStructField *sf, const char *field)
+couchdb_struct_field_get_int_field (CouchdbStructField *sf, const char *field)
{
g_return_val_if_fail (sf != NULL, 0);
g_return_val_if_fail (field != NULL, 0);
@@ -187,7 +187,7 @@ couchdb_struct_field_get_int_field (CouchDBStructField *sf, const char *field)
}
void
-couchdb_struct_field_set_int_field (CouchDBStructField *sf, const char *field, gint value)
+couchdb_struct_field_set_int_field (CouchdbStructField *sf, const char *field, gint value)
{
g_return_if_fail (sf != NULL);
g_return_if_fail (field != NULL);
@@ -196,7 +196,7 @@ couchdb_struct_field_set_int_field (CouchDBStructField *sf, const char *field, g
}
const char *
-couchdb_struct_field_get_string_field (CouchDBStructField *sf, const char *field)
+couchdb_struct_field_get_string_field (CouchdbStructField *sf, const char *field)
{
g_return_val_if_fail (sf != NULL, NULL);
g_return_val_if_fail (field != NULL, NULL);
@@ -205,7 +205,7 @@ couchdb_struct_field_get_string_field (CouchDBStructField *sf, const char *field
}
void
-couchdb_struct_field_set_string_field (CouchDBStructField *sf, const char *field, const char *value)
+couchdb_struct_field_set_string_field (CouchdbStructField *sf, const char *field, const char *value)
{
g_return_if_fail (sf != NULL);
g_return_if_fail (field != NULL);
@@ -218,8 +218,8 @@ couchdb_struct_field_set_string_field (CouchDBStructField *sf, const char *field
}
}
-CouchDBStructField *
-couchdb_struct_field_get_struct_field (CouchDBStructField *sf, const char *field)
+CouchdbStructField *
+couchdb_struct_field_get_struct_field (CouchdbStructField *sf, const char *field)
{
g_return_val_if_fail (sf != NULL, NULL);
g_return_val_if_fail (field != NULL, NULL);
@@ -232,7 +232,7 @@ couchdb_struct_field_get_struct_field (CouchDBStructField *sf, const char *field
}
void
-couchdb_struct_field_set_struct_field (CouchDBStructField *sf, const char *field, CouchDBStructField *value)
+couchdb_struct_field_set_struct_field (CouchdbStructField *sf, const char *field, CouchdbStructField *value)
{
g_return_if_fail (sf != NULL);
g_return_if_fail (field != NULL);
@@ -242,7 +242,7 @@ couchdb_struct_field_set_struct_field (CouchDBStructField *sf, const char *field
}
const char *
-couchdb_struct_field_get_uuid (CouchDBStructField *sf)
+couchdb_struct_field_get_uuid (CouchdbStructField *sf)
{
g_return_val_if_fail (sf != NULL, NULL);
@@ -250,7 +250,7 @@ couchdb_struct_field_get_uuid (CouchDBStructField *sf)
}
void
-couchdb_struct_field_set_uuid (CouchDBStructField *sf, const char *uuid)
+couchdb_struct_field_set_uuid (CouchdbStructField *sf, const char *uuid)
{
g_return_if_fail (sf != NULL);
@@ -261,7 +261,7 @@ couchdb_struct_field_set_uuid (CouchDBStructField *sf, const char *uuid)
}
char *
-couchdb_struct_field_to_string (CouchDBStructField *sf)
+couchdb_struct_field_to_string (CouchdbStructField *sf)
{
JsonNode *node;
JsonGenerator *generator;
@@ -285,7 +285,7 @@ couchdb_struct_field_to_string (CouchDBStructField *sf)
}
JsonObject *
-couchdb_struct_field_get_json_object (CouchDBStructField *sf)
+couchdb_struct_field_get_json_object (CouchdbStructField *sf)
{
g_return_val_if_fail (sf != NULL, NULL);
diff --git a/couchdb-glib/couchdb-struct-field.h b/couchdb-glib/couchdb-struct-field.h
index 6039053..58408b8 100644
--- a/couchdb-glib/couchdb-struct-field.h
+++ b/couchdb-glib/couchdb-struct-field.h
@@ -35,33 +35,33 @@ G_BEGIN_DECLS
#define COUCHDB_TYPE_STRUCT_FIELD (couchdb_struct_field_get_type ())
GType couchdb_struct_field_get_type (void);
-CouchDBStructField *couchdb_struct_field_new (void);
-CouchDBStructField *couchdb_struct_field_new_from_string (const char *str);
-CouchDBStructField *couchdb_struct_field_ref (CouchDBStructField *sf);
-void couchdb_struct_field_unref (CouchDBStructField *sf);
+CouchdbStructField *couchdb_struct_field_new (void);
+CouchdbStructField *couchdb_struct_field_new_from_string (const char *str);
+CouchdbStructField *couchdb_struct_field_ref (CouchdbStructField *sf);
+void couchdb_struct_field_unref (CouchdbStructField *sf);
-gboolean couchdb_struct_field_has_field (CouchDBStructField *sf, const char *field);
-void couchdb_struct_field_remove_field (CouchDBStructField *sf, const char *field);
+gboolean couchdb_struct_field_has_field (CouchdbStructField *sf, const char *field);
+void couchdb_struct_field_remove_field (CouchdbStructField *sf, const char *field);
-gboolean couchdb_struct_field_get_boolean_field (CouchDBStructField *sf, const char *field);
-void couchdb_struct_field_set_boolean_field (CouchDBStructField *sf, const char *field, gboolean value);
-gdouble couchdb_struct_field_get_double_field (CouchDBStructField *sf, const char *field);
-void couchdb_struct_field_set_double_field (CouchDBStructField *sf, const char *field, gdouble value);
-gint couchdb_struct_field_get_int_field (CouchDBStructField *sf, const char *field);
-void couchdb_struct_field_set_int_field (CouchDBStructField *sf, const char *field, gint value);
-const char *couchdb_struct_field_get_string_field (CouchDBStructField *sf, const char *field);
-void couchdb_struct_field_set_string_field (CouchDBStructField *sf, const char *field, const char *value);
-CouchDBStructField *couchdb_struct_field_get_struct_field (CouchDBStructField *sf, const char *field);
-void couchdb_struct_field_set_struct_field (CouchDBStructField *sf, const char *field, CouchDBStructField *value);
+gboolean couchdb_struct_field_get_boolean_field (CouchdbStructField *sf, const char *field);
+void couchdb_struct_field_set_boolean_field (CouchdbStructField *sf, const char *field, gboolean value);
+gdouble couchdb_struct_field_get_double_field (CouchdbStructField *sf, const char *field);
+void couchdb_struct_field_set_double_field (CouchdbStructField *sf, const char *field, gdouble value);
+gint couchdb_struct_field_get_int_field (CouchdbStructField *sf, const char *field);
+void couchdb_struct_field_set_int_field (CouchdbStructField *sf, const char *field, gint value);
+const char *couchdb_struct_field_get_string_field (CouchdbStructField *sf, const char *field);
+void couchdb_struct_field_set_string_field (CouchdbStructField *sf, const char *field, const char *value);
+CouchdbStructField *couchdb_struct_field_get_struct_field (CouchdbStructField *sf, const char *field);
+void couchdb_struct_field_set_struct_field (CouchdbStructField *sf, const char *field, CouchdbStructField *value);
-const char *couchdb_struct_field_get_uuid (CouchDBStructField *sf);
-void couchdb_struct_field_set_uuid (CouchDBStructField *sf, const char *uuid);
+const char *couchdb_struct_field_get_uuid (CouchdbStructField *sf);
+void couchdb_struct_field_set_uuid (CouchdbStructField *sf, const char *uuid);
-char *couchdb_struct_field_to_string (CouchDBStructField *sf);
+char *couchdb_struct_field_to_string (CouchdbStructField *sf);
-CouchDBStructField *couchdb_struct_field_new_from_json_object (JsonObject *json_object);
+CouchdbStructField *couchdb_struct_field_new_from_json_object (JsonObject *json_object);
-JsonObject *couchdb_struct_field_get_json_object (CouchDBStructField *sf);
+JsonObject *couchdb_struct_field_get_json_object (CouchdbStructField *sf);
G_END_DECLS
diff --git a/couchdb-glib/couchdb-types.h b/couchdb-glib/couchdb-types.h
index 6983ebe..55b7944 100644
--- a/couchdb-glib/couchdb-types.h
+++ b/couchdb-glib/couchdb-types.h
@@ -28,11 +28,11 @@
G_BEGIN_DECLS
-typedef struct _CouchDBDocument CouchDBDocument;
-typedef struct _CouchDB CouchDB;
-typedef struct _CouchDBDatabaseInfo CouchDBDatabaseInfo;
-typedef struct _CouchDBDocumentInfo CouchDBDocumentInfo;
-typedef struct _CouchDBStructField CouchDBStructField;
+typedef struct _CouchdbDocument CouchdbDocument;
+typedef struct _Couchdb Couchdb;
+typedef struct _CouchdbDatabaseInfo CouchdbDatabaseInfo;
+typedef struct _CouchdbDocumentInfo CouchdbDocumentInfo;
+typedef struct _CouchdbStructField CouchdbStructField;
G_END_DECLS
diff --git a/couchdb-glib/couchdb.c b/couchdb-glib/couchdb.c
index 73452c7..d2131ec 100644
--- a/couchdb-glib/couchdb.c
+++ b/couchdb-glib/couchdb.c
@@ -35,7 +35,7 @@
#include "oauth.h"
#endif
-struct _CouchDB {
+struct _Couchdb {
GObject parent;
char *hostname;
@@ -50,7 +50,7 @@ struct _CouchDB {
char *oauth_token_secret;
};
-G_DEFINE_TYPE(CouchDB, couchdb, G_TYPE_OBJECT)
+G_DEFINE_TYPE(Couchdb, couchdb, G_TYPE_OBJECT)
enum {
DATABASE_CREATED,
@@ -65,7 +65,7 @@ static guint couchdb_signals[LAST_SIGNAL];
static void
couchdb_finalize (GObject *object)
{
- CouchDB *couchdb = COUCHDB (object);
+ Couchdb *couchdb = COUCHDB (object);
g_hash_table_destroy (couchdb->db_watchlist);
@@ -85,7 +85,7 @@ couchdb_finalize (GObject *object)
}
static void
-couchdb_class_init (CouchDBClass *klass)
+couchdb_class_init (CouchdbClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
@@ -96,7 +96,7 @@ couchdb_class_init (CouchDBClass *klass)
g_signal_new ("database_created",
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (CouchDBClass, database_created),
+ G_STRUCT_OFFSET (CouchdbClass, database_created),
NULL, NULL,
g_cclosure_marshal_VOID__STRING,
G_TYPE_NONE, 1,
@@ -105,7 +105,7 @@ couchdb_class_init (CouchDBClass *klass)
g_signal_new ("database_deleted",
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (CouchDBClass, database_deleted),
+ G_STRUCT_OFFSET (CouchdbClass, database_deleted),
NULL, NULL,
g_cclosure_marshal_VOID__STRING,
G_TYPE_NONE, 1,
@@ -114,7 +114,7 @@ couchdb_class_init (CouchDBClass *klass)
g_signal_new ("document_created",
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (CouchDBClass, document_created),
+ G_STRUCT_OFFSET (CouchdbClass, document_created),
NULL, NULL,
_couchdb_marshal_VOID__STRING_OBJECT,
G_TYPE_NONE, 2,
@@ -124,7 +124,7 @@ couchdb_class_init (CouchDBClass *klass)
g_signal_new ("document_updated",
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (CouchDBClass, document_updated),
+ G_STRUCT_OFFSET (CouchdbClass, document_updated),
NULL, NULL,
_couchdb_marshal_VOID__STRING_OBJECT,
G_TYPE_NONE, 2,
@@ -134,7 +134,7 @@ couchdb_class_init (CouchDBClass *klass)
g_signal_new ("document_deleted",
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (CouchDBClass, document_deleted),
+ G_STRUCT_OFFSET (CouchdbClass, document_deleted),
NULL, NULL,
_couchdb_marshal_VOID__STRING_STRING,
G_TYPE_NONE, 2,
@@ -143,17 +143,17 @@ couchdb_class_init (CouchDBClass *klass)
}
static void
-couchdb_init (CouchDB *couchdb)
+couchdb_init (Couchdb *couchdb)
{
couchdb->db_watchlist = g_hash_table_new_full (g_str_hash, g_str_equal,
(GDestroyNotify) g_free,
(GDestroyNotify) dbwatch_free);
}
-CouchDB *
+Couchdb *
couchdb_new (const char *hostname)
{
- CouchDB *couchdb;
+ Couchdb *couchdb;
couchdb = g_object_new (COUCHDB_TYPE, NULL);
couchdb->hostname = hostname ? g_strdup (hostname) : g_strdup ("http://127.0.0.1:5984";);
@@ -173,7 +173,7 @@ couchdb_new (const char *hostname)
}
const char *
-couchdb_get_hostname (CouchDB *couchdb)
+couchdb_get_hostname (Couchdb *couchdb)
{
g_return_val_if_fail (COUCHDB_IS (couchdb), NULL);
@@ -181,7 +181,7 @@ couchdb_get_hostname (CouchDB *couchdb)
}
GSList *
-couchdb_list_databases (CouchDB *couchdb, GError **error)
+couchdb_list_databases (Couchdb *couchdb, GError **error)
{
char *url;
GSList *dblist = NULL;
@@ -215,12 +215,12 @@ couchdb_list_databases (CouchDB *couchdb, GError **error)
return dblist;
}
-CouchDBDatabaseInfo *
-couchdb_get_database_info (CouchDB *couchdb, const char *dbname, GError **error)
+CouchdbDatabaseInfo *
+couchdb_get_database_info (Couchdb *couchdb, const char *dbname, GError **error)
{
char *url;
JsonParser *parser;
- CouchDBDatabaseInfo *result = NULL;
+ CouchdbDatabaseInfo *result = NULL;
g_return_val_if_fail (COUCHDB_IS (couchdb), NULL);
g_return_val_if_fail (dbname != NULL, NULL);
@@ -248,7 +248,7 @@ couchdb_get_database_info (CouchDB *couchdb, const char *dbname, GError **error)
}
gboolean
-couchdb_create_database (CouchDB *couchdb, const char *dbname, GError **error)
+couchdb_create_database (Couchdb *couchdb, const char *dbname, GError **error)
{
char *url;
JsonParser *parser;
@@ -278,7 +278,7 @@ couchdb_create_database (CouchDB *couchdb, const char *dbname, GError **error)
}
gboolean
-couchdb_delete_database (CouchDB *couchdb, const char *dbname, GError **error)
+couchdb_delete_database (Couchdb *couchdb, const char *dbname, GError **error)
{
char *url;
JsonParser *parser;
@@ -322,7 +322,7 @@ couchdb_free_database_list (GSList *dblist)
}
GSList *
-couchdb_list_documents (CouchDB *couchdb, const char *dbname, GError **error)
+couchdb_list_documents (Couchdb *couchdb, const char *dbname, GError **error)
{
char *url;
JsonParser *parser;
@@ -345,7 +345,7 @@ couchdb_list_documents (CouchDB *couchdb, const char *dbname, GError **error)
json_node_get_object (root_node), "rows");
for (i = 0; i < json_array_get_length (rows); i++) {
JsonObject *doc;
- CouchDBDocumentInfo *doc_info;
+ CouchdbDocumentInfo *doc_info;
doc = json_array_get_object_element (rows, i);
if (!doc)
@@ -376,10 +376,10 @@ couchdb_free_document_list (GSList *doclist)
}
void
-couchdb_listen_for_changes (CouchDB *couchdb, const char *dbname)
+couchdb_listen_for_changes (Couchdb *couchdb, const char *dbname)
{
DBWatch *watch;
- CouchDBDatabaseInfo *db_info;
+ CouchdbDatabaseInfo *db_info;
GError *error = NULL;
g_return_if_fail (COUCHDB_IS (couchdb));
@@ -413,18 +413,18 @@ couchdb_listen_for_changes (CouchDB *couchdb, const char *dbname)
/**
* couchdb_enable_oauth:
- * @couchdb: A #CouchDB object
+ * @couchdb: A #Couchdb object
* @consumer_key: Consumer key to use
* @consumer_secret: Consumer secret to use
* @token_key: Token key to use
* @token_secret: Token secret to use
*
- * Enables oAuth signing of all requests for the given #CouchDB object.
+ * Enables oAuth signing of all requests for the given #Couchdb object.
*
* Return value: TRUE if oAuth is enabled in the library or FALSE if not.
*/
gboolean
-couchdb_enable_oauth (CouchDB *couchdb,
+couchdb_enable_oauth (Couchdb *couchdb,
const char *consumer_key,
const char *consumer_secret,
const char *token_key,
@@ -453,7 +453,7 @@ couchdb_enable_oauth (CouchDB *couchdb,
}
gboolean
-couchdb_is_oauth_enabled (CouchDB *couchdb)
+couchdb_is_oauth_enabled (Couchdb *couchdb)
{
g_return_val_if_fail (COUCHDB_IS (couchdb), FALSE);
@@ -462,7 +462,7 @@ couchdb_is_oauth_enabled (CouchDB *couchdb)
static void
-couchdb_add_oauth_signature (CouchDB *couchdb, SoupMessage *http_message, const char *method, const char *url)
+couchdb_add_oauth_signature (Couchdb *couchdb, SoupMessage *http_message, const char *method, const char *url)
{
/* This method is a no-op if we are configured without OAUTH */
#ifdef HAVE_OAUTH
@@ -529,7 +529,7 @@ couchdb_add_oauth_signature (CouchDB *couchdb, SoupMessage *http_message, const
}
static gboolean
-parse_json_response (CouchDB *couchdb, JsonParser *json_parser, SoupMessage *http_message, GError **error)
+parse_json_response (Couchdb *couchdb, JsonParser *json_parser, SoupMessage *http_message, GError **error)
{
SoupBuffer *buffer;
GString *str = NULL;
@@ -569,7 +569,7 @@ debug_print_headers (const char *name, const char *value, gpointer user_data)
}
gboolean
-couchdb_send_message (CouchDB *couchdb, const char *method, const char *url, const char *body, JsonParser *parser, GError **error)
+couchdb_send_message (Couchdb *couchdb, const char *method, const char *url, const char *body, JsonParser *parser, GError **error)
{
SoupMessage *http_message;
guint status;
diff --git a/couchdb-glib/couchdb.h b/couchdb-glib/couchdb.h
index e87bd99..4a1e820 100644
--- a/couchdb-glib/couchdb.h
+++ b/couchdb-glib/couchdb.h
@@ -33,50 +33,50 @@
G_BEGIN_DECLS
#define COUCHDB_TYPE (couchdb_get_type ())
-#define COUCHDB(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), COUCHDB_TYPE, CouchDB))
+#define COUCHDB(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), COUCHDB_TYPE, Couchdb))
#define COUCHDB_IS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), COUCHDB_TYPE))
-#define COUCHDB_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), COUCHDB_TYPE, CouchDBClass))
+#define COUCHDB_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), COUCHDB_TYPE, CouchdbClass))
#define COUCHDB_IS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), COUCHDB_TYPE))
-#define COUCHDB_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), COUCHDB_TYPE, CouchDBClass))
+#define COUCHDB_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), COUCHDB_TYPE, CouchdbClass))
typedef struct {
GObjectClass parent_class;
- void (* database_created) (CouchDB *couchdb, const char *dbname);
- void (* database_deleted) (CouchDB *couchdb, const char *dbname);
+ void (* database_created) (Couchdb *couchdb, const char *dbname);
+ void (* database_deleted) (Couchdb *couchdb, const char *dbname);
- void (* document_created) (CouchDB *couchdb, const char *dbname, CouchDBDocument *document);
- void (* document_updated) (CouchDB *couchdb, const char *dbname, CouchDBDocument *document);
- void (* document_deleted) (CouchDB *couchdb, const char *dbname, const char *docid);
-} CouchDBClass;
+ void (* document_created) (Couchdb *couchdb, const char *dbname, CouchdbDocument *document);
+ void (* document_updated) (Couchdb *couchdb, const char *dbname, CouchdbDocument *document);
+ void (* document_deleted) (Couchdb *couchdb, const char *dbname, const char *docid);
+} CouchdbClass;
GType couchdb_get_type (void);
-CouchDB *couchdb_new (const char *hostname);
+Couchdb *couchdb_new (const char *hostname);
-const char *couchdb_get_hostname (CouchDB *couchdb);
+const char *couchdb_get_hostname (Couchdb *couchdb);
-GSList *couchdb_list_databases (CouchDB *couchdb, GError **error);
+GSList *couchdb_list_databases (Couchdb *couchdb, GError **error);
void couchdb_free_database_list (GSList *dblist);
-CouchDBDatabaseInfo *couchdb_get_database_info (CouchDB *couchdb, const char *dbname, GError **error);
+CouchdbDatabaseInfo *couchdb_get_database_info (Couchdb *couchdb, const char *dbname, GError **error);
-gboolean couchdb_create_database (CouchDB *couchdb, const char *dbname, GError **error);
-gboolean couchdb_delete_database (CouchDB *couchdb, const char *dbname, GError **error);
+gboolean couchdb_create_database (Couchdb *couchdb, const char *dbname, GError **error);
+gboolean couchdb_delete_database (Couchdb *couchdb, const char *dbname, GError **error);
-void couchdb_listen_for_changes (CouchDB *couchdb, const char *dbname);
+void couchdb_listen_for_changes (Couchdb *couchdb, const char *dbname);
-gboolean couchdb_enable_oauth (CouchDB *couchdb,
+gboolean couchdb_enable_oauth (Couchdb *couchdb,
const char *consumer_key,
const char *consumer_secret,
const char *token_key,
const char *token_secret);
-void couchdb_disable_oauth (CouchDB *couchdb);
+void couchdb_disable_oauth (Couchdb *couchdb);
-gboolean couchdb_is_oauth_enabled (CouchDB *couchdb);
+gboolean couchdb_is_oauth_enabled (Couchdb *couchdb);
-gboolean couchdb_send_message (CouchDB *couchdb, const char *method, const char *url, const char *body, JsonParser *parser, GError **error);
+gboolean couchdb_send_message (Couchdb *couchdb, const char *method, const char *url, const char *body, JsonParser *parser, GError **error);
-GSList *couchdb_list_documents (CouchDB *couchdb, const char *dbname, GError **error);
+GSList *couchdb_list_documents (Couchdb *couchdb, const char *dbname, GError **error);
void couchdb_free_document_list (GSList *doclist);
G_END_DECLS
diff --git a/couchdb-glib/dbwatch.c b/couchdb-glib/dbwatch.c
index 28faf67..a2ea673 100644
--- a/couchdb-glib/dbwatch.c
+++ b/couchdb-glib/dbwatch.c
@@ -32,7 +32,7 @@ process_change (DBWatch *watch, JsonNode *node)
{
JsonObject *this_change;
const gchar *id;
- CouchDBDocument *document;
+ CouchdbDocument *document;
GError *error = NULL;
if (json_node_get_node_type (node) != JSON_NODE_OBJECT)
@@ -113,7 +113,7 @@ watch_timeout_cb (gpointer user_data)
}
DBWatch *
-dbwatch_new (CouchDB *couchdb, const gchar *dbname, gint update_seq)
+dbwatch_new (Couchdb *couchdb, const gchar *dbname, gint update_seq)
{
DBWatch *watch;
guint timeout;
diff --git a/couchdb-glib/dbwatch.h b/couchdb-glib/dbwatch.h
index 24d59bd..331badb 100644
--- a/couchdb-glib/dbwatch.h
+++ b/couchdb-glib/dbwatch.h
@@ -27,13 +27,13 @@
#include "utils.h"
typedef struct {
- CouchDB *couchdb;
+ Couchdb *couchdb;
gchar *dbname;
gint last_update_seq;
guint timeout_id;
} DBWatch;
-DBWatch *dbwatch_new (CouchDB *couchdb, const gchar *dbname, gint update_seq);
+DBWatch *dbwatch_new (Couchdb *couchdb, const gchar *dbname, gint update_seq);
void dbwatch_free (DBWatch *watch);
#endif /* __DBWATCH_H__ */
diff --git a/tests/test-couchdb-glib.c b/tests/test-couchdb-glib.c
index e0f8143..816a917 100644
--- a/tests/test-couchdb-glib.c
+++ b/tests/test-couchdb-glib.c
@@ -22,7 +22,7 @@
#include <couchdb-glib.h>
#include <utils.h>
-static CouchDB *couchdb;
+static Couchdb *couchdb;
static void
test_list_databases (void)
@@ -39,7 +39,7 @@ test_list_databases (void)
}
while (dblist != NULL) {
- CouchDBDatabaseInfo *dbinfo;
+ CouchdbDatabaseInfo *dbinfo;
GSList *doclist;
error = NULL;
@@ -78,8 +78,8 @@ test_list_documents (void)
g_assert (error == NULL);
while (doclist) {
- CouchDBDocumentInfo *doc_info = doclist->data;
- CouchDBDocument *document;
+ CouchdbDocumentInfo *doc_info = doclist->data;
+ CouchdbDocument *document;
char *str;
error = NULL;
@@ -126,7 +126,7 @@ test_change_databases (void)
/* Create some documents */
for (i = 0; i < 10; i++) {
- CouchDBDocument *document;
+ CouchdbDocument *document;
char *str;
document = couchdb_document_new (couchdb);
@@ -153,19 +153,19 @@ test_change_databases (void)
}
static void
-db_created_cb (CouchDB *couchdb, const char *dbname, gpointer user_data)
+db_created_cb (Couchdb *couchdb, const char *dbname, gpointer user_data)
{
g_print ("Database %s has been created\n", dbname);
}
static void
-db_deleted_cb (CouchDB *couchdb, const char *dbname, gpointer user_data)
+db_deleted_cb (Couchdb *couchdb, const char *dbname, gpointer user_data)
{
g_print ("Database %s has been deleted\n", dbname);
}
static void
-doc_changed_cb (CouchDB *couchdb, const char *dbname, CouchDBDocument *document, gpointer user_data)
+doc_changed_cb (Couchdb *couchdb, const char *dbname, CouchdbDocument *document, gpointer user_data)
{
char *doc_str;
@@ -179,7 +179,7 @@ doc_changed_cb (CouchDB *couchdb, const char *dbname, CouchDBDocument *document,
}
static void
-doc_deleted_cb (CouchDB *couchdb, const char *dbname, const char *docid, gpointer user_data)
+doc_deleted_cb (Couchdb *couchdb, const char *dbname, const char *docid, gpointer user_data)
{
g_print ("Document %s in database %s has been deleted\n", docid, dbname);
}
@@ -193,10 +193,10 @@ main (int argc, char *argv[])
/* Initialize data needed for all tests */
couchdb = argc > 1 ? couchdb_new (argv[1]) : couchdb_new (NULL);
- g_printf ("Connecting to CouchDB at %s\n", couchdb_get_hostname (couchdb));
+ g_printf ("Connecting to Couchdb at %s\n", couchdb_get_uri (couchdb));
if (!couchdb) {
- g_print ("Could not create CouchDB object\n");
+ g_print ("Could not create Couchdb object\n");
return -1;
}
diff --git a/tests/test-list-databases.c b/tests/test-list-databases.c
index a8eb502..4a534e8 100644
--- a/tests/test-list-databases.c
+++ b/tests/test-list-databases.c
@@ -24,7 +24,7 @@
int
main (int argc, char *argv[])
{
- CouchDB *couchdb;
+ Couchdb *couchdb;
GSList *dblist, *sl;
GError *error = NULL;
@@ -32,12 +32,12 @@ main (int argc, char *argv[])
g_type_init ();
g_thread_init (NULL);
- /* Initialize CouchDB */
+ /* Initialize Couchdb */
couchdb = argc > 1 ? couchdb_new (argv[1]) : couchdb_new (NULL);
- g_printf ("Connecting to CouchDB at %s\n", couchdb_get_hostname (couchdb));
+ g_printf ("Connecting to Couchdb at %s\n", couchdb_get_uri (couchdb));
if (!couchdb) {
- g_print ("Could not create CouchDB object\n");
+ g_print ("Could not create Couchdb object\n");
return -1;
}
@@ -48,7 +48,7 @@ main (int argc, char *argv[])
}
for (sl = dblist; sl != NULL; sl = sl->next) {
- CouchDBDatabaseInfo *dbinfo;
+ CouchdbDatabaseInfo *dbinfo;
GSList *doclist;
error = NULL;
@@ -81,8 +81,8 @@ main (int argc, char *argv[])
g_print ("\tDocuments:\n");
for (sl_doc = doclist; sl_doc != NULL; sl_doc = sl_doc->next) {
- CouchDBDocumentInfo *doc_info = sl_doc->data;
- CouchDBDocument *document;
+ CouchdbDocumentInfo *doc_info = sl_doc->data;
+ CouchdbDocument *document;
error = NULL;
document = couchdb_document_get (couchdb,
diff --git a/tests/test-oauth.c b/tests/test-oauth.c
index ec2f36b..913156c 100644
--- a/tests/test-oauth.c
+++ b/tests/test-oauth.c
@@ -66,7 +66,7 @@ main (int argc, char *argv[])
char *c_key, *c_secret, *t_key, *t_secret, *url, *method, *nonce, *timestamp;
char *liboauth_signed;
char *command_line, *command_line_output;
- CouchDB *couchdb;
+ Couchdb *couchdb;
GSList *db_list;
GError *error = NULL;
@@ -107,7 +107,7 @@ main (int argc, char *argv[])
g_spawn_command_line_sync (command_line, &command_line_output, NULL, NULL, NULL);
g_print ("%s\n", command_line_output);
- /* Now connecting to CouchDB with this OAuth stuff */
+ /* Now connecting to Couchdb with this OAuth stuff */
g_type_init ();
g_thread_init (NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
