/pidgin/main: 2a8f41535c8f: rename blistnodetypes.[ch] to buddy....
Gary Kramlich <[email protected]> Thu, 25 Aug 2016 23:54:13 -0400
| Newsgroups | gmane.comp.gnome.gaim.cvs |
|---|---|
| Message-ID | <[email protected]> |
Changeset: 2a8f41535c8f8d02edf184436aa8c33df7814566 Author: Gary Kramlich <[email protected]> Date: 2016-08-12 19:09 -0500 Branch: default URL: https://hg.pidgin.im/pidgin/main/rev/2a8f41535c8f Description: rename blistnodetypes.[ch] to buddy.[ch] diffstat: libpurple/Makefile.am | 6 +- libpurple/blistnode.c | 1 - libpurple/buddy.c | 218 +++++++++++++++---------------- libpurple/buddy.h | 8 +- libpurple/buddylist.h | 2 +- libpurple/protocols/facebook/data.h | 1 - libpurple/protocols/facebook/facebook.c | 2 +- libpurple/protocols/facebook/util.c | 1 - 8 files changed, 112 insertions(+), 127 deletions(-) diffs (truncated from 532 to 300 lines): diff --git a/libpurple/Makefile.am b/libpurple/Makefile.am --- a/libpurple/Makefile.am +++ b/libpurple/Makefile.am @@ -40,7 +40,7 @@ purple_coresources = \ accounts.c \ accountopt.c \ blistnode.c \ - blistnodetypes.c \ + buddy.c \ buddylist.c \ buddyicon.c \ chat.c \ @@ -138,7 +138,7 @@ purple_coreheaders = \ accounts.h \ accountopt.h \ blistnode.h \ - blistnodetypes.h \ + buddy.h \ buddylist.h \ buddyicon.h \ chat.h \ @@ -316,7 +316,7 @@ dbus_sources = dbus-server.c dbus-usefu dbus_headers = dbus-server.h dbus-bindings.h dbus-purple.h dbus-useful.h dbus-define-api.h dbus-types.h dbus_exported = dbus-useful.h dbus-define-api.h account.h accounts.h blistnode.h \ - blistnodetypes.h buddylist.h buddyicon.h connection.h conversation.h \ + buddy.h buddylist.h buddyicon.h connection.h conversation.h \ conversationtypes.h conversations.h core.h xfer.h log.h notify.h \ prefs.h presence.h roomlist.h savedstatuses.h smiley.h smiley-list.h \ status.h server.h util.h xmlnode.h protocol.h protocols.h diff --git a/libpurple/blistnode.c b/libpurple/blistnode.c --- a/libpurple/blistnode.c +++ b/libpurple/blistnode.c @@ -22,7 +22,6 @@ */ #include "internal.h" #include "glibcompat.h" -#include "blistnodetypes.h" #define PURPLE_BLIST_NODE_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), PURPLE_TYPE_BLIST_NODE, PurpleBlistNodePrivate)) diff --git a/libpurple/blistnodetypes.c b/libpurple/buddy.c rename from libpurple/blistnodetypes.c rename to libpurple/buddy.c --- a/libpurple/blistnodetypes.c +++ b/libpurple/buddy.c @@ -23,22 +23,13 @@ #include "internal.h" #include "glibcompat.h" #include "dbus-maybe.h" -#include "debug.h" +#include "util.h" #define PURPLE_BUDDY_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE((obj), PURPLE_TYPE_BUDDY, PurpleBuddyPrivate)) typedef struct _PurpleBuddyPrivate PurpleBuddyPrivate; -#define PURPLE_CHAT_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE((obj), PURPLE_TYPE_CHAT, PurpleChatPrivate)) - -typedef struct _PurpleChatPrivate PurpleChatPrivate; - -/**************************************************************************/ -/* Private data */ -/**************************************************************************/ -/* Private data for a buddy. */ struct _PurpleBuddyPrivate { char *name; /* The name of the buddy. */ char *local_alias; /* The user-set alias of the buddy */ @@ -55,35 +46,27 @@ struct _PurpleBuddyPrivate { being constructed. */ }; -/* Buddy property enums */ -enum -{ - BUDDY_PROP_0, - BUDDY_PROP_NAME, - BUDDY_PROP_LOCAL_ALIAS, - BUDDY_PROP_SERVER_ALIAS, - BUDDY_PROP_ICON, - BUDDY_PROP_ACCOUNT, - BUDDY_PROP_PRESENCE, - BUDDY_PROP_MEDIA_CAPS, - BUDDY_PROP_LAST +enum { + PROP_0, + PROP_NAME, + PROP_LOCAL_ALIAS, + PROP_SERVER_ALIAS, + PROP_ICON, + PROP_ACCOUNT, + PROP_PRESENCE, + PROP_MEDIA_CAPS, + PROP_LAST }; -static PurpleBlistNode *blistnode_parent_class; +/****************************************************************************** + * Globals + *****************************************************************************/ +static PurpleBlistNode *parent_class; +static GParamSpec *properties[PROP_LAST]; -static GParamSpec *bd_properties[BUDDY_PROP_LAST]; - -static gboolean -purple_strings_are_different(const char *one, const char *two) -{ - return !((one && two && g_utf8_collate(one, two) == 0) || - ((one == NULL || *one == '\0') && (two == NULL || *two == '\0'))); -} - -/**************************************************************************/ -/* Buddy API */ -/**************************************************************************/ - +/****************************************************************************** + * API + *****************************************************************************/ void purple_buddy_set_icon(PurpleBuddy *buddy, PurpleBuddyIcon *icon) { @@ -98,7 +81,7 @@ purple_buddy_set_icon(PurpleBuddy *buddy priv->icon = (icon != NULL ? purple_buddy_icon_ref(icon) : NULL); g_object_notify_by_pspec(G_OBJECT(buddy), - bd_properties[BUDDY_PROP_ICON]); + properties[PROP_ICON]); } purple_signal_emit(purple_blist_get_handle(), "buddy-icon-changed", buddy); @@ -140,7 +123,7 @@ purple_buddy_set_name(PurpleBuddy *buddy g_free(priv->name); priv->name = purple_utf8_strip_unprintables(name); - g_object_notify_by_pspec(G_OBJECT(buddy), bd_properties[BUDDY_PROP_NAME]); + g_object_notify_by_pspec(G_OBJECT(buddy), properties[PROP_NAME]); if (ops) { if (ops->save_node) @@ -255,7 +238,7 @@ purple_buddy_set_local_alias(PurpleBuddy if ((alias != NULL) && (*alias != '\0')) new_alias = purple_utf8_strip_unprintables(alias); - if (!purple_strings_are_different(priv->local_alias, new_alias)) { + if (!purple_strequal(priv->local_alias, new_alias)) { g_free(new_alias); return; } @@ -270,7 +253,7 @@ purple_buddy_set_local_alias(PurpleBuddy } g_object_notify_by_pspec(G_OBJECT(buddy), - bd_properties[BUDDY_PROP_LOCAL_ALIAS]); + properties[PROP_LOCAL_ALIAS]); if (ops && ops->save_node) ops->save_node(PURPLE_BLIST_NODE(buddy)); @@ -311,7 +294,7 @@ purple_buddy_set_server_alias(PurpleBudd if ((alias != NULL) && (*alias != '\0') && g_utf8_validate(alias, -1, NULL)) new_alias = purple_utf8_strip_unprintables(alias); - if (!purple_strings_are_different(priv->server_alias, new_alias)) { + if (!purple_strequal(priv->server_alias, new_alias)) { g_free(new_alias); return; } @@ -326,7 +309,7 @@ purple_buddy_set_server_alias(PurpleBudd } g_object_notify_by_pspec(G_OBJECT(buddy), - bd_properties[BUDDY_PROP_SERVER_ALIAS]); + properties[PROP_SERVER_ALIAS]); if (ops) { if (ops->save_node) @@ -457,7 +440,7 @@ void purple_buddy_set_media_caps(PurpleB priv->media_caps = media_caps; g_object_notify_by_pspec(G_OBJECT(buddy), - bd_properties[BUDDY_PROP_MEDIA_CAPS]); + properties[PROP_MEDIA_CAPS]); } PurpleGroup *purple_buddy_get_group(PurpleBuddy *buddy) @@ -470,43 +453,41 @@ PurpleGroup *purple_buddy_get_group(Purp return PURPLE_GROUP(PURPLE_BLIST_NODE(buddy)->parent->parent); } -/************************************************************************** - * GObject code for PurpleBuddy - **************************************************************************/ - -/* Set method for GObject properties */ +/****************************************************************************** + * GObject Stuff + *****************************************************************************/ static void purple_buddy_set_property(GObject *obj, guint param_id, const GValue *value, - GParamSpec *pspec) + GParamSpec *pspec) { PurpleBuddy *buddy = PURPLE_BUDDY(obj); PurpleBuddyPrivate *priv = PURPLE_BUDDY_GET_PRIVATE(buddy); switch (param_id) { - case BUDDY_PROP_NAME: + case PROP_NAME: if (priv->is_constructed) purple_buddy_set_name(buddy, g_value_get_string(value)); else priv->name = purple_utf8_strip_unprintables(g_value_get_string(value)); break; - case BUDDY_PROP_LOCAL_ALIAS: + case PROP_LOCAL_ALIAS: if (priv->is_constructed) purple_buddy_set_local_alias(buddy, g_value_get_string(value)); else priv->local_alias = purple_utf8_strip_unprintables(g_value_get_string(value)); break; - case BUDDY_PROP_SERVER_ALIAS: + case PROP_SERVER_ALIAS: purple_buddy_set_server_alias(buddy, g_value_get_string(value)); break; - case BUDDY_PROP_ICON: + case PROP_ICON: purple_buddy_set_icon(buddy, g_value_get_pointer(value)); break; - case BUDDY_PROP_ACCOUNT: + case PROP_ACCOUNT: priv->account = g_value_get_object(value); break; - case BUDDY_PROP_MEDIA_CAPS: + case PROP_MEDIA_CAPS: purple_buddy_set_media_caps(buddy, g_value_get_enum(value)); break; default: @@ -515,33 +496,32 @@ purple_buddy_set_property(GObject *obj, } } -/* Get method for GObject properties */ static void purple_buddy_get_property(GObject *obj, guint param_id, GValue *value, - GParamSpec *pspec) + GParamSpec *pspec) { PurpleBuddy *buddy = PURPLE_BUDDY(obj); switch (param_id) { - case BUDDY_PROP_NAME: + case PROP_NAME: g_value_set_string(value, purple_buddy_get_name(buddy)); break; - case BUDDY_PROP_LOCAL_ALIAS: + case PROP_LOCAL_ALIAS: g_value_set_string(value, purple_buddy_get_local_alias(buddy)); break; - case BUDDY_PROP_SERVER_ALIAS: + case PROP_SERVER_ALIAS: g_value_set_string(value, purple_buddy_get_server_alias(buddy)); break; - case BUDDY_PROP_ICON: + case PROP_ICON: g_value_set_pointer(value, purple_buddy_get_icon(buddy)); break; - case BUDDY_PROP_ACCOUNT: + case PROP_ACCOUNT: g_value_set_object(value, purple_buddy_get_account(buddy)); break; - case BUDDY_PROP_PRESENCE: + case PROP_PRESENCE: g_value_set_object(value, purple_buddy_get_presence(buddy)); break; - case BUDDY_PROP_MEDIA_CAPS: + case PROP_MEDIA_CAPS: g_value_set_enum(value, purple_buddy_get_media_caps(buddy)); break; default: @@ -550,22 +530,18 @@ purple_buddy_get_property(GObject *obj, } } -/* GObject initialization function */ static void -purple_buddy_init(GTypeInstance *instance, gpointer klass) -{ +purple_buddy_init(GTypeInstance *instance, gpointer klass) { PURPLE_DBUS_REGISTER_POINTER(PURPLE_BUDDY(instance), PurpleBuddy); } -/* Called when done constructing */ static void -purple_buddy_constructed(GObject *object) -{ +purple_buddy_constructed(GObject *object) { _______________________________________________ Commits mailing list [email protected] https://pidgin.im/cgi-bin/mailman/listinfo/commits