gobjectification: 2931c8b8: Not-yet-complete compile of Pidgin.
qulogic at pidgin.im
qulogic at pidgin.im
Wed Jun 9 01:27:04 EDT 2010
-----------------------------------------------------------------
Revision: 2931c8b8e1a900b7964d6fe88a458e120b423ca9
Ancestor: b1644c83a3106c43f068d68e392c2ff06e8f9e25
Author: qulogic at pidgin.im
Date: 2010-06-09T05:09:01
Branch: im.pidgin.gobjectification
URL: http://d.pidgin.im/viewmtn/revision/info/2931c8b8e1a900b7964d6fe88a458e120b423ca9
Modified files:
pidgin/gtkblist.c pidgin/gtkconv.c pidgin/gtkdialogs.c
pidgin/gtknotify.c pidgin/gtkprefs.c
ChangeLog:
Not-yet-complete compile of Pidgin.
-------------- next part --------------
============================================================
--- pidgin/gtkblist.c 0467cc75f2f00b323ebc1a07a4cfd773b2f2b511
+++ pidgin/gtkblist.c 8ae72819ca6e194808ebe08d94f040813b83bdf9
@@ -132,25 +132,25 @@ static struct pidgin_blist_sort_method *
static GList *pidgin_blist_sort_methods = NULL;
static struct pidgin_blist_sort_method *current_sort_method = NULL;
-static void sort_method_none(PurpleBlistNode *node, PurpleBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter);
+static void sort_method_none(PurpleBlistNode *node, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter);
-static void sort_method_alphabetical(PurpleBlistNode *node, PurpleBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter);
-static void sort_method_status(PurpleBlistNode *node, PurpleBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter);
-static void sort_method_log_activity(PurpleBlistNode *node, PurpleBuddyList *blist, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter);
+static void sort_method_alphabetical(PurpleBlistNode *node, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter);
+static void sort_method_status(PurpleBlistNode *node, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter);
+static void sort_method_log_activity(PurpleBlistNode *node, GtkTreeIter groupiter, GtkTreeIter *cur, GtkTreeIter *iter);
static PidginBuddyList *gtkblist = NULL;
static GList *groups_tree(void);
-static gboolean pidgin_blist_refresh_timer(PurpleBuddyList *list);
-static void pidgin_blist_update_buddy(PurpleBuddyList *list, PurpleBlistNode *node, gboolean status_change);
+static gboolean pidgin_blist_refresh_timer(void);
+static void pidgin_blist_update_buddy(PurpleBlistNode *node, gboolean status_change);
static void pidgin_blist_selection_changed(GtkTreeSelection *selection, gpointer data);
-static void pidgin_blist_update(PurpleBuddyList *list, PurpleBlistNode *node);
-static void pidgin_blist_update_group(PurpleBuddyList *list, PurpleBlistNode *node);
-static void pidgin_blist_update_contact(PurpleBuddyList *list, PurpleBlistNode *node);
+static void pidgin_blist_update(PurpleBlistNode *node);
+static void pidgin_blist_update_group(PurpleBlistNode *node);
+static void pidgin_blist_update_contact(PurpleBlistNode *node);
static char *pidgin_get_tooltip_text(PurpleBlistNode *node, gboolean full);
static const char *item_factory_translate_func (const char *path, gpointer func_data);
static gboolean get_iter_from_node(PurpleBlistNode *node, GtkTreeIter *iter);
static gboolean buddy_is_displayable(PurpleBuddy *buddy);
-static void redo_buddy_list(PurpleBuddyList *list, gboolean remove, gboolean rerender);
+static void redo_buddy_list(gboolean remove, gboolean rerender);
static void pidgin_blist_collapse_contact_cb(GtkWidget *w, PurpleBlistNode *node);
static char *pidgin_get_group_title(PurpleBlistNode *gnode, gboolean expanded);
static void pidgin_blist_expand_contact_cb(GtkWidget *w, PurpleBlistNode *node);
============================================================
--- pidgin/gtkconv.c de1ca1fb8e059629fbed67ad1457278278c6a2cc
+++ pidgin/gtkconv.c 305f5dd2a86bd7a23fe213b945b29043b93cdd05
@@ -2513,7 +2513,7 @@ pidgin_conv_get_icon(PurpleConversation
* displays in the conv tab even though it shouldn't.
* A better solution would be great. */
if (ops && ops->update)
- ops->update(NULL, (PurpleBlistNode*)b);
+ ops->update((PurpleBlistNode*)b);
}
}
@@ -4463,7 +4463,7 @@ blist_node_aliased_cb(PurpleBlistNode *n
else if (PURPLE_IS_BUDDY(node))
update_chat_alias((PurpleBuddy *)node, conv, gc, prpl_info);
else if (PURPLE_IS_CHAT(node) &&
- purple_conversation_get_account(conv) == ((PurpleChat*)node)->account)
+ purple_conversation_get_account(conv) == purple_chat_get_account((PurpleChat*)node))
{
if (old_alias == NULL || g_utf8_collate(old_alias, purple_conversation_get_title(conv)) == 0)
pidgin_conv_update_fields(conv, PIDGIN_CONV_SET_TITLE);
@@ -7567,7 +7567,7 @@ account_signed_off_cb(PurpleConnection *
if (PURPLE_PLUGIN_PROTOCOL_INFO(purple_connection_get_prpl(gc))->chat_info_defaults != NULL)
comps = PURPLE_PLUGIN_PROTOCOL_INFO(purple_connection_get_prpl(gc))->chat_info_defaults(gc, conv->name);
} else {
- comps = chat->components;
+ comps = purple_chat_get_components(chat);
}
serv_join_chat(gc, comps);
if (chat == NULL && comps != NULL)
@@ -8107,7 +8107,7 @@ pidgin_conversations_init(void)
purple_signal_connect(NULL, "signed-off", handle,
G_CALLBACK(account_signed_off_cb),
GINT_TO_POINTER(PURPLE_CONV_ACCOUNT_OFFLINE));
- purple_signal_connect(purple_connections_get_handle(), "signing-off", handle,
+ purple_signal_connect(NULL, "signing-off", handle,
G_CALLBACK(account_signing_off), NULL);
purple_signal_connect(purple_conversations_get_handle(), "received-im-msg",
============================================================
--- pidgin/gtkdialogs.c f75317d94ee36e1544947cae19b64f739c502779
+++ pidgin/gtkdialogs.c 70375ca910d1fc2ca596228a3bda915a4026de2f
@@ -1120,10 +1120,10 @@ pidgin_dialogs_alias_chat(PurpleChat *ch
purple_request_input(NULL, _("Alias Chat"), NULL,
_("Enter an alias for this chat."),
- chat->alias, FALSE, FALSE, NULL,
+ purple_chat_get_alias(chat), FALSE, FALSE, NULL,
_("Alias"), G_CALLBACK(pidgin_dialogs_alias_chat_cb),
_("Cancel"), NULL,
- chat->account, NULL, NULL,
+ purple_chat_get_account(chat), NULL, NULL,
chat);
}
@@ -1140,7 +1140,7 @@ pidgin_dialogs_remove_contact_cb(PurpleC
if (purple_account_is_connected(purple_buddy_get_account(buddy)))
purple_account_remove_buddy(purple_buddy_get_account(buddy), buddy, group);
}
- purple_blist_remove_contact(contact);
+ purple_blist_node_remove(PURPLE_BLIST_NODE(contact));
}
void
@@ -1201,7 +1201,8 @@ pidgin_dialogs_merge_groups(PurpleGroup
text = g_strdup_printf(
_("You are about to merge the group called %s into the group "
- "called %s. Do you want to continue?"), source->name, new_name);
+ "called %s. Do you want to continue?"),
+ purple_group_get_name(source), new_name);
ggp = g_new(struct _PidginGroupMergeObject, 1);
ggp->parent = source;
@@ -1234,7 +1235,7 @@ pidgin_dialogs_remove_group_cb(PurpleGro
bnode = bnode->next;
if (purple_account_is_connected(purple_buddy_get_account(buddy))) {
purple_account_remove_buddy(purple_buddy_get_account(buddy), buddy, group);
- purple_blist_remove_buddy(buddy);
+ purple_blist_node_remove(PURPLE_BLIST_NODE(buddy));
}
} else {
bnode = bnode->next;
@@ -1243,14 +1244,14 @@ pidgin_dialogs_remove_group_cb(PurpleGro
} else if (PURPLE_IS_CHAT(cnode)) {
PurpleChat *chat = (PurpleChat *)cnode;
cnode = cnode->next;
- if (purple_account_is_connected(chat->account))
- purple_blist_remove_chat(chat);
+ if (purple_account_is_connected(purple_chat_get_account(chat)))
+ purple_blist_node_remove(PURPLE_BLIST_NODE(chat));
} else {
cnode = cnode->next;
}
}
- purple_blist_remove_group(group);
+ purple_blist_node_remove(PURPLE_BLIST_NODE(group));
}
void
@@ -1261,7 +1262,7 @@ pidgin_dialogs_remove_group(PurpleGroup
g_return_if_fail(group != NULL);
text = g_strdup_printf(_("You are about to remove the group %s and all its members from your buddy list. Do you want to continue?"),
- group->name);
+ purple_group_get_name(group));
purple_request_action(group, NULL, _("Remove Group"), text, 0,
NULL, NULL, NULL,
@@ -1287,7 +1288,7 @@ pidgin_dialogs_remove_buddy_cb(PurpleBud
purple_debug_info("blist", "Removing '%s' from buddy list.\n", purple_buddy_get_name(buddy));
/* TODO - Should remove from blist first... then call purple_account_remove_buddy()? */
purple_account_remove_buddy(purple_buddy_get_account(buddy), buddy, group);
- purple_blist_remove_buddy(buddy);
+ purple_blist_node_remove(PURPLE_BLIST_NODE(buddy));
g_free(name);
}
@@ -1314,7 +1315,7 @@ pidgin_dialogs_remove_chat_cb(PurpleChat
static void
pidgin_dialogs_remove_chat_cb(PurpleChat *chat)
{
- purple_blist_remove_chat(chat);
+ purple_blist_node_remove(PURPLE_BLIST_NODE(chat));
}
void
@@ -1330,7 +1331,7 @@ pidgin_dialogs_remove_chat(PurpleChat *c
name ? name : "");
purple_request_action(chat, NULL, _("Remove Chat"), text, 0,
- chat->account, NULL, NULL,
+ purple_chat_get_account(chat), NULL, NULL,
chat, 2,
_("_Remove Chat"), G_CALLBACK(pidgin_dialogs_remove_chat_cb),
_("Cancel"), NULL);
============================================================
--- pidgin/gtknotify.c 99a0b455a573f0477a65f27d37e80d6bf589390b
+++ pidgin/gtknotify.c 765b55254fc2e3b0096c1ed57179dc738108fbfb
@@ -1658,7 +1658,7 @@ void pidgin_notify_init(void)
{
void *handle = pidgin_notify_get_handle();
- purple_signal_connect(purple_connections_get_handle(), "signed-off",
+ purple_signal_connect(NULL, "signed-off",
handle, PURPLE_CALLBACK(signed_off_cb), NULL);
}
============================================================
--- pidgin/gtkprefs.c f99c27e6c464aaa60b4142fa4b450bf22510bc9b
+++ pidgin/gtkprefs.c 755c44c2507f39e0666eeafa6b362c44a09cb4b6
@@ -1037,7 +1037,7 @@ prefs_set_status_icon_theme_cb(GtkComboB
g_free(name);
pidgin_stock_load_status_icon_theme(theme);
- pidgin_blist_refresh(purple_get_blist());
+ pidgin_blist_refresh();
}
}
More information about the Commits
mailing list