/soc/2013/ankitkv/gobjectification: 3484aac07f02: Replaced Purpl...
Ankit Vani
a at nevitus.org
Sat Jul 6 06:44:21 EDT 2013
Changeset: 3484aac07f02db9947c470b46065426ae91418f5
Author: Ankit Vani <a at nevitus.org>
Date: 2013-07-06 15:44 +0530
Branch: soc.2013.gobjectification
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/3484aac07f02
Description:
Replaced PurpleBlistUiOps with PurpleBListUiOps for uniform naming
diffstat:
finch/gntblist.c | 4 +-
finch/gntblist.h | 4 +-
libpurple/account.c | 10 ++--
libpurple/blistnode.c | 10 ++--
libpurple/blistnodetypes.c | 8 ++--
libpurple/buddylist.c | 58 +++++++++++++++++-----------------
libpurple/buddylist.h | 12 +++---
libpurple/status.c | 2 +-
pidgin/gtkblist.c | 4 +-
pidgin/gtkblist.h | 2 +-
pidgin/gtkconv.c | 2 +-
pidgin/plugins/gevolution/gevolution.c | 6 +-
12 files changed, 61 insertions(+), 61 deletions(-)
diffs (truncated from 559 to 300 lines):
diff --git a/finch/gntblist.c b/finch/gntblist.c
--- a/finch/gntblist.c
+++ b/finch/gntblist.c
@@ -855,7 +855,7 @@ finch_request_add_group(void)
NULL);
}
-static PurpleBlistUiOps blist_ui_ops =
+static PurpleBListUiOps blist_ui_ops =
{
new_list,
new_node,
@@ -1030,7 +1030,7 @@ buddy_signed_off(PurpleBuddy *buddy, Fin
}
#endif
-PurpleBlistUiOps *finch_blist_get_ui_ops()
+PurpleBListUiOps *finch_blist_get_ui_ops()
{
return &blist_ui_ops;
}
diff --git a/finch/gntblist.h b/finch/gntblist.h
--- a/finch/gntblist.h
+++ b/finch/gntblist.h
@@ -53,9 +53,9 @@ typedef struct
/**
* Get the ui-functions.
*
- * @return The PurpleBlistUiOps structure populated with the appropriate functions.
+ * @return The PurpleBListUiOps structure populated with the appropriate functions.
*/
-PurpleBlistUiOps * finch_blist_get_ui_ops(void);
+PurpleBListUiOps * finch_blist_get_ui_ops(void);
/**
* Perform necessary initializations.
diff --git a/libpurple/account.c b/libpurple/account.c
--- a/libpurple/account.c
+++ b/libpurple/account.c
@@ -707,7 +707,7 @@ purple_account_request_change_user_info(
void
purple_account_set_username(PurpleAccount *account, const char *username)
{
- PurpleBlistUiOps *blist_ops;
+ PurpleBListUiOps *blist_ops;
PurpleAccountPrivate *priv;
g_return_if_fail(account != NULL);
@@ -1537,7 +1537,7 @@ purple_account_privacy_permit_add(Purple
GSList *l;
char *name;
PurpleBuddy *buddy;
- PurpleBlistUiOps *blist_ops;
+ PurpleBListUiOps *blist_ops;
PurpleAccountPrivate *priv;
PurpleAccountUiOps *ui_ops = purple_accounts_get_ui_ops();
@@ -1589,7 +1589,7 @@ purple_account_privacy_permit_remove(Pur
const char *name;
PurpleBuddy *buddy;
char *del;
- PurpleBlistUiOps *blist_ops;
+ PurpleBListUiOps *blist_ops;
PurpleAccountPrivate *priv;
PurpleAccountUiOps *ui_ops = purple_accounts_get_ui_ops();
@@ -1641,7 +1641,7 @@ purple_account_privacy_deny_add(PurpleAc
GSList *l;
char *name;
PurpleBuddy *buddy;
- PurpleBlistUiOps *blist_ops;
+ PurpleBListUiOps *blist_ops;
PurpleAccountPrivate *priv;
PurpleAccountUiOps *ui_ops = purple_accounts_get_ui_ops();
@@ -1692,7 +1692,7 @@ purple_account_privacy_deny_remove(Purpl
const char *normalized;
char *name;
PurpleBuddy *buddy;
- PurpleBlistUiOps *blist_ops;
+ PurpleBListUiOps *blist_ops;
PurpleAccountPrivate *priv;
PurpleAccountUiOps *ui_ops = purple_accounts_get_ui_ops();
diff --git a/libpurple/blistnode.c b/libpurple/blistnode.c
--- a/libpurple/blistnode.c
+++ b/libpurple/blistnode.c
@@ -93,7 +93,7 @@ purple_blist_node_set_ui_data(PurpleBLis
static void
purple_blist_node_destroy(PurpleBListNode *node)
{
- PurpleBlistUiOps *ui_ops;
+ PurpleBListUiOps *ui_ops;
PurpleBListNode *child, *next_child;
ui_ops = purple_blist_get_ui_ops();
@@ -147,7 +147,7 @@ static void purple_blist_node_initialize
void purple_blist_node_remove_setting(PurpleBListNode *node, const char *key)
{
- PurpleBlistUiOps *ops;
+ PurpleBListUiOps *ops;
PurpleBListNodePrivate *priv = PURPLE_BLIST_NODE_GET_PRIVATE(node);
g_return_if_fail(priv != NULL);
@@ -198,7 +198,7 @@ void
purple_blist_node_set_bool(PurpleBListNode* node, const char *key, gboolean data)
{
PurpleValue *value;
- PurpleBlistUiOps *ops;
+ PurpleBListUiOps *ops;
PurpleBListNodePrivate *priv = PURPLE_BLIST_NODE_GET_PRIVATE(node);
g_return_if_fail(priv != NULL);
@@ -239,7 +239,7 @@ void
purple_blist_node_set_int(PurpleBListNode* node, const char *key, int data)
{
PurpleValue *value;
- PurpleBlistUiOps *ops;
+ PurpleBListUiOps *ops;
PurpleBListNodePrivate *priv = PURPLE_BLIST_NODE_GET_PRIVATE(node);
g_return_if_fail(priv != NULL);
@@ -280,7 +280,7 @@ void
purple_blist_node_set_string(PurpleBListNode* node, const char *key, const char *data)
{
PurpleValue *value;
- PurpleBlistUiOps *ops;
+ PurpleBListUiOps *ops;
PurpleBListNodePrivate *priv = PURPLE_BLIST_NODE_GET_PRIVATE(node);
g_return_if_fail(priv != NULL);
diff --git a/libpurple/blistnodetypes.c b/libpurple/blistnodetypes.c
--- a/libpurple/blistnodetypes.c
+++ b/libpurple/blistnodetypes.c
@@ -102,7 +102,7 @@ struct _PurpleChatPrivate {
/* TODO GObjectify */
PurpleBuddy *purple_buddy_new(PurpleAccount *account, const char *name, const char *alias)
{
- PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
+ PurpleBListUiOps *ops = purple_blist_get_ui_ops();
PurpleBuddy *buddy;
g_return_val_if_fail(account != NULL, NULL);
@@ -411,7 +411,7 @@ purple_contact_compute_priority_buddy(Pu
/* TODO GObjectify */
PurpleContact *purple_contact_new()
{
- PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
+ PurpleBListUiOps *ops = purple_blist_get_ui_ops();
PurpleContact *contact = g_new0(PurpleContact, 1);
contact->totalsize = 0;
@@ -514,7 +514,7 @@ PurpleBuddy *purple_contact_get_priority
/* TODO GObjectify */
PurpleChat *purple_chat_new(PurpleAccount *account, const char *alias, GHashTable *components)
{
- PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
+ PurpleBListUiOps *ops = purple_blist_get_ui_ops();
PurpleChat *chat;
g_return_val_if_fail(account != NULL, NULL);
@@ -608,7 +608,7 @@ purple_chat_get_components(PurpleChat *c
/* TODO GObjectify */
PurpleGroup *purple_group_new(const char *name)
{
- PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
+ PurpleBListUiOps *ops = purple_blist_get_ui_ops();
PurpleGroup *group;
g_return_val_if_fail(name != NULL, NULL);
diff --git a/libpurple/buddylist.c b/libpurple/buddylist.c
--- a/libpurple/buddylist.c
+++ b/libpurple/buddylist.c
@@ -35,7 +35,7 @@
#include "value.h"
#include "xmlnode.h"
-static PurpleBlistUiOps *blist_ui_ops = NULL;
+static PurpleBListUiOps *blist_ui_ops = NULL;
static PurpleBuddyList *purplebuddylist = NULL;
@@ -418,7 +418,7 @@ purple_blist_save_node(PurpleBListNode *
void purple_blist_schedule_save()
{
- PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
+ PurpleBListUiOps *ops = purple_blist_get_ui_ops();
/* Save everything */
if (ops && ops->save_account)
@@ -668,7 +668,7 @@ load_blist(void)
void
purple_blist_boot(void) /* TODO init */
{
- PurpleBlistUiOps *ui_ops;
+ PurpleBListUiOps *ui_ops;
GList *account;
PurpleBuddyList *gbl = g_object_new(PurpleBuddyList, 1);
PURPLE_DBUS_REGISTER_POINTER(gbl, PurpleBuddyList);
@@ -744,7 +744,7 @@ purple_blist_set_ui_data(void *ui_data)
void purple_blist_show()
{
- PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
+ PurpleBListUiOps *ops = purple_blist_get_ui_ops();
if (ops && ops->show)
ops->show(purplebuddylist);
@@ -752,7 +752,7 @@ void purple_blist_show()
void purple_blist_destroy()
{
- PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
+ PurpleBListUiOps *ops = purple_blist_get_ui_ops();
purple_debug(PURPLE_DEBUG_INFO, "blist", "Destroying\n");
@@ -762,7 +762,7 @@ void purple_blist_destroy()
void purple_blist_set_visible(gboolean show)
{
- PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
+ PurpleBListUiOps *ops = purple_blist_get_ui_ops();
if (ops && ops->set_visible)
ops->set_visible(purplebuddylist, show);
@@ -785,7 +785,7 @@ static PurpleBListNode *get_next_node(Pu
void
purple_blist_update_buddy_status(PurpleBuddy *buddy, PurpleStatus *old_status)
{
- PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
+ PurpleBListUiOps *ops = purple_blist_get_ui_ops();
PurplePresence *presence;
PurpleStatus *status;
PurpleBListNode *cnode;
@@ -845,7 +845,7 @@ purple_blist_update_buddy_status(PurpleB
void
purple_blist_update_node_icon(PurpleBListNode *node)
{
- PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
+ PurpleBListUiOps *ops = purple_blist_get_ui_ops();
g_return_if_fail(node != NULL);
@@ -859,7 +859,7 @@ purple_blist_update_node_icon(PurpleBLis
*/
void purple_blist_rename_buddy(PurpleBuddy *buddy, const char *name)
{
- PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
+ PurpleBListUiOps *ops = purple_blist_get_ui_ops();
struct _purple_hbuddy *hb, *hb2;
GHashTable *account_buddies;
PurpleBuddyPrivate *priv = PURPLE_BUDDY_GET_PRIVATE(buddy);
@@ -904,7 +904,7 @@ purple_strings_are_different(const char
void purple_blist_alias_contact(PurpleContact *contact, const char *alias)
{
- PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
+ PurpleBListUiOps *ops = purple_blist_get_ui_ops();
PurpleIMConversation *im;
PurpleBListNode *bnode;
char *old_alias;
@@ -953,7 +953,7 @@ void purple_blist_alias_contact(PurpleCo
void purple_blist_alias_chat(PurpleChat *chat, const char *alias)
{
- PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
+ PurpleBListUiOps *ops = purple_blist_get_ui_ops();
char *old_alias;
char *new_alias = NULL;
PurpleChatPrivate *priv = PURPLE_CHAT_GET_PRIVATE(chat);
@@ -990,7 +990,7 @@ void purple_blist_alias_chat(PurpleChat
void purple_blist_alias_buddy(PurpleBuddy *buddy, const char *alias)
{
- PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
+ PurpleBListUiOps *ops = purple_blist_get_ui_ops();
PurpleIMConversation *im;
char *old_alias;
char *new_alias = NULL;
@@ -1033,7 +1033,7 @@ void purple_blist_alias_buddy(PurpleBudd
void purple_blist_server_alias_buddy(PurpleBuddy *buddy, const char *alias)
{
- PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
+ PurpleBListUiOps *ops = purple_blist_get_ui_ops();
PurpleIMConversation *im;
char *old_alias;
char *new_alias = NULL;
@@ -1079,7 +1079,7 @@ void purple_blist_server_alias_buddy(Pur
*/
void purple_blist_rename_group(PurpleGroup *source, const char *name)
{
- PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
+ PurpleBListUiOps *ops = purple_blist_get_ui_ops();
PurpleGroup *dest;
gchar *old_name;
gchar *new_name;
More information about the Commits
mailing list