[Galago-commits] r2377 - in trunk/libgalago: . libgalago tests
galago-commits at freedesktop.org
galago-commits at freedesktop.org
Wed Dec 14 00:33:39 PST 2005
Author: chipx86
Date: 2005-12-14 00:33:36 -0800 (Wed, 14 Dec 2005)
New Revision: 2377
Modified:
trunk/libgalago/ChangeLog
trunk/libgalago/libgalago/galago-core.c
trunk/libgalago/libgalago/galago-object.c
trunk/libgalago/libgalago/galago-object.h
trunk/libgalago/tests/get-person-attr.c
trunk/libgalago/tests/person-attr-test.c
Log:
Rename all galago_object_*_attr() functions to galago_object_*_attribute().
Modified: trunk/libgalago/ChangeLog
===================================================================
--- trunk/libgalago/ChangeLog 2005-12-14 08:28:17 UTC (rev 2376)
+++ trunk/libgalago/ChangeLog 2005-12-14 08:33:36 UTC (rev 2377)
@@ -1,3 +1,13 @@
+Wed Dec 14 00:33:03 PST 2005 Christian Hammond <chipx86 at chipx86.com>
+
+ * libgalago/galago-core.c:
+ * libgalago/galago-object.c:
+ * libgalago/galago-object.h:
+ * tests/get-person-attr.c:
+ * tests/person-attr-test.c:
+ - Rename all galago_object_*_attr() functions to
+ galago_object_*_attribute().
+
Wed Dec 14 00:25:47 PST 2005 Christian Hammond <chipx86 at chipx86.com>
* libgalago/galago-core.c:
Modified: trunk/libgalago/libgalago/galago-core.c
===================================================================
--- trunk/libgalago/libgalago/galago-core.c 2005-12-14 08:28:17 UTC (rev 2376)
+++ trunk/libgalago/libgalago/galago-core.c 2005-12-14 08:33:36 UTC (rev 2377)
@@ -511,7 +511,7 @@
{
const char *name;
dbus_message_iter_get_basic(&iter, &name);
- galago_object_remove_attr(object, name);
+ galago_object_remove_attribute(object, name);
}
}
/*
Modified: trunk/libgalago/libgalago/galago-object.c
===================================================================
--- trunk/libgalago/libgalago/galago-object.c 2005-12-14 08:28:17 UTC (rev 2376)
+++ trunk/libgalago/libgalago/galago-object.c 2005-12-14 08:33:36 UTC (rev 2377)
@@ -60,10 +60,11 @@
const GValue *value, GParamSpec *pspec);
static void galago_object_get_property(GObject *gobject, guint prop_id,
GValue *value, GParamSpec *pspec);
-static void _galago_dbus_object_set_attr(GalagoObject *object,
- const char *name, GValue *value);
-static GValue *_galago_dbus_object_get_attr(const GalagoObject *object,
- const char *name);
+static void _galago_dbus_object_set_attribute(GalagoObject *object,
+ const char *name,
+ GValue *value);
+static GValue *_galago_dbus_object_get_attribute(const GalagoObject *object,
+ const char *name);
static GObjectClass *parent_class = NULL;
static guint signals[LAST_SIGNAL] = {0};
@@ -165,7 +166,7 @@
static void
_push_key(const char *name, GValue *value, GalagoObject *object)
{
- _galago_dbus_object_set_attr(object, name, value);
+ _galago_dbus_object_set_attribute(object, name, value);
}
static void
@@ -340,7 +341,7 @@
value = g_new0(GValue, 1);
g_value_init(value, G_TYPE_STRING);
g_value_set_string(value, str_value);
- galago_object_set_attr(object, name, value);
+ galago_object_set_attribute(object, name, value);
}
void
@@ -356,7 +357,7 @@
value = g_new0(GValue, 1);
g_value_init(value, G_TYPE_BOOLEAN);
g_value_set_boolean(value, bool_value);
- galago_object_set_attr(object, name, value);
+ galago_object_set_attribute(object, name, value);
}
void
@@ -372,7 +373,7 @@
value = g_new0(GValue, 1);
g_value_init(value, G_TYPE_INT);
g_value_set_int(value, int_value);
- galago_object_set_attr(object, name, value);
+ galago_object_set_attribute(object, name, value);
}
static void
@@ -383,7 +384,8 @@
}
void
-galago_object_set_attr(GalagoObject *object, const char *name, GValue *value)
+galago_object_set_attribute(GalagoObject *object, const char *name,
+ GValue *value)
{
g_return_if_fail(object != NULL);
g_return_if_fail(GALAGO_IS_PERSON(object));
@@ -405,11 +407,11 @@
g_ascii_strdown(name, -1), value);
if (GALAGO_OBJECT_IS_LOCAL(object))
- _galago_dbus_object_set_attr(object, name, value);
+ _galago_dbus_object_set_attribute(object, name, value);
}
gboolean
-galago_object_remove_attr(GalagoObject *object, const char *name)
+galago_object_remove_attribute(GalagoObject *object, const char *name)
{
char *temp;
@@ -446,7 +448,7 @@
g_return_val_if_fail(GALAGO_OBJECT_SUPPORTS_ATTRS(object), NULL);
g_return_val_if_fail(name != NULL && *name != '\0', NULL);
- value = galago_object_get_attr(object, name);
+ value = galago_object_get_attribute(object, name);
if (value == NULL)
return NULL;
@@ -466,7 +468,7 @@
g_return_val_if_fail(GALAGO_OBJECT_SUPPORTS_ATTRS(object), FALSE);
g_return_val_if_fail(name != NULL && *name != '\0', FALSE);
- value = galago_object_get_attr(object, name);
+ value = galago_object_get_attribute(object, name);
if (value == NULL)
return FALSE;
@@ -486,7 +488,7 @@
g_return_val_if_fail(GALAGO_OBJECT_SUPPORTS_ATTRS(object), 0);
g_return_val_if_fail(name != NULL && *name != '\0', 0);
- value = galago_object_get_attr(object, name);
+ value = galago_object_get_attribute(object, name);
if (value == NULL)
return 0;
@@ -497,7 +499,7 @@
}
const GValue *
-galago_object_get_attr(const GalagoObject *object, const char *name)
+galago_object_get_attribute(const GalagoObject *object, const char *name)
{
GValue *value = NULL;
char *temp;
@@ -513,7 +515,7 @@
value = g_hash_table_lookup(object->priv->attrs_table, temp);
if (value == NULL && GALAGO_OBJECT_IS_REMOTE(object))
- value = _galago_dbus_object_get_attr(object, temp);
+ value = _galago_dbus_object_get_attribute(object, temp);
g_free(temp);
@@ -525,8 +527,8 @@
* D-BUS Functions
**************************************************************************/
static void
-_galago_dbus_object_set_attr(GalagoObject *object, const char *name,
- GValue *value)
+_galago_dbus_object_set_attribute(GalagoObject *object, const char *name,
+ GValue *value)
{
DBusMessage *message;
DBusMessageIter iter, value_iter;
@@ -577,7 +579,8 @@
}
static GValue *
-_galago_dbus_object_get_attr(const GalagoObject *object, const char *name)
+_galago_dbus_object_get_attribute(const GalagoObject *object,
+ const char *name)
{
DBusConnection *dbus_conn;
DBusMessage *message, *reply;
Modified: trunk/libgalago/libgalago/galago-object.h
===================================================================
--- trunk/libgalago/libgalago/galago-object.h 2005-12-14 08:28:17 UTC (rev 2376)
+++ trunk/libgalago/libgalago/galago-object.h 2005-12-14 08:33:36 UTC (rev 2377)
@@ -270,8 +270,8 @@
* @param name The name of the attribute to set.
* @param value The value of the attribute.
*/
-void galago_object_set_attr(GalagoObject *object, const char *name,
- GValue *value);
+void galago_object_set_attribute(GalagoObject *object, const char *name,
+ GValue *value);
/**
* Removes an attribute on an object.
@@ -281,7 +281,8 @@
*
* @return TRUE if the attribute was removed, or FALSE.
*/
-gboolean galago_object_remove_attr(GalagoObject *object, const char *name);
+gboolean galago_object_remove_attribute(GalagoObject *object,
+ const char *name);
/**
* Returns the value of a string attribute on an object.
@@ -324,8 +325,8 @@
*
* @return The attribute value, or NULL.
*/
-const GValue *galago_object_get_attr(const GalagoObject *object,
- const char *name);
+const GValue *galago_object_get_attribute(const GalagoObject *object,
+ const char *name);
/*@}*/
Modified: trunk/libgalago/tests/get-person-attr.c
===================================================================
--- trunk/libgalago/tests/get-person-attr.c 2005-12-14 08:28:17 UTC (rev 2376)
+++ trunk/libgalago/tests/get-person-attr.c 2005-12-14 08:33:36 UTC (rev 2377)
@@ -47,7 +47,7 @@
exit(1);
}
- value = galago_object_get_attr(GALAGO_OBJECT(person), attr_name);
+ value = galago_object_get_attribute(GALAGO_OBJECT(person), attr_name);
if (value == NULL)
{
Modified: trunk/libgalago/tests/person-attr-test.c
===================================================================
--- trunk/libgalago/tests/person-attr-test.c 2005-12-14 08:28:17 UTC (rev 2376)
+++ trunk/libgalago/tests/person-attr-test.c 2005-12-14 08:33:36 UTC (rev 2377)
@@ -59,7 +59,7 @@
printf("Removing godly\n");
- galago_object_remove_attr(GALAGO_OBJECT(person), "x-godly");
+ galago_object_remove_attribute(GALAGO_OBJECT(person), "x-godly");
printf("Properties: (email=lathiat at bur.st)=%s, (x-godly=NULL)=%s\n",
galago_object_get_attr_string(GALAGO_OBJECT(person), "email"),
More information about the galago-commits
mailing list