Remane guid_set to guid_group

Set is a bit of a confusing word

12 files changed, 85 insertions, 85 deletions

diff --git a/src/libtidbit/tidbit-database-dbus.c b/src/libtidbit/tidbit-database-dbus.c
index 0a73705..0d4791a 100644
--- a/src/libtidbit/tidbit-database-dbus.c
+++ b/src/libtidbit/tidbit-database-dbus.c
@@ -31,7 +31,7 @@
 static void tidbit_database_dbus_free (PtrTidbitDatabase database);
 static unsigned int tidbit_database_dbus_insert (PtrTidbitDatabase database, PtrTidbitRecord record);
 static PtrTidbitRecord tidbit_database_dbus_fetch (PtrTidbitDatabase database, PtrTidbitGuid guid);
-static PtrTidbitGuidSet tidbit_database_dbus_query (PtrTidbitDatabase database, PtrTidbitQuery query);
+static PtrTidbitGuidGroup tidbit_database_dbus_query (PtrTidbitDatabase database, PtrTidbitQuery query);
 
 static TidbitDatabaseFunctions backend_functions = {
     &tidbit_database_dbus_free,
@@ -96,7 +96,7 @@ static void add_query_to_gptrarray (PtrTidbitQueryExp expression, gpointer user_
 }
 
 
-static PtrTidbitGuidSet tidbit_database_dbus_query (PtrTidbitDatabase database, PtrTidbitQuery query)
+static PtrTidbitGuidGroup tidbit_database_dbus_query (PtrTidbitDatabase database, PtrTidbitQuery query)
 {
  PtrTidbitDatabaseDbus backend = GET_DBUS_BACKEND(database);
  GError *error = NULL;
@@ -106,11 +106,11 @@ static PtrTidbitGuidSet tidbit_database_dbus_query (PtrTidbitDatabase database,
  
  org_freedesktop_Tidbit_query (backend->proxy, g_strdup(query->table_name), elements, &guids, &error);
  
- PtrTidbitGuidSet guid_set = tidbit_guid_set_new ();
+ PtrTidbitGuidGroup guid_group = tidbit_guid_group_new ();
  for (int i = 0; guids[i]; i++){
     PtrTidbitGuid guid = tidbit_guid_new (guids[i]);
-    tidbit_guid_set_append (guid_set, guid);
+    tidbit_guid_group_append (guid_group, guid);
     tidbit_guid_unref (guid);
     }
- return guid_set;
+ return guid_group;
 }
diff --git a/src/libtidbit/tidbit-database-fork.c b/src/libtidbit/tidbit-database-fork.c
index 6d04c84..fe36b90 100644
--- a/src/libtidbit/tidbit-database-fork.c
+++ b/src/libtidbit/tidbit-database-fork.c
@@ -28,7 +28,7 @@
 static void tidbit_database_fork_free (PtrTidbitDatabase database);
 static unsigned int tidbit_database_fork_insert (PtrTidbitDatabase database, PtrTidbitRecord record);
 static PtrTidbitRecord tidbit_database_fork_fetch (PtrTidbitDatabase database, PtrTidbitGuid guid);
-static PtrTidbitGuidSet tidbit_database_fork_query (PtrTidbitDatabase database, PtrTidbitQuery query);
+static PtrTidbitGuidGroup tidbit_database_fork_query (PtrTidbitDatabase database, PtrTidbitQuery query);
 
 static TidbitDatabaseFunctions backend_functions = {
     &tidbit_database_fork_free,
@@ -78,13 +78,13 @@ static PtrTidbitRecord tidbit_database_fork_fetch (PtrTidbitDatabase database, P
  return record;
 }
 
-static PtrTidbitGuidSet tidbit_database_fork_query (PtrTidbitDatabase database, PtrTidbitQuery query)
+static PtrTidbitGuidGroup tidbit_database_fork_query (PtrTidbitDatabase database, PtrTidbitQuery query)
 {
  PtrTidbitDatabaseFork backend = GET_FORK_BACKEND(database);
- PtrTidbitGuidSet guid_set_a = tidbit_database_query (backend->sub_a, query);
- PtrTidbitGuidSet guid_set_b = tidbit_database_query (backend->sub_b, query);
- PtrTidbitGuidSet guid_set = tidbit_guid_set_merge (guid_set_a, guid_set_b);
- tidbit_guid_set_unref (guid_set_a);
- tidbit_guid_set_unref (guid_set_b);
- return guid_set;
+ PtrTidbitGuidGroup guid_group_a = tidbit_database_query (backend->sub_a, query);
+ PtrTidbitGuidGroup guid_group_b = tidbit_database_query (backend->sub_b, query);
+ PtrTidbitGuidGroup guid_group = tidbit_guid_group_merge (guid_group_a, guid_group_b);
+ tidbit_guid_group_unref (guid_group_a);
+ tidbit_guid_group_unref (guid_group_b);
+ return guid_group;
 }
diff --git a/src/libtidbit/tidbit-database-http.c b/src/libtidbit/tidbit-database-http.c
index a2664d0..cec73ff 100644
--- a/src/libtidbit/tidbit-database-http.c
+++ b/src/libtidbit/tidbit-database-http.c
@@ -30,7 +30,7 @@
 static void tidbit_database_http_free (PtrTidbitDatabase database);
 static unsigned int tidbit_database_http_insert (PtrTidbitDatabase database, PtrTidbitRecord record);
 static PtrTidbitRecord tidbit_database_http_fetch (PtrTidbitDatabase database, PtrTidbitGuid guid);
-static PtrTidbitGuidSet tidbit_database_http_query (PtrTidbitDatabase database, PtrTidbitQuery query);
+static PtrTidbitGuidGroup tidbit_database_http_query (PtrTidbitDatabase database, PtrTidbitQuery query);
 
 static TidbitDatabaseFunctions backend_functions = {
     &tidbit_database_http_free,
@@ -87,7 +87,7 @@ static void add_query_to_hashtable (PtrTidbitQueryExp expression, gpointer user_
 }
 
 
-static PtrTidbitGuidSet tidbit_database_http_query (PtrTidbitDatabase database, PtrTidbitQuery query)
+static PtrTidbitGuidGroup tidbit_database_http_query (PtrTidbitDatabase database, PtrTidbitQuery query)
 {
  PtrTidbitDatabaseHttp backend = GET_HTTP_BACKEND(database);
  GHashTable *form_data_set = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);;
@@ -101,14 +101,14 @@ static PtrTidbitGuidSet tidbit_database_http_query (PtrTidbitDatabase database,
  
  char** guids =  g_strsplit ((char *) msg->response_body->data, "\n", 0);
  
- PtrTidbitGuidSet guid_set = tidbit_guid_set_new ();
+ PtrTidbitGuidGroup guid_group = tidbit_guid_group_new ();
  for (int i = 0; guids[i]; i++){
     if (!guids[i][0]) continue;
     PtrTidbitGuid guid = tidbit_guid_new (guids[i]);
-    tidbit_guid_set_append (guid_set, guid);
+    tidbit_guid_group_append (guid_group, guid);
     tidbit_guid_unref (guid);
     }
  g_strfreev (guids);
  
- return guid_set;
+ return guid_group;
 }
diff --git a/src/libtidbit/tidbit-database-mem.c b/src/libtidbit/tidbit-database-mem.c
index 8b45551..50600dc 100644
--- a/src/libtidbit/tidbit-database-mem.c
+++ b/src/libtidbit/tidbit-database-mem.c
@@ -29,7 +29,7 @@
 static void tidbit_database_mem_free (PtrTidbitDatabase database);
 static unsigned int tidbit_database_mem_insert (PtrTidbitDatabase database, PtrTidbitRecord record);
 static PtrTidbitRecord tidbit_database_mem_fetch (PtrTidbitDatabase database, PtrTidbitGuid guid);
-PtrTidbitGuidSet tidbit_database_mem_query (PtrTidbitDatabase database, PtrTidbitQuery query);
+PtrTidbitGuidGroup tidbit_database_mem_query (PtrTidbitDatabase database, PtrTidbitQuery query);
 
 static TidbitDatabaseFunctions backend_functions = {
     &tidbit_database_mem_free,
@@ -82,15 +82,15 @@ static PtrTidbitRecord tidbit_database_mem_fetch (PtrTidbitDatabase database, Pt
  return record;
 }
 
-PtrTidbitGuidSet tidbit_database_mem_query (PtrTidbitDatabase database, PtrTidbitQuery query)
+PtrTidbitGuidGroup tidbit_database_mem_query (PtrTidbitDatabase database, PtrTidbitQuery query)
 {
  PtrTidbitDatabaseMem backend = GET_MEM_BACKEND(database);
- PtrTidbitGuidSet guid_set = tidbit_guid_set_new ();
+ PtrTidbitGuidGroup guid_group = tidbit_guid_group_new ();
  for (GList* records = backend->records; records; records = g_list_next(records)){
     PtrTidbitRecord record = records->data;
     if (tidbit_query_test_record (query, record)){
-        tidbit_guid_set_append (guid_set, record->guid);
+        tidbit_guid_group_append (guid_group, record->guid);
         }
     }
- return guid_set;
+ return guid_group;
 }
diff --git a/src/libtidbit/tidbit-database-sqlite.c b/src/libtidbit/tidbit-database-sqlite.c
index ad5791d..c33cb74 100644
--- a/src/libtidbit/tidbit-database-sqlite.c
+++ b/src/libtidbit/tidbit-database-sqlite.c
@@ -31,7 +31,7 @@
 static void tidbit_database_sqlite_free (PtrTidbitDatabase database);
 static unsigned int tidbit_database_sqlite_insert (PtrTidbitDatabase database, PtrTidbitRecord record);
 static PtrTidbitRecord tidbit_database_sqlite_fetch (PtrTidbitDatabase database, PtrTidbitGuid guid);
-static PtrTidbitGuidSet tidbit_database_sqlite_query (PtrTidbitDatabase database, PtrTidbitQuery query);
+static PtrTidbitGuidGroup tidbit_database_sqlite_query (PtrTidbitDatabase database, PtrTidbitQuery query);
 
 static TidbitDatabaseFunctions backend_functions = {
     &tidbit_database_sqlite_free,
@@ -212,7 +212,7 @@ static void add_query_to_select_condition_builder (PtrTidbitQueryExp expression,
 //SELECT guid FROM guids, elements table_match, elements b ON guids.record = a1.record AND a1.record = b.record WHERE a1.key = 'key' AND a1.value = 'value' AND b.key= 'another_key' AND b.value= 'value'
 
 
-static PtrTidbitGuidSet tidbit_database_sqlite_query (PtrTidbitDatabase database, PtrTidbitQuery query)
+static PtrTidbitGuidGroup tidbit_database_sqlite_query (PtrTidbitDatabase database, PtrTidbitQuery query)
 {
  PtrTidbitDatabaseSqlite backend = GET_SQLITE_BACKEND(database);
  sqlite3 *db = backend->db;
@@ -237,17 +237,17 @@ static PtrTidbitGuidSet tidbit_database_sqlite_query (PtrTidbitDatabase database
  int res = sqlite3_prepare_v2 (db, builder.string->str, -1, &stmt, NULL);
  g_assert(res == SQLITE_OK);
  
- PtrTidbitGuidSet guid_set = tidbit_guid_set_new ();
+ PtrTidbitGuidGroup guid_group = tidbit_guid_group_new ();
  while (sqlite3_step (stmt) == SQLITE_ROW){
     char* guid_text = (char*) sqlite3_column_text(stmt, 0);
     PtrTidbitGuid guid = tidbit_guid_new (guid_text);
-    tidbit_guid_set_append (guid_set, guid);
+    tidbit_guid_group_append (guid_group, guid);
     tidbit_guid_unref (guid);
     }
  sqlite3_finalize (stmt);
  g_string_free (builder.string, TRUE);
  
- return guid_set;
+ return guid_group;
 }
 
 
diff --git a/src/libtidbit/tidbit-database.c b/src/libtidbit/tidbit-database.c
index 3e211bb..6e46f54 100644
--- a/src/libtidbit/tidbit-database.c
+++ b/src/libtidbit/tidbit-database.c
@@ -68,7 +68,7 @@ PtrTidbitRecord tidbit_database_fetch (PtrTidbitDatabase database, PtrTidbitGuid
  return database->functions->fetch(database, guid);
 }
 
-PtrTidbitGuidSet tidbit_database_query (PtrTidbitDatabase database, PtrTidbitQuery query)
+PtrTidbitGuidGroup tidbit_database_query (PtrTidbitDatabase database, PtrTidbitQuery query)
 {
  g_assert(database);
  g_assert(query);
diff --git a/src/libtidbit/tidbit-database.h b/src/libtidbit/tidbit-database.h
index 0075c10..19bdcf1 100644
--- a/src/libtidbit/tidbit-database.h
+++ b/src/libtidbit/tidbit-database.h
@@ -28,7 +28,7 @@ typedef struct TidbitDatabaseFunctions{
  void (*free) (PtrTidbitDatabase database);
  unsigned int (*insert) (PtrTidbitDatabase database, PtrTidbitRecord record);
  PtrTidbitRecord (*fetch) (PtrTidbitDatabase database, PtrTidbitGuid guid);
- PtrTidbitGuidSet (*query) (PtrTidbitDatabase database, PtrTidbitQuery query);
+ PtrTidbitGuidGroup (*query) (PtrTidbitDatabase database, PtrTidbitQuery query);
 }TidbitDatabaseFunctions, *PtrTidbitDatabaseFunctions;
 
 struct _TidbitDatabase{
@@ -44,7 +44,7 @@ void tidbit_database_ref (PtrTidbitDatabase database);
 void tidbit_database_unref (PtrTidbitDatabase database);
 unsigned int tidbit_database_insert (PtrTidbitDatabase database, PtrTidbitRecord record);
 PtrTidbitRecord tidbit_database_fetch (PtrTidbitDatabase database, PtrTidbitGuid guid);
-PtrTidbitGuidSet tidbit_database_query (PtrTidbitDatabase database, PtrTidbitQuery query);
+PtrTidbitGuidGroup tidbit_database_query (PtrTidbitDatabase database, PtrTidbitQuery query);
 */
 
 
diff --git a/src/libtidbit/tidbit-guid.c b/src/libtidbit/tidbit-guid.c
index 194086a..6e5eed3 100644
--- a/src/libtidbit/tidbit-guid.c
+++ b/src/libtidbit/tidbit-guid.c
@@ -65,70 +65,70 @@ const char* tidbit_guid_get_string (PtrTidbitGuid guid)
 
 
 
-PtrTidbitGuidSet tidbit_guid_set_new (void)
+PtrTidbitGuidGroup tidbit_guid_group_new (void)
 {
- PtrTidbitGuidSet guid_set = g_new(TidbitGuidSet, 1);
- guid_set->data = g_ptr_array_new_with_free_func((GDestroyNotify) tidbit_guid_unref);
- guid_set->ref_count = 1;
- return guid_set;
+ PtrTidbitGuidGroup guid_group = g_new(TidbitGuidGroup, 1);
+ guid_group->data = g_ptr_array_new_with_free_func((GDestroyNotify) tidbit_guid_unref);
+ guid_group->ref_count = 1;
+ return guid_group;
 }
 
-static void tidbit_guid_set_free (PtrTidbitGuidSet guid_set)
+static void tidbit_guid_group_free (PtrTidbitGuidGroup guid_group)
 {
- g_assert(!guid_set->ref_count);
- g_ptr_array_unref(guid_set->data);
- g_free(guid_set);
+ g_assert(!guid_group->ref_count);
+ g_ptr_array_unref(guid_group->data);
+ g_free(guid_group);
 }
 
-PtrTidbitGuidSet tidbit_guid_set_ref (PtrTidbitGuidSet guid_set)
+PtrTidbitGuidGroup tidbit_guid_group_ref (PtrTidbitGuidGroup guid_group)
 {
- guid_set->ref_count++;
- return guid_set;
+ guid_group->ref_count++;
+ return guid_group;
 }
 
-void tidbit_guid_set_unref (PtrTidbitGuidSet guid_set)
+void tidbit_guid_group_unref (PtrTidbitGuidGroup guid_group)
 {
- guid_set->ref_count--;
- if (!guid_set->ref_count)
-    tidbit_guid_set_free (guid_set);
+ guid_group->ref_count--;
+ if (!guid_group->ref_count)
+    tidbit_guid_group_free (guid_group);
 }
 
-unsigned int tidbit_guid_set_get_count (PtrTidbitGuidSet guid_set)
+unsigned int tidbit_guid_group_get_count (PtrTidbitGuidGroup guid_group)
 {
- return guid_set->data->len;
+ return guid_group->data->len;
 }
 
-gboolean tidbit_guid_set_find (PtrTidbitGuidSet guid_set, PtrTidbitGuid guid)
+gboolean tidbit_guid_group_find (PtrTidbitGuidGroup guid_group, PtrTidbitGuid guid)
 {
- for (int i = 0; i < guid_set->data->len; i++){
-    if (!tidbit_guid_cmp (g_ptr_array_index(guid_set->data, i), guid))
+ for (int i = 0; i < guid_group->data->len; i++){
+    if (!tidbit_guid_cmp (g_ptr_array_index(guid_group->data, i), guid))
         return TRUE;
     }
  return FALSE;
 }
 
-void tidbit_guid_set_append (PtrTidbitGuidSet guid_set, PtrTidbitGuid guid)
+void tidbit_guid_group_append (PtrTidbitGuidGroup guid_group, PtrTidbitGuid guid)
 {
  tidbit_guid_ref (guid);
- if (!tidbit_guid_set_find (guid_set, guid))
-    g_ptr_array_add (guid_set->data, guid);
+ if (!tidbit_guid_group_find (guid_group, guid))
+    g_ptr_array_add (guid_group->data, guid);
 }
 
-PtrTidbitGuidSet tidbit_guid_set_merge (PtrTidbitGuidSet guid_set_a, PtrTidbitGuidSet guid_set_b)
+PtrTidbitGuidGroup tidbit_guid_group_merge (PtrTidbitGuidGroup guid_group_a, PtrTidbitGuidGroup guid_group_b)
 {
-  PtrTidbitGuidSet guid_set = tidbit_guid_set_new ();
-  for (int i = 0; i < guid_set_a->data->len; i++){
-    tidbit_guid_set_append (guid_set, g_ptr_array_index(guid_set_a->data, i));
+  PtrTidbitGuidGroup guid_group = tidbit_guid_group_new ();
+  for (int i = 0; i < guid_group_a->data->len; i++){
+    tidbit_guid_group_append (guid_group, g_ptr_array_index(guid_group_a->data, i));
     }
-  for (int i = 0; i < guid_set_b->data->len; i++){
-    tidbit_guid_set_append (guid_set, g_ptr_array_index(guid_set_b->data, i));
+  for (int i = 0; i < guid_group_b->data->len; i++){
+    tidbit_guid_group_append (guid_group, g_ptr_array_index(guid_group_b->data, i));
     }
- return guid_set;
+ return guid_group;
 }
 
-void tidbit_guid_set_foreach (PtrTidbitGuidSet guid_set, TidbitGuidFunc func, gpointer user_data)
+void tidbit_guid_group_foreach (PtrTidbitGuidGroup guid_group, TidbitGuidFunc func, gpointer user_data)
 {
- for (int i = 0; i < guid_set->data->len; i++){
-    func (g_ptr_array_index(guid_set->data, i), user_data);
+ for (int i = 0; i < guid_group->data->len; i++){
+    func (g_ptr_array_index(guid_group->data, i), user_data);
     }
 }
diff --git a/src/libtidbit/tidbit-guid.h b/src/libtidbit/tidbit-guid.h
index 955f0bc..4073170 100644
--- a/src/libtidbit/tidbit-guid.h
+++ b/src/libtidbit/tidbit-guid.h
@@ -25,7 +25,7 @@ struct _TidbitGuid{
  char* string;
 };
 
-struct _TidbitGuidSet{
+struct _TidbitGuidGroup{
  int ref_count;
  GPtrArray *data;
 };
@@ -39,13 +39,13 @@ void tidbit_guid_unref (PtrTidbitGuid guid);
 int tidbit_guid_cmp (PtrTidbitGuid guid_a, PtrTidbitGuid guid_b);           //FIXME determine the user visible functions
 const char* tidbit_guid_get_string (PtrTidbitGuid guid);
 
-PtrTidbitGuidSet tidbit_guid_set_new (void);
-PtrTidbitGuidSet tidbit_guid_set_ref (PtrTidbitGuidSet guid);
-void tidbit_guid_set_unref (PtrTidbitGuidSet guid);
-unsigned int tidbit_guid_set_get_count (PtrTidbitGuidSet guid_set);
-gboolean tidbit_guid_set_find (PtrTidbitGuidSet guid_set, PtrTidbitGuid guid);
-void tidbit_guid_set_append (PtrTidbitGuidSet guid_set, PtrTidbitGuid guid);
-PtrTidbitGuidSet tidbit_guid_set_merge (PtrTidbitGuidSet guid_set_a, PtrTidbitGuidSet guid_set_b);
-void tidbit_guid_set_foreach (PtrTidbitGuidSet guid_set, TidbitGuidFunc func, gpointer user_data);
+PtrTidbitGuidGroup tidbit_guid_group_new (void);
+PtrTidbitGuidGroup tidbit_guid_group_ref (PtrTidbitGuidGroup guid);
+void tidbit_guid_group_unref (PtrTidbitGuidGroup guid);
+unsigned int tidbit_guid_group_get_count (PtrTidbitGuidGroup guid_group);
+gboolean tidbit_guid_group_find (PtrTidbitGuidGroup guid_group, PtrTidbitGuid guid);
+void tidbit_guid_group_append (PtrTidbitGuidGroup guid_group, PtrTidbitGuid guid);
+PtrTidbitGuidGroup tidbit_guid_group_merge (PtrTidbitGuidGroup guid_group_a, PtrTidbitGuidGroup guid_group_b);
+void tidbit_guid_group_foreach (PtrTidbitGuidGroup guid_group, TidbitGuidFunc func, gpointer user_data);
 
 #endif
diff --git a/src/libtidbit/tidbit.h b/src/libtidbit/tidbit.h
index cad35a1..3933bbc 100644
--- a/src/libtidbit/tidbit.h
+++ b/src/libtidbit/tidbit.h
@@ -29,7 +29,7 @@ typedef struct _TidbitKey TidbitKey, *PtrTidbitKey;
 typedef struct _TidbitQuery TidbitQuery, *PtrTidbitQuery;
 typedef struct _TidbitRecord TidbitRecord, *PtrTidbitRecord;
 typedef struct _TidbitGuid TidbitGuid, *PtrTidbitGuid;
-typedef struct _TidbitGuidSet TidbitGuidSet, *PtrTidbitGuidSet;
+typedef struct _TidbitGuidGroup TidbitGuidGroup, *PtrTidbitGuidGroup;
 
 typedef enum {
 TIDBIT_RECORD_ELEMENT_TYPE_KEY,
@@ -62,7 +62,7 @@ void tidbit_database_ref (PtrTidbitDatabase database);
 void tidbit_database_unref (PtrTidbitDatabase database);
 unsigned int tidbit_database_insert (PtrTidbitDatabase database, PtrTidbitRecord record);
 PtrTidbitRecord tidbit_database_fetch (PtrTidbitDatabase database, PtrTidbitGuid guid);
-PtrTidbitGuidSet tidbit_database_query (PtrTidbitDatabase database, PtrTidbitQuery query);
+PtrTidbitGuidGroup tidbit_database_query (PtrTidbitDatabase database, PtrTidbitQuery query);
 
 PtrTidbitDatabase tidbit_database_dbus_new (void);
 PtrTidbitDatabase tidbit_database_mem_new (void);
diff --git a/src/tidbit-dbus.c b/src/tidbit-dbus.c
index 9a43c66..d961e03 100644
--- a/src/tidbit-dbus.c
+++ b/src/tidbit-dbus.c
@@ -101,7 +101,7 @@ gboolean tidbit_dbus_fetch (TidbitDbus *object, gchar *signature, gchar **reply_
  return TRUE;
 }
 
-static void guid_set_to_string_array_func (PtrTidbitGuid guid, gpointer user_data)
+static void guid_group_to_string_array_func (PtrTidbitGuid guid, gpointer user_data)
 {
  char ***guids_array = (char***) user_data;                     //This is rather horrid. 
  **guids_array = g_strdup(tidbit_guid_get_string (guid));
@@ -127,12 +127,12 @@ gboolean tidbit_dbus_query (TidbitDbus *object, gchar *table_name, GPtrArray *el
     tidbit_query_add_exp (query, key, value, type);
     }
  g_free (dbus_value);
- PtrTidbitGuidSet guid_set = tidbit_database_query (tidbit_dbus->database, query);
- int count = tidbit_guid_set_get_count (guid_set);
+ PtrTidbitGuidGroup guid_group = tidbit_database_query (tidbit_dbus->database, query);
+ int count = tidbit_guid_group_get_count (guid_group);
  char **guids_array = g_new(char*, count+1);
  guids_array[count] = NULL;
  *guids = guids_array;
- tidbit_guid_set_foreach (guid_set, guid_set_to_string_array_func, &guids_array);
+ tidbit_guid_group_foreach (guid_group, guid_group_to_string_array_func, &guids_array);
  return TRUE;
 }
 
diff --git a/src/tidbit-http.c b/src/tidbit-http.c
index 886dc61..1522cdb 100644
--- a/src/tidbit-http.c
+++ b/src/tidbit-http.c
@@ -58,7 +58,7 @@ static void tidbit_http_callback_fetch (SoupServer *server, SoupMessage *msg, co
  soup_message_set_response (msg, "text/plain", SOUP_MEMORY_COPY, record->raw, strlen(record->raw));
 }
 
-static void guid_set_to_string_gstring_func (PtrTidbitGuid guid, gpointer user_data)
+static void guid_group_to_string_gstring_func (PtrTidbitGuid guid, gpointer user_data)
 {
  GString* string = (GString*) user_data;
  g_string_append (string, tidbit_guid_get_string (guid));
@@ -82,12 +82,12 @@ static void tidbit_http_callback_query (SoupServer *server, SoupMessage *msg, co
     }
  g_list_free(keys);
  
- PtrTidbitGuidSet guid_set = tidbit_database_query (database, query);
+ PtrTidbitGuidGroup guid_group = tidbit_database_query (database, query);
  
- GString* reply_str = g_string_sized_new (tidbit_guid_set_get_count (guid_set) * 174);
- tidbit_guid_set_foreach (guid_set, guid_set_to_string_gstring_func, reply_str);
+ GString* reply_str = g_string_sized_new (tidbit_guid_group_get_count (guid_group) * 174);
+ tidbit_guid_group_foreach (guid_group, guid_group_to_string_gstring_func, reply_str);
 
- tidbit_guid_set_unref(guid_set);
+ tidbit_guid_group_unref(guid_group);
  
  soup_message_set_status (msg, SOUP_STATUS_OK);
  soup_message_set_response (msg, "text/plain", SOUP_MEMORY_COPY, reply_str->str, reply_str->len);