[Galago-commits] r2814 - in branches/libgalago/push-presence: .
docs/reference/tmpl libgalago
galago-commits at freedesktop.org
galago-commits at freedesktop.org
Wed May 24 21:52:03 PDT 2006
Author: chipx86
Date: 2006-05-24 21:51:58 -0700 (Wed, 24 May 2006)
New Revision: 2814
Modified:
branches/libgalago/push-presence/ChangeLog
branches/libgalago/push-presence/docs/reference/tmpl/galago-status.sgml
branches/libgalago/push-presence/docs/reference/tmpl/libgalago-unused.sgml
branches/libgalago/push-presence/libgalago/galago-presence.c
branches/libgalago/push-presence/libgalago/galago-status.c
branches/libgalago/push-presence/libgalago/galago-status.h
Log:
Remove galago_status_{set,get}_presence() and galago_status_duplicate().
Modified: branches/libgalago/push-presence/ChangeLog
===================================================================
--- branches/libgalago/push-presence/ChangeLog 2006-05-25 04:40:25 UTC (rev 2813)
+++ branches/libgalago/push-presence/ChangeLog 2006-05-25 04:51:58 UTC (rev 2814)
@@ -1,3 +1,13 @@
+Wed May 24 21:50:58 PDT 2006 Christian Hammond <chipx86 at chipx86.com>
+
+ * docs/reference/tmpl/galago-status.sgml:
+ * docs/reference/tmpl/libgalago-unused.sgml:
+ * libgalago/galago-presence.c:
+ * libgalago/galago-status.c:
+ * libgalago/galago-status.h:
+ - Remove galago_status_{set,get}_presence() and
+ galago_status_duplicate().
+
Wed May 24 21:37:54 PDT 2006 Christian Hammond <chipx86 at chipx86.com>
* libgalago/galago-status.c:
Modified: branches/libgalago/push-presence/docs/reference/tmpl/galago-status.sgml
===================================================================
--- branches/libgalago/push-presence/docs/reference/tmpl/galago-status.sgml 2006-05-25 04:40:25 UTC (rev 2813)
+++ branches/libgalago/push-presence/docs/reference/tmpl/galago-status.sgml 2006-05-25 04:51:58 UTC (rev 2814)
@@ -128,11 +128,6 @@
</para>
-<!-- ##### ARG GalagoStatus:presence ##### -->
-<para>
-
-</para>
-
<!-- ##### ARG GalagoStatus:primitive ##### -->
<para>
Modified: branches/libgalago/push-presence/docs/reference/tmpl/libgalago-unused.sgml
===================================================================
--- branches/libgalago/push-presence/docs/reference/tmpl/libgalago-unused.sgml 2006-05-25 04:40:25 UTC (rev 2813)
+++ branches/libgalago/push-presence/docs/reference/tmpl/libgalago-unused.sgml 2006-05-25 04:51:58 UTC (rev 2814)
@@ -0,0 +1,6 @@
+<!-- ##### ARG GalagoStatus:presence ##### -->
+<para>
+
+</para>
+
+
Modified: branches/libgalago/push-presence/libgalago/galago-presence.c
===================================================================
--- branches/libgalago/push-presence/libgalago/galago-presence.c 2006-05-25 04:40:25 UTC (rev 2813)
+++ branches/libgalago/push-presence/libgalago/galago-presence.c 2006-05-25 04:51:58 UTC (rev 2814)
@@ -667,7 +667,7 @@
presence->priv->statuses = g_list_append(presence->priv->statuses, status);
- galago_status_set_presence(status, presence);
+ //galago_status_set_presence(status, presence);
g_signal_emit(presence, signals[STATUS_ADDED], 0, status);
g_signal_emit(presence, signals[CHANGED], 0);
Modified: branches/libgalago/push-presence/libgalago/galago-status.c
===================================================================
--- branches/libgalago/push-presence/libgalago/galago-status.c 2006-05-25 04:40:25 UTC (rev 2813)
+++ branches/libgalago/push-presence/libgalago/galago-status.c 2006-05-25 04:51:58 UTC (rev 2814)
@@ -30,8 +30,6 @@
{
GalagoStatusType primitive;
- GalagoPresence *presence;
-
char *id;
char *name;
@@ -92,13 +90,6 @@
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
- g_object_class_install_property(gobject_class, PROP_PRESENCE,
- g_param_spec_object("presence", "Presence",
- "The presence object that this status belongs to",
- GALAGO_TYPE_PRESENCE,
- G_PARAM_READWRITE |
- G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
-
g_object_class_install_property(gobject_class, PROP_ID,
g_param_spec_string("id", "ID",
"The status's ID",
@@ -358,11 +349,6 @@
g_object_notify(object, "primitive");
break;
- case PROP_PRESENCE:
- galago_status_set_presence(status,
- GALAGO_PRESENCE(g_value_get_object(value)));
- break;
-
case PROP_ID:
status->priv->id = g_value_dup_string(value);
g_object_notify(object, "id");
@@ -396,10 +382,6 @@
g_value_set_enum(value, galago_status_get_primitive(status));
break;
- case PROP_PRESENCE:
- g_value_set_object(value, galago_status_get_presence(status));
- break;
-
case PROP_ID:
g_value_set_string(value, galago_status_get_id(status));
break;
@@ -504,100 +486,6 @@
}
/**
- * galago_status_duplicate
- * @status: The status to duplicate.
- *
- * Duplicates a status.
- *
- * Returns: The duplicate status.
- */
-GalagoStatus *
-galago_status_duplicate(const GalagoStatus *status)
-{
- GalagoStatus *new_status;
-
- g_return_val_if_fail(status != NULL, NULL);
- g_return_val_if_fail(GALAGO_IS_STATUS(status), NULL);
-
- new_status = galago_status_new(galago_status_get_primitive(status),
- galago_status_get_id(status),
- galago_status_get_name(status),
- galago_status_is_exclusive(status));
-
-#if 0
- for (l = galago_object_get_attributes(GALAGO_OBJECT(status));
- l != NULL;
- l = l->next)
- {
- GalagoKeyValue *key_value = (GalagoKeyValue *)l->data;
-
- if (G_VALUE_HOLDS(key_value->value, G_TYPE_BOOLEAN))
- {
- galago_object_set_attr_bool(GALAGO_OBJECT(new_status),
- key_value->key, g_value_get_boolean(key_value->value));
- }
- else if (G_VALUE_HOLDS(key_value->value, G_TYPE_STRING))
- {
- galago_object_set_attr_string(GALAGO_OBJECT(new_status),
- key_value->key, g_value_get_string(key_value->value));
- }
- else if (G_VALUE_HOLDS(key_value->value, G_TYPE_INT))
- {
- galago_object_set_attr_int(GALAGO_OBJECT(new_status),
- key_value->key, g_value_get_int(key_value->value));
- }
- else if (G_VALUE_HOLDS(key_value->value, G_TYPE_DOUBLE))
- {
- galago_object_set_attr_double(GALAGO_OBJECT(new_status),
- key_value->key, g_value_get_double(key_value->value));
- }
- }
-#endif
-
- return new_status;
-}
-
-/**
- * galago_status_set_presence
- * @status: The status.
- * @presence: The presence.
- *
- * Sets the parent presence of a status.
- *
- * This is intended for internal use only.
- */
-void
-galago_status_set_presence(GalagoStatus *status, GalagoPresence *presence)
-{
- g_return_if_fail(status != NULL);
- g_return_if_fail(GALAGO_IS_STATUS(status));
- g_return_if_fail(presence == NULL || GALAGO_IS_PRESENCE(presence));
-
- if (status->priv->presence == presence)
- return;
-
- status->priv->presence = presence;
- g_object_notify(G_OBJECT(status), "presence");
-}
-
-/**
- * galago_status_get_presence
- * @status: The status.
- *
- * Returns the parent presence of a status.
- *
- * Returns: The presence.
- */
-GalagoPresence *
-galago_status_get_presence(const GalagoStatus *status)
-{
- g_return_val_if_fail(status != NULL, NULL);
- g_return_val_if_fail(GALAGO_IS_STATUS(status), NULL);
-
- return status->priv->presence;
-}
-
-/**
* galago_status_get_primitive
* @status: The status.
*
Modified: branches/libgalago/push-presence/libgalago/galago-status.h
===================================================================
--- branches/libgalago/push-presence/libgalago/galago-status.h 2006-05-25 04:40:25 UTC (rev 2813)
+++ branches/libgalago/push-presence/libgalago/galago-status.h 2006-05-25 04:51:58 UTC (rev 2814)
@@ -108,12 +108,7 @@
GalagoStatus *galago_status_new(GalagoStatusType type, const char *id,
const char *name, gboolean exclusive);
-GalagoStatus *galago_status_duplicate(const GalagoStatus *status);
-void galago_status_set_presence(GalagoStatus *status,
- GalagoPresence *presence);
-GalagoPresence *galago_status_get_presence(const GalagoStatus *status);
-
GalagoStatusType galago_status_get_primitive(const GalagoStatus *status);
const char *galago_status_get_id(const GalagoStatus *status);
const char *galago_status_get_name(const GalagoStatus *status);
More information about the galago-commits
mailing list