pidgin: a6a3c3d8: Remove deprecated PurpleStatuc functions...
qulogic at pidgin.im
qulogic at pidgin.im
Fri Sep 2 00:39:31 EDT 2011
----------------------------------------------------------------------
Revision: a6a3c3d847bcc8b146f812ab446cc6c8cbdf4d4a
Parent: a9e9c57562b09436a7773ba28cfe9af3a6de1430
Author: qulogic at pidgin.im
Date: 09/02/11 00:02:11
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/a6a3c3d847bcc8b146f812ab446cc6c8cbdf4d4a
Changelog:
Remove deprecated PurpleStatuc functions.
Changes against parent a9e9c57562b09436a7773ba28cfe9af3a6de1430
patched libpurple/status.c
patched libpurple/status.h
-------------- next part --------------
============================================================
--- libpurple/status.c c5bb519f5b5570622fe85b2ed7dc8197dcc0314f
+++ libpurple/status.c 4a511c4c47f7110c4cc9f9139afc8c5baf6f73c3
@@ -257,6 +257,42 @@ purple_status_type_new(PurpleStatusPrimi
user_settable, FALSE);
}
+static void
+status_type_add_attr(PurpleStatusType *status_type, const char *id,
+ const char *name, PurpleValue *value)
+{
+ PurpleStatusAttr *attr;
+
+ g_return_if_fail(status_type != NULL);
+ g_return_if_fail(id != NULL);
+ g_return_if_fail(name != NULL);
+ g_return_if_fail(value != NULL);
+
+ attr = purple_status_attr_new(id, name, value);
+
+ status_type->attrs = g_list_append(status_type->attrs, attr);
+}
+
+static void
+status_type_add_attrs_vargs(PurpleStatusType *status_type, va_list args)
+{
+ const char *id, *name;
+ PurpleValue *value;
+
+ g_return_if_fail(status_type != NULL);
+
+ while ((id = va_arg(args, const char *)) != NULL)
+ {
+ name = va_arg(args, const char *);
+ g_return_if_fail(name != NULL);
+
+ value = va_arg(args, PurpleValue *);
+ g_return_if_fail(value != NULL);
+
+ status_type_add_attr(status_type, id, name, value);
+ }
+}
+
PurpleStatusType *
purple_status_type_new_with_attrs(PurpleStatusPrimitive primitive,
const char *id, const char *name,
@@ -277,10 +313,10 @@ purple_status_type_new_with_attrs(Purple
user_settable, independent);
/* Add the first attribute */
- purple_status_type_add_attr(status_type, attr_id, attr_name, attr_value);
+ status_type_add_attr(status_type, attr_id, attr_name, attr_value);
va_start(args, attr_value);
- purple_status_type_add_attrs_vargs(status_type, args);
+ status_type_add_attrs_vargs(status_type, args);
va_end(args);
return status_type;
@@ -301,61 +337,6 @@ purple_status_type_destroy(PurpleStatusT
g_free(status_type);
}
-void
-purple_status_type_add_attr(PurpleStatusType *status_type, const char *id,
- const char *name, PurpleValue *value)
-{
- PurpleStatusAttr *attr;
-
- g_return_if_fail(status_type != NULL);
- g_return_if_fail(id != NULL);
- g_return_if_fail(name != NULL);
- g_return_if_fail(value != NULL);
-
- attr = purple_status_attr_new(id, name, value);
-
- status_type->attrs = g_list_append(status_type->attrs, attr);
-}
-
-void
-purple_status_type_add_attrs_vargs(PurpleStatusType *status_type, va_list args)
-{
- const char *id, *name;
- PurpleValue *value;
-
- g_return_if_fail(status_type != NULL);
-
- while ((id = va_arg(args, const char *)) != NULL)
- {
- name = va_arg(args, const char *);
- g_return_if_fail(name != NULL);
-
- value = va_arg(args, PurpleValue *);
- g_return_if_fail(value != NULL);
-
- purple_status_type_add_attr(status_type, id, name, value);
- }
-}
-
-void
-purple_status_type_add_attrs(PurpleStatusType *status_type, const char *id,
- const char *name, PurpleValue *value, ...)
-{
- va_list args;
-
- g_return_if_fail(status_type != NULL);
- g_return_if_fail(id != NULL);
- g_return_if_fail(name != NULL);
- g_return_if_fail(value != NULL);
-
- /* Add the first attribute */
- purple_status_type_add_attr(status_type, id, name, value);
-
- va_start(args, value);
- purple_status_type_add_attrs_vargs(status_type, args);
- va_end(args);
-}
-
PurpleStatusPrimitive
purple_status_type_get_primitive(const PurpleStatusType *status_type)
{
@@ -687,6 +668,68 @@ status_has_changed(PurpleStatus *status)
notify_status_update(presence, old_status, status);
}
+static void
+status_set_attr_boolean(PurpleStatus *status, const char *id,
+ gboolean value)
+{
+ PurpleValue *attr_value;
+
+ g_return_if_fail(status != NULL);
+ g_return_if_fail(id != NULL);
+
+ /* Make sure this attribute exists and is the correct type. */
+ attr_value = purple_status_get_attr_value(status, id);
+ g_return_if_fail(attr_value != NULL);
+ g_return_if_fail(purple_value_get_type(attr_value) == PURPLE_TYPE_BOOLEAN);
+
+ purple_value_set_boolean(attr_value, value);
+}
+
+static void
+status_set_attr_int(PurpleStatus *status, const char *id, int value)
+{
+ PurpleValue *attr_value;
+
+ g_return_if_fail(status != NULL);
+ g_return_if_fail(id != NULL);
+
+ /* Make sure this attribute exists and is the correct type. */
+ attr_value = purple_status_get_attr_value(status, id);
+ g_return_if_fail(attr_value != NULL);
+ g_return_if_fail(purple_value_get_type(attr_value) == PURPLE_TYPE_INT);
+
+ purple_value_set_int(attr_value, value);
+}
+
+static void
+status_set_attr_string(PurpleStatus *status, const char *id,
+ const char *value)
+{
+ PurpleValue *attr_value;
+
+ g_return_if_fail(status != NULL);
+ g_return_if_fail(id != NULL);
+
+ /* Make sure this attribute exists and is the correct type. */
+ attr_value = purple_status_get_attr_value(status, id);
+ /* This used to be g_return_if_fail, but it's failing a LOT, so
+ * let's generate a log error for now. */
+ /* g_return_if_fail(attr_value != NULL); */
+ if (attr_value == NULL) {
+ purple_debug_error("status",
+ "Attempted to set status attribute '%s' for "
+ "status '%s', which is not legal. Fix "
+ "this!\n", id,
+ purple_status_type_get_name(purple_status_get_type(status)));
+ return;
+ }
+ g_return_if_fail(purple_value_get_type(attr_value) == PURPLE_TYPE_STRING);
+
+ /* XXX: Check if the value has actually changed. If it has, and the status
+ * is active, should this trigger 'status_has_changed'? */
+ purple_value_set_string(attr_value, value);
+}
+
void
purple_status_set_active(PurpleStatus *status, gboolean active)
{
@@ -769,7 +812,7 @@ purple_status_set_active_with_attrs_list
l = l->next;
if (purple_strequal(string_data, purple_value_get_string(value)))
continue;
- purple_status_set_attr_string(status, id, string_data);
+ status_set_attr_string(status, id, string_data);
changed = TRUE;
}
else if (purple_value_get_type(value) == PURPLE_TYPE_INT)
@@ -778,7 +821,7 @@ purple_status_set_active_with_attrs_list
l = l->next;
if (int_data == purple_value_get_int(value))
continue;
- purple_status_set_attr_int(status, id, int_data);
+ status_set_attr_int(status, id, int_data);
changed = TRUE;
}
else if (purple_value_get_type(value) == PURPLE_TYPE_BOOLEAN)
@@ -787,7 +830,7 @@ purple_status_set_active_with_attrs_list
l = l->next;
if (boolean_data == purple_value_get_boolean(value))
continue;
- purple_status_set_attr_boolean(status, id, boolean_data);
+ status_set_attr_boolean(status, id, boolean_data);
changed = TRUE;
}
else
@@ -818,21 +861,21 @@ purple_status_set_active_with_attrs_list
continue;
}
- purple_status_set_attr_string(status, attr->id, def);
+ status_set_attr_string(status, attr->id, def);
} else if (purple_value_get_type(default_value) == PURPLE_TYPE_INT) {
int cur = purple_status_get_attr_int(status, attr->id);
int def = purple_value_get_int(default_value);
if (cur == def)
continue;
- purple_status_set_attr_int(status, attr->id, def);
+ status_set_attr_int(status, attr->id, def);
} else if (purple_value_get_type(default_value) == PURPLE_TYPE_BOOLEAN) {
gboolean cur = purple_status_get_attr_boolean(status, attr->id);
gboolean def = purple_value_get_boolean(default_value);
if (cur == def)
continue;
- purple_status_set_attr_boolean(status, attr->id, def);
+ status_set_attr_boolean(status, attr->id, def);
}
changed = TRUE;
}
@@ -844,68 +887,6 @@ purple_status_set_active_with_attrs_list
status_has_changed(status);
}
-void
-purple_status_set_attr_boolean(PurpleStatus *status, const char *id,
- gboolean value)
-{
- PurpleValue *attr_value;
-
- g_return_if_fail(status != NULL);
- g_return_if_fail(id != NULL);
-
- /* Make sure this attribute exists and is the correct type. */
- attr_value = purple_status_get_attr_value(status, id);
- g_return_if_fail(attr_value != NULL);
- g_return_if_fail(purple_value_get_type(attr_value) == PURPLE_TYPE_BOOLEAN);
-
- purple_value_set_boolean(attr_value, value);
-}
-
-void
-purple_status_set_attr_int(PurpleStatus *status, const char *id, int value)
-{
- PurpleValue *attr_value;
-
- g_return_if_fail(status != NULL);
- g_return_if_fail(id != NULL);
-
- /* Make sure this attribute exists and is the correct type. */
- attr_value = purple_status_get_attr_value(status, id);
- g_return_if_fail(attr_value != NULL);
- g_return_if_fail(purple_value_get_type(attr_value) == PURPLE_TYPE_INT);
-
- purple_value_set_int(attr_value, value);
-}
-
-void
-purple_status_set_attr_string(PurpleStatus *status, const char *id,
- const char *value)
-{
- PurpleValue *attr_value;
-
- g_return_if_fail(status != NULL);
- g_return_if_fail(id != NULL);
-
- /* Make sure this attribute exists and is the correct type. */
- attr_value = purple_status_get_attr_value(status, id);
- /* This used to be g_return_if_fail, but it's failing a LOT, so
- * let's generate a log error for now. */
- /* g_return_if_fail(attr_value != NULL); */
- if (attr_value == NULL) {
- purple_debug_error("status",
- "Attempted to set status attribute '%s' for "
- "status '%s', which is not legal. Fix "
- "this!\n", id,
- purple_status_type_get_name(purple_status_get_type(status)));
- return;
- }
- g_return_if_fail(purple_value_get_type(attr_value) == PURPLE_TYPE_STRING);
-
- /* XXX: Check if the value has actually changed. If it has, and the status
- * is active, should this trigger 'status_has_changed'? */
- purple_value_set_string(attr_value, value);
-}
-
PurpleStatusType *
purple_status_get_type(const PurpleStatus *status)
{
@@ -1167,30 +1148,6 @@ void
}
void
-purple_presence_add_status(PurplePresence *presence, PurpleStatus *status)
-{
- g_return_if_fail(presence != NULL);
- g_return_if_fail(status != NULL);
-
- presence->statuses = g_list_append(presence->statuses, status);
-
- g_hash_table_insert(presence->status_table,
- g_strdup(purple_status_get_id(status)), status);
-}
-
-void
-purple_presence_add_list(PurplePresence *presence, GList *source_list)
-{
- GList *l;
-
- g_return_if_fail(presence != NULL);
- g_return_if_fail(source_list != NULL);
-
- for (l = source_list; l != NULL; l = l->next)
- purple_presence_add_status(presence, (PurpleStatus *)l->data);
-}
-
-void
purple_presence_set_status_active(PurplePresence *presence, const char *status_id,
gboolean active)
{
============================================================
--- libpurple/status.h c862eafdce07416ff396a871b201a914d48c7a2f
+++ libpurple/status.h 76bd1e123d36bdeb5f5dc7f745a56705606cb605
@@ -271,57 +271,7 @@ void purple_status_type_destroy(PurpleSt
*/
void purple_status_type_destroy(PurpleStatusType *status_type);
-#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_STATUS_C_)
/**
- * Adds an attribute to a status type.
- *
- * @param status_type The status type to add the attribute to.
- * @param id The ID of the attribute.
- * @param name The name presented to the user.
- * @param value The value type of this attribute.
- *
- * @deprecated This function isn't needed and should be removed in 3.0.0.
- * Status type attributes should be set when the status type
- * is created, in the call to purple_status_type_new_with_attrs.
- */
-void purple_status_type_add_attr(PurpleStatusType *status_type, const char *id,
- const char *name, PurpleValue *value);
-#endif
-
-#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_STATUS_C_)
-/**
- * Adds multiple attributes to a status type.
- *
- * @param status_type The status type to add the attribute to.
- * @param id The ID of the first attribute.
- * @param name The description of the first attribute.
- * @param value The value type of the first attribute attribute.
- * @param ... Additional attribute information.
- *
- * @deprecated This function isn't needed and should be removed in 3.0.0.
- * Status type attributes should be set when the status type
- * is created, in the call to purple_status_type_new_with_attrs.
- */
-void purple_status_type_add_attrs(PurpleStatusType *status_type, const char *id,
- const char *name, PurpleValue *value, ...) G_GNUC_NULL_TERMINATED;
-#endif
-
-#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_STATUS_C_)
-/**
- * Adds multiple attributes to a status type using a va_list.
- *
- * @param status_type The status type to add the attribute to.
- * @param args The va_list of attributes.
- *
- * @deprecated This function isn't needed and should be removed in 3.0.0.
- * Status type attributes should be set when the status type
- * is created, in the call to purple_status_type_new_with_attrs.
- */
-void purple_status_type_add_attrs_vargs(PurpleStatusType *status_type,
- va_list args);
-#endif
-
-/**
* Returns the primitive type of a status type.
*
* @param status_type The status type.
@@ -552,52 +502,7 @@ void purple_status_set_active_with_attrs
void purple_status_set_active_with_attrs_list(PurpleStatus *status, gboolean active,
GList *attrs);
-#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_STATUS_C_)
/**
- * Sets the boolean value of an attribute in a status with the specified ID.
- *
- * @param status The status.
- * @param id The attribute ID.
- * @param value The boolean value.
- *
- * @deprecated This function is only used by status.c and should be made
- * static in 3.0.0.
- */
-void purple_status_set_attr_boolean(PurpleStatus *status, const char *id,
- gboolean value);
-#endif
-
-#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_STATUS_C_)
-/**
- * Sets the integer value of an attribute in a status with the specified ID.
- *
- * @param status The status.
- * @param id The attribute ID.
- * @param value The integer value.
- *
- * @deprecated This function is only used by status.c and should be made
- * static in 3.0.0.
- */
-void purple_status_set_attr_int(PurpleStatus *status, const char *id,
- int value);
-#endif
-
-#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_STATUS_C_)
-/**
- * Sets the string value of an attribute in a status with the specified ID.
- *
- * @param status The status.
- * @param id The attribute ID.
- * @param value The string value.
- *
- * @deprecated This function is only used by status.c and should be made
- * static in 3.0.0.
- */
-void purple_status_set_attr_string(PurpleStatus *status, const char *id,
- const char *value);
-#endif
-
-/**
* Returns the status's type.
*
* @param status The status.
@@ -803,33 +708,7 @@ void purple_presence_destroy(PurplePrese
*/
void purple_presence_destroy(PurplePresence *presence);
-#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_STATUS_C_)
/**
- * Adds a status to a presence.
- *
- * @param presence The presence.
- * @param status The status to add.
- *
- * @deprecated This function is only used by purple_presence_add_list,
- * and both should be removed in 3.0.0.
- */
-void purple_presence_add_status(PurplePresence *presence, PurpleStatus *status);
-#endif
-
-#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_STATUS_C_)
-/**
- * Adds a list of statuses to the presence.
- *
- * @param presence The presence.
- * @param source_list The source list of statuses to add, which is not
- * modified or freed by this function.
- *
- * @deprecated This function isn't used and should be removed in 3.0.0.
- */
-void purple_presence_add_list(PurplePresence *presence, GList *source_list);
-#endif
-
-/**
* Sets the active state of a status in a presence.
*
* Only independent statuses can be set unactive. Normal statuses can only
More information about the Commits
mailing list