/soc/2013/ankitkv/gobjectification: a45443c51e7d: Merged soc.201...
Ankit Vani
a at nevitus.org
Thu Jul 25 13:12:01 EDT 2013
Changeset: a45443c51e7dd2d1ab6951def1e1d0f277e7f59e
Author: Ankit Vani <a at nevitus.org>
Date: 2013-07-25 22:41 +0530
Branch: soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/a45443c51e7d
Description:
Merged soc.2013.gobjectification branch
diffstat:
finch/gntblist.c | 308 ++++----
finch/gntblist.h | 18 +-
finch/gntconv.c | 22 +-
finch/gntlog.c | 6 +-
finch/gntpounce.c | 2 +-
finch/gntrequest.c | 4 +-
finch/plugins/gnthistory.c | 4 +-
finch/plugins/grouping.c | 36 +-
libpurple/account.c | 10 +-
libpurple/account.h | 2 +-
libpurple/accounts.c | 6 +-
libpurple/blistnode.c | 102 +-
libpurple/blistnode.h | 72 +-
libpurple/blistnodetypes.c | 64 +-
libpurple/blistnodetypes.h | 10 +-
libpurple/buddyicon.c | 46 +-
libpurple/buddyicon.h | 8 +-
libpurple/buddylist.c | 158 ++--
libpurple/buddylist.h | 34 +-
libpurple/dbus-server.c | 8 +-
libpurple/http.c | 383 +++++++++--
libpurple/http.h | 27 +-
libpurple/log.c | 2 +-
libpurple/plugins/autoaccept.c | 8 +-
libpurple/plugins/buddynote.c | 8 +-
libpurple/plugins/log_reader.c | 2 +-
libpurple/plugins/perl/common/module.h | 2 +-
libpurple/plugins/signals-test.c | 8 +-
libpurple/plugins/tcl/tcl_cmds.c | 6 +-
libpurple/plugins/tcl/tcl_signals.c | 6 +-
libpurple/presence.c | 4 +-
libpurple/protocols/bonjour/bonjour.c | 4 +-
libpurple/protocols/gg/gg.c | 4 +-
libpurple/protocols/gg/purplew.c | 4 +-
libpurple/protocols/jabber/adhoccommands.c | 2 +-
libpurple/protocols/jabber/adhoccommands.h | 2 +-
libpurple/protocols/jabber/buddy.c | 18 +-
libpurple/protocols/jabber/buddy.h | 2 +-
libpurple/protocols/jabber/google/google.c | 2 +-
libpurple/protocols/jabber/google/google.h | 2 +-
libpurple/protocols/jabber/jabber.c | 2 +-
libpurple/protocols/jabber/roster.c | 2 +-
libpurple/protocols/msn/contact.c | 38 +-
libpurple/protocols/msn/httpconn.c | 949 +++++++++-------------------
libpurple/protocols/msn/httpconn.h | 87 +-
libpurple/protocols/msn/msn.c | 6 +-
libpurple/protocols/msn/nexus.c | 22 +-
libpurple/protocols/msn/oim.c | 17 +-
libpurple/protocols/msn/servconn.c | 5 +-
libpurple/protocols/msn/servconn.h | 2 +
libpurple/protocols/msn/session.c | 8 +-
libpurple/protocols/msn/session.h | 4 +-
libpurple/protocols/msn/soap.c | 822 ++++++------------------
libpurple/protocols/msn/soap.h | 37 +-
libpurple/protocols/mxit/mxit.c | 4 +-
libpurple/protocols/myspace/user.c | 2 +-
libpurple/protocols/myspace/zap.c | 4 +-
libpurple/protocols/myspace/zap.h | 2 +-
libpurple/protocols/novell/novell.c | 10 +-
libpurple/protocols/null/nullprpl.c | 4 +-
libpurple/protocols/oscar/authorization.c | 2 +-
libpurple/protocols/oscar/family_icq.c | 2 +-
libpurple/protocols/oscar/oscar.c | 16 +-
libpurple/protocols/oscar/oscar.h | 2 +-
libpurple/protocols/oscar/oscarcommon.h | 2 +-
libpurple/protocols/oscar/visibility.c | 2 +-
libpurple/protocols/sametime/sametime.c | 56 +-
libpurple/protocols/silc/buddy.c | 28 +-
libpurple/protocols/silc/chat.c | 44 +-
libpurple/protocols/silc/silc.c | 2 +-
libpurple/protocols/yahoo/libymsg.c | 16 +-
libpurple/protocols/yahoo/libymsg.h | 2 +-
libpurple/protocols/zephyr/zephyr.c | 2 +-
libpurple/prpl.h | 2 +-
libpurple/sslconn.c | 11 +
libpurple/sslconn.h | 10 +
libpurple/status.h | 2 +-
libpurple/xmlnode.h | 1 +
pidgin/gtkblist.c | 256 +++---
pidgin/gtkblist.h | 28 +-
pidgin/gtkconv.c | 82 +-
pidgin/gtkdialogs.c | 10 +-
pidgin/gtklog.c | 4 +-
pidgin/gtkpounce.c | 2 +-
pidgin/gtkutils.c | 4 +-
pidgin/plugins/cap/cap.c | 2 +-
pidgin/plugins/cap/cap.h | 2 +-
pidgin/plugins/gevolution/gevo-util.c | 2 +-
pidgin/plugins/gevolution/gevolution.c | 12 +-
pidgin/plugins/gtk-signals-test.c | 2 +-
pidgin/plugins/gtkbuddynote.c | 2 +-
pidgin/plugins/history.c | 12 +-
pidgin/plugins/ticker/ticker.c | 2 +-
93 files changed, 1780 insertions(+), 2287 deletions(-)
diffs (truncated from 9560 to 300 lines):
diff --git a/finch/gntblist.c b/finch/gntblist.c
--- a/finch/gntblist.c
+++ b/finch/gntblist.c
@@ -72,11 +72,11 @@ typedef struct
GntWidget *tree;
GntWidget *tooltip;
- PurpleBListNode *tnode; /* Who is the tooltip being displayed for? */
+ PurpleBlistNode *tnode; /* Who is the tooltip being displayed for? */
GList *tagged; /* A list of tagged blistnodes */
GntWidget *context;
- PurpleBListNode *cnode;
+ PurpleBlistNode *cnode;
/* XXX: I am KISSing */
GntWidget *status; /* Dropdown with the statuses */
@@ -96,14 +96,14 @@ typedef struct
GList *new_group;
guint new_group_timeout;
- FinchBListManager *manager;
-} FinchBList;
+ FinchBlistManager *manager;
+} FinchBlist;
typedef struct
{
gpointer row; /* the row in the GntTree */
guint signed_timer; /* used when 'recently' signed on/off */
-} FinchBListNode;
+} FinchBlistNode;
typedef enum
{
@@ -123,36 +123,36 @@ typedef struct
} u;
} StatusBoxItem;
-static FinchBList *ggblist;
-
-static void add_buddy(PurpleBuddy *buddy, FinchBList *ggblist);
-static void add_contact(PurpleContact *contact, FinchBList *ggblist);
-static void add_group(PurpleGroup *group, FinchBList *ggblist);
-static void add_chat(PurpleChat *chat, FinchBList *ggblist);
-static void add_node(PurpleBListNode *node, FinchBList *ggblist);
-static void node_update(PurpleBuddyList *list, PurpleBListNode *node);
+static FinchBlist *ggblist;
+
+static void add_buddy(PurpleBuddy *buddy, FinchBlist *ggblist);
+static void add_contact(PurpleContact *contact, FinchBlist *ggblist);
+static void add_group(PurpleGroup *group, FinchBlist *ggblist);
+static void add_chat(PurpleChat *chat, FinchBlist *ggblist);
+static void add_node(PurpleBlistNode *node, FinchBlist *ggblist);
+static void node_update(PurpleBuddyList *list, PurpleBlistNode *node);
#if 0
static gboolean is_contact_online(PurpleContact *contact);
static gboolean is_group_online(PurpleGroup *group);
#endif
-static void draw_tooltip(FinchBList *ggblist);
+static void draw_tooltip(FinchBlist *ggblist);
static void tooltip_for_buddy(PurpleBuddy *buddy, GString *str, gboolean full);
static gboolean remove_typing_cb(gpointer null);
-static void remove_peripherals(FinchBList *ggblist);
-static const char * get_display_name(PurpleBListNode *node);
+static void remove_peripherals(FinchBlist *ggblist);
+static const char * get_display_name(PurpleBlistNode *node);
static void savedstatus_changed(PurpleSavedStatus *now, PurpleSavedStatus *old);
static void blist_show(PurpleBuddyList *list);
-static void update_node_display(PurpleBListNode *buddy, FinchBList *ggblist);
-static void update_buddy_display(PurpleBuddy *buddy, FinchBList *ggblist);
+static void update_node_display(PurpleBlistNode *buddy, FinchBlist *ggblist);
+static void update_buddy_display(PurpleBuddy *buddy, FinchBlist *ggblist);
static gboolean account_autojoin_cb(PurpleConnection *pc, gpointer null);
static void finch_request_add_buddy(PurpleAccount *account, const char *username, const char *grp, const char *alias);
static void menu_group_set_cb(GntMenuItem *item, gpointer null);
/* Sort functions */
-static int blist_node_compare_position(PurpleBListNode *n1, PurpleBListNode *n2);
-static int blist_node_compare_text(PurpleBListNode *n1, PurpleBListNode *n2);
-static int blist_node_compare_status(PurpleBListNode *n1, PurpleBListNode *n2);
-static int blist_node_compare_log(PurpleBListNode *n1, PurpleBListNode *n2);
+static int blist_node_compare_position(PurpleBlistNode *n1, PurpleBlistNode *n2);
+static int blist_node_compare_text(PurpleBlistNode *n1, PurpleBlistNode *n2);
+static int blist_node_compare_status(PurpleBlistNode *n1, PurpleBlistNode *n2);
+static int blist_node_compare_log(PurpleBlistNode *n1, PurpleBlistNode *n2);
static int color_available;
static int color_away;
@@ -163,13 +163,13 @@ static int color_idle;
* Buddy List Manager functions.
*/
-static gboolean default_can_add_node(PurpleBListNode *node)
+static gboolean default_can_add_node(PurpleBlistNode *node)
{
gboolean offline = purple_prefs_get_bool(PREF_ROOT "/showoffline");
if (PURPLE_IS_BUDDY(node)) {
PurpleBuddy *buddy = (PurpleBuddy*)node;
- FinchBListNode *fnode = purple_blist_node_get_ui_data(node);
+ FinchBlistNode *fnode = purple_blist_node_get_ui_data(node);
if (!purple_buddy_get_contact(buddy))
return FALSE; /* When a new buddy is added and show-offline is set */
if (PURPLE_BUDDY_IS_ONLINE(buddy))
@@ -183,7 +183,7 @@ static gboolean default_can_add_node(Pur
if (purple_blist_node_get_bool(node, "show_offline"))
return TRUE;
} else if (PURPLE_IS_CONTACT(node)) {
- PurpleBListNode *nd;
+ PurpleBlistNode *nd;
for (nd = purple_blist_node_get_first_child(node);
nd; nd = purple_blist_node_get_sibling_next(nd)) {
if (default_can_add_node(nd))
@@ -194,7 +194,7 @@ static gboolean default_can_add_node(Pur
if (purple_account_is_connected(purple_chat_get_account(chat)))
return TRUE; /* Show whenever the account is online */
} else if (PURPLE_IS_GROUP(node)) {
- PurpleBListNode *nd;
+ PurpleBlistNode *nd;
gboolean empty = purple_prefs_get_bool(PREF_ROOT "/emptygroups");
if (empty)
return TRUE; /* If we want to see empty groups, we can show any group */
@@ -212,7 +212,7 @@ static gboolean default_can_add_node(Pur
return FALSE;
}
-static gpointer default_find_parent(PurpleBListNode *node)
+static gpointer default_find_parent(PurpleBlistNode *node)
{
gpointer ret = NULL;
@@ -228,7 +228,7 @@ static gpointer default_find_parent(Purp
static gboolean default_create_tooltip(gpointer selected_row, GString **body, char **tool_title)
{
GString *str;
- PurpleBListNode *node = selected_row;
+ PurpleBlistNode *node = selected_row;
int lastseen = 0;
char *title;
@@ -253,7 +253,7 @@ static gboolean default_create_tooltip(g
if (value > lastseen)
lastseen = value;
}
- if (node == (PurpleBListNode*)pr)
+ if (node == (PurpleBlistNode*)pr)
continue;
if (!purple_account_is_connected(purple_buddy_get_account(buddy)))
continue;
@@ -309,7 +309,7 @@ static gboolean default_create_tooltip(g
return TRUE;
}
-static FinchBListManager default_manager =
+static FinchBlistManager default_manager =
{
"default",
N_("Default"),
@@ -322,12 +322,12 @@ static FinchBListManager default_manager
};
static GList *managers;
-static FinchBListNode *
-create_finch_blist_node(PurpleBListNode *node, gpointer row)
+static FinchBlistNode *
+create_finch_blist_node(PurpleBlistNode *node, gpointer row)
{
- FinchBListNode *fnode = purple_blist_node_get_ui_data(node);
+ FinchBlistNode *fnode = purple_blist_node_get_ui_data(node);
if (!fnode) {
- fnode = g_new0(FinchBListNode, 1);
+ fnode = g_new0(FinchBlistNode, 1);
fnode->signed_timer = 0;
purple_blist_node_set_ui_data(node, fnode);
}
@@ -336,9 +336,9 @@ create_finch_blist_node(PurpleBListNode
}
static void
-reset_blist_node_ui_data(PurpleBListNode *node)
+reset_blist_node_ui_data(PurpleBlistNode *node)
{
- FinchBListNode *fnode = purple_blist_node_get_ui_data(node);
+ FinchBlistNode *fnode = purple_blist_node_get_ui_data(node);
if (fnode == NULL)
return;
if (fnode->signed_timer)
@@ -348,7 +348,7 @@ reset_blist_node_ui_data(PurpleBListNode
}
static int
-get_display_color(PurpleBListNode *node)
+get_display_color(PurpleBlistNode *node)
{
PurpleBuddy *buddy;
int color = 0;
@@ -374,10 +374,10 @@ get_display_color(PurpleBListNode *node
}
static GntTextFormatFlags
-get_blist_node_flag(PurpleBListNode *node)
+get_blist_node_flag(PurpleBlistNode *node)
{
GntTextFormatFlags flag = 0;
- FinchBListNode *fnode = purple_blist_node_get_ui_data(node);
+ FinchBlistNode *fnode = purple_blist_node_get_ui_data(node);
if (ggblist->tagged && g_list_find(ggblist->tagged, node))
flag |= GNT_TEXT_FLAG_BOLD;
@@ -400,7 +400,7 @@ get_blist_node_flag(PurpleBListNode *nod
if (!gnt_tree_get_expanded(GNT_TREE(ggblist->tree), node)) {
for (node = purple_blist_node_get_first_child(node); node;
node = purple_blist_node_get_sibling_next(node)) {
- PurpleBListNode *pnode;
+ PurpleBlistNode *pnode;
pnode = purple_contact_get_priority_buddy((PurpleContact*)node);
fnode = purple_blist_node_get_ui_data(node);
if (fnode && fnode->signed_timer) {
@@ -416,7 +416,7 @@ get_blist_node_flag(PurpleBListNode *nod
}
static void
-blist_update_row_flags(PurpleBListNode *node)
+blist_update_row_flags(PurpleBlistNode *node)
{
gnt_tree_set_row_flags(GNT_TREE(ggblist->tree), node, get_blist_node_flag(node));
gnt_tree_set_row_color(GNT_TREE(ggblist->tree), node, get_display_color(node));
@@ -426,10 +426,10 @@ blist_update_row_flags(PurpleBListNode *
static gboolean
is_contact_online(PurpleContact *contact)
{
- PurpleBListNode *node;
- for (node = purple_blist_node_get_first_child(((PurpleBListNode*)contact)); node;
+ PurpleBlistNode *node;
+ for (node = purple_blist_node_get_first_child(((PurpleBlistNode*)contact)); node;
node = purple_blist_node_get_sibling_next(node)) {
- FinchBListNode *fnode = purple_blist_node_get_ui_data(node);
+ FinchBlistNode *fnode = purple_blist_node_get_ui_data(node);
if (PURPLE_BUDDY_IS_ONLINE((PurpleBuddy*)node) ||
(fnode && fnode->signed_timer))
return TRUE;
@@ -440,8 +440,8 @@ is_contact_online(PurpleContact *contact
static gboolean
is_group_online(PurpleGroup *group)
{
- PurpleBListNode *node;
- for (node = purple_blist_node_get_first_child(((PurpleBListNode*)group)); node;
+ PurpleBlistNode *node;
+ for (node = purple_blist_node_get_first_child(((PurpleBlistNode*)group)); node;
node = purple_blist_node_get_sibling_next(node)) {
if (PURPLE_IS_CHAT(node) &&
purple_account_is_connected(((PurpleChat *)node)->account))
@@ -454,12 +454,12 @@ is_group_online(PurpleGroup *group)
#endif
static void
-new_node(PurpleBListNode *node)
+new_node(PurpleBlistNode *node)
{
}
static void
-add_node(PurpleBListNode *node, FinchBList *ggblist)
+add_node(PurpleBlistNode *node, FinchBlist *ggblist)
{
if (purple_blist_node_get_ui_data(node))
return;
@@ -479,13 +479,13 @@ add_node(PurpleBListNode *node, FinchBLi
draw_tooltip(ggblist);
}
-void finch_blist_manager_add_node(PurpleBListNode *node)
+void finch_blist_manager_add_node(PurpleBlistNode *node)
{
add_node(node, ggblist);
}
static void
-remove_tooltip(FinchBList *ggblist)
+remove_tooltip(FinchBlist *ggblist)
{
gnt_widget_destroy(ggblist->tooltip);
ggblist->tooltip = NULL;
@@ -493,10 +493,10 @@ remove_tooltip(FinchBList *ggblist)
}
static void
-node_remove(PurpleBuddyList *list, PurpleBListNode *node)
+node_remove(PurpleBuddyList *list, PurpleBlistNode *node)
{
- FinchBList *ggblist = FINCH_GET_DATA(list);
- PurpleBListNode *parent;
+ FinchBlist *ggblist = FINCH_GET_DATA(list);
+ PurpleBlistNode *parent;
if (ggblist == NULL || purple_blist_node_get_ui_data(node) == NULL)
return;
@@ -526,7 +526,7 @@ node_remove(PurpleBuddyList *list, Purpl
}
More information about the Commits
mailing list