Mercurial > pidgin.yaz
changeset 18058:4ca97b26a8fb
Mark the return type const for the following functions. I noticed this
while fixing some DBus stuff which I'll commit shortly.
* purple_accounts_get_all
* purple_connections_get_all
* purple_connections_get_connecting
* purple_conv_chat_get_ignored
* purple_conv_chat_get_users
* purple_get_chats
* purple_get_conversations
* purple_get_ims
* purple_notify_user_info_get_entries
References #1344
line wrap: on
line diff
--- a/finch/gntaccount.c Thu Jun 07 03:13:02 2007 +0000 +++ b/finch/gntaccount.c Thu Jun 07 04:22:42 2007 +0000 @@ -641,7 +641,7 @@ void finch_accounts_show_all() { - GList *iter; + const GList *iter; GntWidget *box, *button; if (accounts.window) @@ -734,7 +734,7 @@ void finch_accounts_init() { - GList *iter; + const GList *iter; purple_signal_connect(purple_accounts_get_handle(), "account-added", finch_accounts_get_handle(), PURPLE_CALLBACK(account_added_callback), @@ -831,7 +831,7 @@ { PurpleConnection *gc = purple_account_get_connection(data->account); - if (g_list_find(purple_connections_get_all(), gc)) + if (g_list_find((GList *)purple_connections_get_all(), gc)) { purple_blist_request_add_buddy(data->account, data->username, NULL, data->alias);
--- a/finch/gntpounce.c Thu Jun 07 03:13:02 2007 +0000 +++ b/finch/gntpounce.c Thu Jun 07 04:22:42 2007 +0000 @@ -288,7 +288,7 @@ GntWidget *hbox, *vbox; GntWidget *button; GntWidget *combo; - GList *list; + const GList *list; g_return_if_fail((cur_pounce != NULL) || (account != NULL) || @@ -303,7 +303,7 @@ dialog->pounce = NULL; dialog->account = account; } else { - GList *connections = purple_connections_get_all(); + const GList *connections = purple_connections_get_all(); PurpleConnection *gc; if (connections != NULL) {
--- a/finch/gntrequest.c Thu Jun 07 03:13:02 2007 +0000 +++ b/finch/gntrequest.c Thu Jun 07 04:22:42 2007 +0000 @@ -490,7 +490,7 @@ { gboolean all; PurpleAccount *def; - GList *list; + const GList *list; GntWidget *combo = gnt_combo_box_new(); gnt_box_set_alignment(GNT_BOX(hbox), GNT_ALIGN_MID); gnt_box_add_widget(GNT_BOX(hbox), combo);
--- a/finch/gntstatus.c Thu Jun 07 03:13:02 2007 +0000 +++ b/finch/gntstatus.c Thu Jun 07 04:22:42 2007 +0000 @@ -497,7 +497,7 @@ GntWidget *window, *box, *button, *entry, *combo, *label, *tree; PurpleStatusPrimitive prims[] = {PURPLE_STATUS_AVAILABLE, PURPLE_STATUS_AWAY, PURPLE_STATUS_INVISIBLE, PURPLE_STATUS_OFFLINE, PURPLE_STATUS_UNSET}, current; - GList *iter; + const GList *iter; int i; if (saved)
--- a/libpurple/account.c Thu Jun 07 03:13:02 2007 +0000 +++ b/libpurple/account.c Thu Jun 07 04:22:42 2007 +0000 @@ -371,7 +371,7 @@ accounts_to_xmlnode(void) { xmlnode *node, *child; - GList *cur; + const GList *cur; node = xmlnode_new("account"); xmlnode_set_attrib(node, "version", "1.0"); @@ -877,7 +877,7 @@ void purple_account_destroy(PurpleAccount *account) { - GList *l; + const GList *l; g_return_if_fail(account != NULL); @@ -2272,7 +2272,7 @@ schedule_accounts_save(); } -GList * +const GList * purple_accounts_get_all(void) { return accounts; @@ -2282,7 +2282,7 @@ purple_accounts_get_all_active(void) { GList *list = NULL; - GList *all = purple_accounts_get_all(); + const GList *all = purple_accounts_get_all(); while (all != NULL) { PurpleAccount *account = all->data; @@ -2300,7 +2300,7 @@ purple_accounts_find(const char *name, const char *protocol_id) { PurpleAccount *account = NULL; - GList *l; + const GList *l; char *who; g_return_val_if_fail(name != NULL, NULL); @@ -2327,7 +2327,7 @@ void purple_accounts_restore_current_statuses() { - GList *l; + const GList *l; PurpleAccount *account; /* If we're not connected to the Internet right now, we bail on this */
--- a/libpurple/account.h Thu Jun 07 03:13:02 2007 +0000 +++ b/libpurple/account.h Thu Jun 07 04:22:42 2007 +0000 @@ -886,7 +886,7 @@ * * @return A list of all accounts. */ -GList *purple_accounts_get_all(void); +const GList *purple_accounts_get_all(void); /** * Returns a list of all enabled accounts
--- a/libpurple/blist.c Thu Jun 07 03:13:02 2007 +0000 +++ b/libpurple/blist.c Thu Jun 07 04:22:42 2007 +0000 @@ -304,7 +304,7 @@ { xmlnode *node, *child, *grandchild; PurpleBlistNode *gnode; - GList *cur; + const GList *cur; node = xmlnode_new("purple"); xmlnode_set_attrib(node, "version", "1.0"); @@ -1893,7 +1893,7 @@ { PurpleBlistUiOps *ops = purple_blist_get_ui_ops(); PurpleBlistNode *node; - GList *l; + const GList *l; g_return_if_fail(group != NULL);
--- a/libpurple/buddyicon.c Thu Jun 07 03:13:02 2007 +0000 +++ b/libpurple/buddyicon.c Thu Jun 07 04:22:42 2007 +0000 @@ -1021,7 +1021,7 @@ _purple_buddy_icons_account_loaded_cb() { const char *dirname = purple_buddy_icons_get_cache_dir(); - GList *cur; + const GList *cur; for (cur = purple_accounts_get_all(); cur != NULL; cur = cur->next) {
--- a/libpurple/connection.c Thu Jun 07 03:13:02 2007 +0000 +++ b/libpurple/connection.c Thu Jun 07 04:22:42 2007 +0000 @@ -456,7 +456,7 @@ void purple_connections_disconnect_all(void) { - GList *l; + const GList *l; PurpleConnection *gc; while ((l = purple_connections_get_all()) != NULL) { @@ -466,13 +466,13 @@ } } -GList * +const GList * purple_connections_get_all(void) { return connections; } -GList * +const GList * purple_connections_get_connecting(void) { return connections_connecting;
--- a/libpurple/connection.h Thu Jun 07 03:13:02 2007 +0000 +++ b/libpurple/connection.h Thu Jun 07 04:22:42 2007 +0000 @@ -261,14 +261,14 @@ * * @return A list of all active connections. */ -GList *purple_connections_get_all(void); +const GList *purple_connections_get_all(void); /** * Returns a list of all connections in the process of connecting. * * @return A list of connecting connections. */ -GList *purple_connections_get_connecting(void); +const GList *purple_connections_get_connecting(void); /** * Checks if gc is still a valid pointer to a gc. @@ -279,7 +279,7 @@ * TODO: Eventually this bad boy will be removed, because it is * a gross fix for a crashy problem. */ -#define PURPLE_CONNECTION_IS_VALID(gc) (g_list_find(purple_connections_get_all(), (gc)) != NULL) +#define PURPLE_CONNECTION_IS_VALID(gc) (g_list_find((GList *)purple_connections_get_all(), (gc)) != NULL) /*@}*/
--- a/libpurple/conversation.c Thu Jun 07 03:13:02 2007 +0000 +++ b/libpurple/conversation.c Thu Jun 07 04:22:42 2007 +0000 @@ -631,7 +631,7 @@ purple_conversation_foreach(void (*func)(PurpleConversation *conv)) { PurpleConversation *conv; - GList *l; + const GList *l; g_return_if_fail(func != NULL); @@ -732,19 +732,19 @@ return g_hash_table_lookup(conv->data, key); } -GList * +const GList * purple_get_conversations(void) { return conversations; } -GList * +const GList * purple_get_ims(void) { return ims; } -GList * +const GList * purple_get_chats(void) { return chats; @@ -759,7 +759,7 @@ PurpleConversation *c = NULL; gchar *name1; const gchar *name2; - GList *cnv; + const GList *cnv; g_return_val_if_fail(name != NULL, NULL); @@ -819,7 +819,7 @@ return; if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM && - !g_list_find(purple_get_conversations(), conv)) + !g_list_find((GList *)purple_get_conversations(), conv)) return; displayed = g_strdup(message); @@ -1250,7 +1250,7 @@ return users; } -GList * +const GList * purple_conv_chat_get_users(const PurpleConvChat *chat) { g_return_val_if_fail(chat != NULL, NULL); @@ -1269,7 +1269,7 @@ return; purple_conv_chat_set_ignored(chat, - g_list_append(purple_conv_chat_get_ignored(chat), g_strdup(name))); + g_list_append(chat->ignored, g_strdup(name))); } void @@ -1284,11 +1284,11 @@ if (!purple_conv_chat_is_user_ignored(chat, name)) return; - item = g_list_find(purple_conv_chat_get_ignored(chat), + item = g_list_find((GList *)purple_conv_chat_get_ignored(chat), purple_conv_chat_get_ignored_user(chat, name)); purple_conv_chat_set_ignored(chat, - g_list_remove_link(purple_conv_chat_get_ignored(chat), item)); + g_list_remove_link(chat->ignored, item)); g_free(item->data); g_list_free_1(item); @@ -1304,7 +1304,7 @@ return ignored; } -GList * +const GList * purple_conv_chat_get_ignored(const PurpleConvChat *chat) { g_return_val_if_fail(chat != NULL, NULL); @@ -1315,7 +1315,7 @@ const char * purple_conv_chat_get_ignored_user(const PurpleConvChat *chat, const char *user) { - GList *ignored; + const GList *ignored; g_return_val_if_fail(chat != NULL, NULL); g_return_val_if_fail(user != NULL, NULL); @@ -1565,7 +1565,7 @@ cbuddy = purple_conv_chat_cb_new(user, alias, flag); /* This seems dumb. Why should we set users thousands of times? */ purple_conv_chat_set_users(chat, - g_list_prepend(purple_conv_chat_get_users(chat), cbuddy)); + g_list_prepend(chat->in_room, cbuddy)); cbuddies = g_list_prepend(cbuddies, cbuddy); @@ -1634,7 +1634,7 @@ flags = purple_conv_chat_user_get_flags(chat, old_user); cb = purple_conv_chat_cb_new(new_user, NULL, flags); purple_conv_chat_set_users(chat, - g_list_prepend(purple_conv_chat_get_users(chat), cb)); + g_list_prepend(chat->in_room, cb)); if (!strcmp(chat->nick, purple_normalize(conv->account, old_user))) { const char *alias; @@ -1666,7 +1666,7 @@ if (cb) { purple_conv_chat_set_users(chat, - g_list_remove(purple_conv_chat_get_users(chat), cb)); + g_list_remove(chat->in_room, cb)); purple_conv_chat_cb_destroy(cb); } @@ -1760,7 +1760,7 @@ if (cb) { purple_conv_chat_set_users(chat, - g_list_remove(purple_conv_chat_get_users(chat), cb)); + g_list_remove(chat->in_room, cb)); purple_conv_chat_cb_destroy(cb); } @@ -1809,14 +1809,15 @@ { PurpleConversation *conv; PurpleConversationUiOps *ops; - GList *users, *names = NULL; - GList *l; + GList *users; + const GList *l; + GList *names = NULL; g_return_if_fail(chat != NULL); conv = purple_conv_chat_get_conversation(chat); ops = purple_conversation_get_ui_ops(conv); - users = purple_conv_chat_get_users(chat); + users = chat->in_room; if (ops != NULL && ops->chat_remove_users != NULL) { for (l = users; l; l = l->next) { @@ -1918,7 +1919,7 @@ PurpleConversation * purple_find_chat(const PurpleConnection *gc, int id) { - GList *l; + const GList *l; PurpleConversation *conv; for (l = purple_get_chats(); l != NULL; l = l->next) { @@ -1967,7 +1968,7 @@ PurpleConvChatBuddy * purple_conv_chat_cb_find(PurpleConvChat *chat, const char *name) { - GList *l; + const GList *l; PurpleConvChatBuddy *cb = NULL; g_return_val_if_fail(chat != NULL, NULL);
--- a/libpurple/conversation.h Thu Jun 07 03:13:02 2007 +0000 +++ b/libpurple/conversation.h Thu Jun 07 04:22:42 2007 +0000 @@ -504,21 +504,21 @@ * * @return A GList of all conversations. */ -GList *purple_get_conversations(void); +const GList *purple_get_conversations(void); /** * Returns a list of all IMs. * * @return A GList of all IMs. */ -GList *purple_get_ims(void); +const GList *purple_get_ims(void); /** * Returns a list of all chats. * * @return A GList of all chats. */ -GList *purple_get_chats(void); +const GList *purple_get_chats(void); /** * Finds a conversation with the specified type, name, and Purple account. @@ -877,7 +877,7 @@ * * @return The list of users. */ -GList *purple_conv_chat_get_users(const PurpleConvChat *chat); +const GList *purple_conv_chat_get_users(const PurpleConvChat *chat); /** * Ignores a user in a chat room. @@ -912,7 +912,7 @@ * * @return The list of ignored users. */ -GList *purple_conv_chat_get_ignored(const PurpleConvChat *chat); +const GList *purple_conv_chat_get_ignored(const PurpleConvChat *chat); /** * Returns the actual name of the specified ignored user, if it exists in
--- a/libpurple/dbus-useful.c Thu Jun 07 03:13:02 2007 +0000 +++ b/libpurple/dbus-useful.c Thu Jun 07 04:22:42 2007 +0000 @@ -11,7 +11,7 @@ gboolean (*account_test)(const PurpleAccount *account)) { PurpleAccount *result = NULL; - GList *l; + const GList *l; char *who; if (name)
--- a/libpurple/idle.c Thu Jun 07 03:13:02 2007 +0000 +++ b/libpurple/idle.c Thu Jun 07 04:22:42 2007 +0000 @@ -199,7 +199,7 @@ /* Idle reporting stuff */ if (report_idle && (time_idle >= IDLEMARK)) { - GList *l; + const GList *l; for (l = purple_connections_get_all(); l != NULL; l = l->next) { PurpleConnection *gc = l->data;
--- a/libpurple/log.c Thu Jun 07 03:13:02 2007 +0000 +++ b/libpurple/log.c Thu Jun 07 04:22:42 2007 +0000 @@ -984,7 +984,7 @@ GDir *protocol_dir; const gchar *username; gchar *protocol_unescaped; - GList *account_iter; + const GList *account_iter; GList *accounts = NULL; if ((protocol_dir = g_dir_open(protocol_path, 0, NULL)) == NULL) {
--- a/libpurple/notify.c Thu Jun 07 03:13:02 2007 +0000 +++ b/libpurple/notify.c Thu Jun 07 04:22:42 2007 +0000 @@ -530,7 +530,7 @@ g_free(user_info); } -GList * +const GList * purple_notify_user_info_get_entries(PurpleNotifyUserInfo *user_info) { g_return_val_if_fail(user_info != NULL, NULL);
--- a/libpurple/notify.h Thu Jun 07 03:13:02 2007 +0000 +++ b/libpurple/notify.h Thu Jun 07 04:22:42 2007 +0000 @@ -458,7 +458,7 @@ * * @result A GList of PurpleNotifyUserInfoEntry objects */ -GList *purple_notify_user_info_get_entries(PurpleNotifyUserInfo *user_info); +const GList *purple_notify_user_info_get_entries(PurpleNotifyUserInfo *user_info); /** * Create a textual representation of a PurpleNotifyUserInfo, separating entries with newline
--- a/libpurple/plugins/joinpart.c Thu Jun 07 03:13:02 2007 +0000 +++ b/libpurple/plugins/joinpart.c Thu Jun 07 04:22:42 2007 +0000 @@ -86,7 +86,7 @@ /* If the room is small, don't bother. */ chat = PURPLE_CONV_CHAT(conv); threshold = purple_prefs_get_int(THRESHOLD_PREF); - if (g_list_length(purple_conv_chat_get_users(chat)) < threshold) + if (g_list_length((GList *)purple_conv_chat_get_users(chat)) < threshold) return FALSE; /* We always care about our buddies! */
--- a/libpurple/plugins/perl/common/Account.xs Thu Jun 07 03:13:02 2007 +0000 +++ b/libpurple/plugins/perl/common/Account.xs Thu Jun 07 04:22:42 2007 +0000 @@ -290,7 +290,7 @@ void purple_accounts_get_all() PREINIT: - GList *l; + const GList *l; PPCODE: for (l = purple_accounts_get_all(); l != NULL; l = l->next) { XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::Account")));
--- a/libpurple/plugins/perl/common/Connection.xs Thu Jun 07 03:13:02 2007 +0000 +++ b/libpurple/plugins/perl/common/Connection.xs Thu Jun 07 04:22:42 2007 +0000 @@ -72,7 +72,7 @@ void purple_connections_get_all() PREINIT: - GList *l; + const GList *l; PPCODE: for (l = purple_connections_get_all(); l != NULL; l = l->next) { XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::Connection"))); @@ -81,7 +81,7 @@ void purple_connections_get_connecting() PREINIT: - GList *l; + const GList *l; PPCODE: for (l = purple_connections_get_connecting(); l != NULL; l = l->next) { XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::Connection")));
--- a/libpurple/plugins/perl/common/Conversation.xs Thu Jun 07 03:13:02 2007 +0000 +++ b/libpurple/plugins/perl/common/Conversation.xs Thu Jun 07 04:22:42 2007 +0000 @@ -93,7 +93,7 @@ void purple_get_ims() PREINIT: - GList *l; + const GList *l; PPCODE: for (l = purple_get_ims(); l != NULL; l = l->next) { XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::Conversation"))); @@ -102,7 +102,7 @@ void purple_get_conversations() PREINIT: - GList *l; + const GList *l; PPCODE: for (l = purple_get_conversations(); l != NULL; l = l->next) { XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::Conversation"))); @@ -111,7 +111,7 @@ void purple_get_chats() PREINIT: - GList *l; + const GList *l; PPCODE: for (l = purple_get_chats(); l != NULL; l = l->next) { XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::Conversation"))); @@ -354,7 +354,7 @@ purple_conv_chat_get_users(chat) Purple::Conversation::Chat chat PREINIT: - GList *l; + const GList *l; PPCODE: for (l = purple_conv_chat_get_users(chat); l != NULL; l = l->next) { XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::ListEntry"))); @@ -394,7 +394,7 @@ purple_conv_chat_get_ignored(chat) Purple::Conversation::Chat chat PREINIT: - GList *l; + const GList *l; PPCODE: for (l = purple_conv_chat_get_ignored(chat); l != NULL; l = l->next) { XPUSHs(sv_2mortal(purple_perl_bless_object(l->data, "Purple::ListEntry")));
--- a/libpurple/plugins/tcl/tcl_cmds.c Thu Jun 07 03:13:02 2007 +0000 +++ b/libpurple/plugins/tcl/tcl_cmds.c Thu Jun 07 04:22:42 2007 +0000 @@ -43,7 +43,7 @@ static PurpleAccount *tcl_validate_account(Tcl_Obj *obj, Tcl_Interp *interp) { PurpleAccount *account; - GList *cur; + const GList *cur; account = purple_tcl_ref_get(interp, obj, PurpleTclRefAccount); @@ -62,7 +62,7 @@ static PurpleConversation *tcl_validate_conversation(Tcl_Obj *obj, Tcl_Interp *interp) { PurpleConversation *convo; - GList *cur; + const GList *cur; convo = purple_tcl_ref_get(interp, obj, PurpleTclRefConversation); @@ -81,7 +81,7 @@ static PurpleConnection *tcl_validate_gc(Tcl_Obj *obj, Tcl_Interp *interp) { PurpleConnection *gc; - GList *cur; + const GList *cur; gc = purple_tcl_ref_get(interp, obj, PurpleTclRefConnection); @@ -612,7 +612,7 @@ const char *cmds[] = { "account", "displayname", "handle", "list", NULL }; enum { CMD_CONN_ACCOUNT, CMD_CONN_DISPLAYNAME, CMD_CONN_HANDLE, CMD_CONN_LIST } cmd; int error; - GList *cur; + const GList *cur; PurpleConnection *gc; if (objc < 2) { @@ -680,7 +680,7 @@ PurpleConversation *convo; PurpleAccount *account; PurpleConversationType type; - GList *cur; + const GList *cur; char *opt, *from, *what; int error, argsused, flags = 0;
--- a/libpurple/protocols/irc/irc.c Thu Jun 07 03:13:02 2007 +0000 +++ b/libpurple/protocols/irc/irc.c Thu Jun 07 04:22:42 2007 +0000 @@ -592,7 +592,7 @@ struct irc_conn *irc = gc->proto_data; int len; - if(!g_list_find(purple_connections_get_all(), gc)) { + if(!g_list_find((GList *)purple_connections_get_all(), gc)) { purple_ssl_close(gsc); return; }
--- a/libpurple/protocols/jabber/jutil.c Thu Jun 07 03:13:02 2007 +0000 +++ b/libpurple/protocols/jabber/jutil.c Thu Jun 07 04:22:42 2007 +0000 @@ -221,7 +221,7 @@ jabber_find_unnormalized_conv(const char *name, PurpleAccount *account) { PurpleConversation *c = NULL; - GList *cnv; + const GList *cnv; g_return_val_if_fail(name != NULL, NULL);
--- a/libpurple/protocols/msn/msn.c Thu Jun 07 03:13:02 2007 +0000 +++ b/libpurple/protocols/msn/msn.c Thu Jun 07 04:22:42 2007 +0000 @@ -1463,7 +1463,7 @@ purple_debug_info("msn", "In msn_got_info\n"); /* Make sure the connection is still valid */ - if (g_list_find(purple_connections_get_all(), info_data->gc) == NULL) + if (g_list_find((GList *)purple_connections_get_all(), info_data->gc) == NULL) { purple_debug_warning("msn", "invalid connection. ignoring buddy info.\n"); g_free(info_data->name); @@ -1883,7 +1883,7 @@ /* Make sure the connection is still valid if we got here by fetching a photo url */ if (url_text && (error_message != NULL || - g_list_find(purple_connections_get_all(), info_data->gc) == NULL)) + g_list_find((GList *)purple_connections_get_all(), info_data->gc) == NULL)) { purple_debug_warning("msn", "invalid connection. ignoring buddy photo info.\n"); g_free(stripped); @@ -1982,7 +1982,7 @@ if (acct && !purple_account_is_connected(acct)) acct = NULL; } else { /* Otherwise find an active account for the protocol */ - GList *l = purple_accounts_get_all(); + const GList *l = purple_accounts_get_all(); while (l) { if (!strcmp(prpl, purple_account_get_protocol_id(l->data)) && purple_account_is_connected(l->data)) {
--- a/libpurple/protocols/oscar/oscar.c Thu Jun 07 03:13:02 2007 +0000 +++ b/libpurple/protocols/oscar/oscar.c Thu Jun 07 04:22:42 2007 +0000 @@ -6493,7 +6493,7 @@ if (acct && !purple_account_is_connected(acct)) acct = NULL; } else { /* Otherwise find an active account for the protocol */ - GList *l = purple_accounts_get_all(); + const GList *l = purple_accounts_get_all(); while (l) { if (!strcmp(prpl, purple_account_get_protocol_id(l->data)) && purple_account_is_connected(l->data)) {
--- a/libpurple/protocols/yahoo/yahoo.c Thu Jun 07 03:13:02 2007 +0000 +++ b/libpurple/protocols/yahoo/yahoo.c Thu Jun 07 04:22:42 2007 +0000 @@ -3861,7 +3861,7 @@ if (acct && !purple_account_is_connected(acct)) acct = NULL; } else { /* Otherwise find an active account for the protocol */ - GList *l = purple_accounts_get_all(); + const GList *l = purple_accounts_get_all(); while (l) { if (!strcmp(prpl, purple_account_get_protocol_id(l->data)) && purple_account_is_connected(l->data)) {
--- a/libpurple/protocols/yahoo/yahoochat.c Thu Jun 07 03:13:02 2007 +0000 +++ b/libpurple/protocols/yahoo/yahoochat.c Thu Jun 07 04:22:42 2007 +0000 @@ -633,10 +633,10 @@ * I think conference names are always ascii. */ -void yahoo_conf_leave(struct yahoo_data *yd, const char *room, const char *dn, GList *who) +void yahoo_conf_leave(struct yahoo_data *yd, const char *room, const char *dn, const GList *who) { struct yahoo_packet *pkt; - GList *w; + const GList *w; purple_debug_misc("yahoo", "leaving conference %s\n", room); @@ -653,11 +653,11 @@ } static int yahoo_conf_send(PurpleConnection *gc, const char *dn, const char *room, - GList *members, const char *what) + const GList *members, const char *what) { struct yahoo_data *yd = gc->proto_data; struct yahoo_packet *pkt; - GList *who; + const GList *who; char *msg, *msg2; int utf8 = 1; @@ -714,7 +714,7 @@ { struct yahoo_data *yd = gc->proto_data; struct yahoo_packet *pkt; - GList *members; + const GList *members; char *msg2 = NULL; if (msg)
--- a/libpurple/protocols/yahoo/yahoochat.h Thu Jun 07 03:13:02 2007 +0000 +++ b/libpurple/protocols/yahoo/yahoochat.h Thu Jun 07 04:22:42 2007 +0000 @@ -50,7 +50,7 @@ char *yahoo_get_chat_name(GHashTable *data); void yahoo_c_invite(PurpleConnection *gc, int id, const char *msg, const char *name); -void yahoo_conf_leave(struct yahoo_data *yd, const char *room, const char *dn, GList *who); +void yahoo_conf_leave(struct yahoo_data *yd, const char *room, const char *dn, const GList *who); void yahoo_chat_goto(PurpleConnection *gc, const char *name);
--- a/pidgin/gtkaccount.c Thu Jun 07 03:13:02 2007 +0000 +++ b/pidgin/gtkaccount.c Thu Jun 07 04:22:42 2007 +0000 @@ -1585,7 +1585,7 @@ account = purple_connection_get_account(gc); model = GTK_TREE_MODEL(accounts_window->model); - index = g_list_index(purple_accounts_get_all(), account); + index = g_list_index((GList *)purple_accounts_get_all(), account); if (gtk_tree_model_iter_nth_child(model, &iter, NULL, index)) { @@ -1788,13 +1788,13 @@ case GTK_TREE_VIEW_DROP_INTO_OR_AFTER: move_account_after(dialog->model, &dialog->drag_iter, &iter); - dest_index = g_list_index(purple_accounts_get_all(), + dest_index = g_list_index((GList *)purple_accounts_get_all(), account) + 1; break; case GTK_TREE_VIEW_DROP_BEFORE: case GTK_TREE_VIEW_DROP_INTO_OR_BEFORE: - dest_index = g_list_index(purple_accounts_get_all(), + dest_index = g_list_index((GList *)purple_accounts_get_all(), account); move_account_before(dialog->model, &dialog->drag_iter, @@ -2093,7 +2093,7 @@ static gboolean populate_accounts_list(AccountsWindow *dialog) { - GList *l; + const GList *l; gboolean ret = FALSE; GdkPixbuf *global_buddyicon = NULL; const char *path; @@ -2297,7 +2297,7 @@ global_buddyicon_changed(const char *name, PurplePrefType type, gconstpointer value, gpointer window) { - GList *list; + const GList *list; for (list = purple_accounts_get_all(); list; list = list->next) { account_modified_cb(list->data, window); } @@ -2428,7 +2428,7 @@ { PurpleConnection *gc = purple_account_get_connection(data->account); - if (g_list_find(purple_connections_get_all(), gc)) + if (g_list_find((GList *)purple_connections_get_all(), gc)) { purple_blist_request_add_buddy(data->account, data->username, NULL, data->alias);
--- a/pidgin/gtkblist.c Thu Jun 07 03:13:02 2007 +0000 +++ b/pidgin/gtkblist.c Thu Jun 07 04:22:42 2007 +0000 @@ -681,7 +681,7 @@ gboolean pidgin_blist_joinchat_is_showable() { - GList *c; + const GList *c; PurpleConnection *gc; for (c = purple_connections_get_all(); c != NULL; c = c->next) { @@ -1536,7 +1536,7 @@ add_buddies_from_vcard(const char *prpl_id, PurpleGroup *group, GList *list, const char *alias) { - GList *l; + const GList *l; PurpleAccount *account = NULL; PurpleConnection *gc; @@ -2889,7 +2889,7 @@ prpl = purple_find_prpl(purple_account_get_protocol_id(chat->account)); prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl); - if (g_list_length(purple_connections_get_all()) > 1) + if (g_list_length((GList *)purple_connections_get_all()) > 1) { tmp = g_markup_escape_text(chat->account->username, -1); g_string_append_printf(str, _("\n<b>Account:</b> %s"), tmp); @@ -2954,7 +2954,7 @@ user_info = purple_notify_user_info_new(); /* Account */ - if (full && g_list_length(purple_connections_get_all()) > 1) + if (full && g_list_length((GList *)purple_connections_get_all()) > 1) { tmp = g_markup_escape_text(purple_account_get_username( purple_buddy_get_account(b)), -1); @@ -5689,7 +5689,7 @@ { PidginAddChatData *data; PidginBuddyList *gtkblist; - GList *l; + const GList *l; PurpleConnection *gc; GtkWidget *label; GtkWidget *rowbox; @@ -6456,7 +6456,8 @@ { GtkWidget *menuitem = NULL, *submenu = NULL; GtkAccelGroup *accel_group = NULL; - GList *l = NULL, *accounts = NULL; + GList *l = NULL; + const GList *accounts; gboolean disabled_accounts = FALSE; if (accountmenu == NULL)
--- a/pidgin/gtkconv.c Thu Jun 07 03:13:02 2007 +0000 +++ b/pidgin/gtkconv.c Thu Jun 07 04:22:42 2007 +0000 @@ -2645,7 +2645,7 @@ gboolean hidden_only, guint max_count) { - GList *l; + const GList *l; GList *r = NULL; guint c = 0; @@ -3751,7 +3751,7 @@ g_list_free(list); } else if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT) { PurpleConvChat *chat = PURPLE_CONV_CHAT(conv); - GList *l = purple_conv_chat_get_users(chat); + const GList *l = purple_conv_chat_get_users(chat); GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(PIDGIN_CONVERSATION(conv)->u.chat->list)); GtkTreeIter iter; int f; @@ -5345,7 +5345,7 @@ gtkconv = PIDGIN_CONVERSATION(conv); gtkchat = gtkconv->u.chat; - num_users = g_list_length(purple_conv_chat_get_users(chat)); + num_users = g_list_length((GList *)purple_conv_chat_get_users(chat)); g_snprintf(tmp, sizeof(tmp), ngettext("%d person in room", "%d people in room", @@ -5439,7 +5439,7 @@ gtkconv = PIDGIN_CONVERSATION(conv); gtkchat = gtkconv->u.chat; - num_users = g_list_length(purple_conv_chat_get_users(chat)); + num_users = g_list_length((GList *)purple_conv_chat_get_users(chat)); for (l = users; l != NULL; l = l->next) { model = gtk_tree_view_get_model(GTK_TREE_VIEW(gtkchat->list)); @@ -6428,7 +6428,7 @@ close_on_tabs_pref_cb(const char *name, PurplePrefType type, gconstpointer value, gpointer data) { - GList *l; + const GList *l; PurpleConversation *conv; PidginConversation *gtkconv; @@ -6452,7 +6452,7 @@ gconstpointer value, gpointer data) { #ifdef USE_GTKSPELL - GList *cl; + const GList *cl; PurpleConversation *conv; PidginConversation *gtkconv; GtkSpell *spell; @@ -6499,7 +6499,7 @@ show_timestamps_pref_cb(const char *name, PurplePrefType type, gconstpointer value, gpointer data) { - GList *l; + const GList *l; PurpleConversation *conv; PidginConversation *gtkconv; PidginWindow *win; @@ -6527,7 +6527,7 @@ show_formatting_toolbar_pref_cb(const char *name, PurplePrefType type, gconstpointer value, gpointer data) { - GList *l; + const GList *l; PurpleConversation *conv; PidginConversation *gtkconv; PidginWindow *win; @@ -6557,7 +6557,7 @@ animate_buddy_icons_pref_cb(const char *name, PurplePrefType type, gconstpointer value, gpointer data) { - GList *l; + const GList *l; PurpleConversation *conv; PidginConversation *gtkconv; PidginWindow *win; @@ -6584,7 +6584,7 @@ show_buddy_icons_pref_cb(const char *name, PurplePrefType type, gconstpointer value, gpointer data) { - GList *l; + const GList *l; for (l = purple_get_conversations(); l != NULL; l = l->next) { PurpleConversation *conv = l->data; @@ -6710,7 +6710,7 @@ static void account_signed_off_cb(PurpleConnection *gc, gpointer event) { - GList *iter; + const GList *iter; for (iter = purple_get_conversations(); iter; iter = iter->next) {
--- a/pidgin/gtkdocklet.c Thu Jun 07 03:13:02 2007 +0000 +++ b/pidgin/gtkdocklet.c Thu Jun 07 04:22:42 2007 +0000 @@ -109,7 +109,8 @@ static gboolean docklet_update_status() { - GList *convs, *l; + GList *convs; + const GList *l; int count; PurpleSavedStatus *saved_status; PurpleStatusPrimitive newstatus = PURPLE_STATUS_OFFLINE; @@ -213,8 +214,7 @@ static gboolean online_account_supports_chat() { - GList *c = NULL; - c = purple_connections_get_all(); + const GList *c = purple_connections_get_all(); while(c != NULL) { PurpleConnection *gc = c->data;
--- a/pidgin/gtklog.c Thu Jun 07 03:13:02 2007 +0000 +++ b/pidgin/gtklog.c Thu Jun 07 04:22:42 2007 +0000 @@ -757,7 +757,7 @@ void pidgin_syslog_show() { - GList *accounts = NULL; + const GList *accounts; GList *logs = NULL; if (syslog_viewer != NULL) {
--- a/pidgin/gtkmain.c Thu Jun 07 03:13:02 2007 +0000 +++ b/pidgin/gtkmain.c Thu Jun 07 04:22:42 2007 +0000 @@ -127,7 +127,7 @@ } g_strfreev(names); } else { /* no name given, use the first account */ - GList *accounts; + const GList *accounts; accounts = purple_accounts_get_all(); if (accounts != NULL) @@ -441,7 +441,7 @@ char *opt_session_arg = NULL; int dologin_ret = -1; char *search_path; - GList *accounts; + const GList *accounts; #ifdef HAVE_SIGNAL_H int sig_indx; /* for setting up signal catching */ sigset_t sigset; @@ -456,6 +456,7 @@ gboolean gui_check; gboolean debug_enabled; gboolean migration_failed = FALSE; + GList *active_accounts; struct option long_options[] = { {"config", required_argument, NULL, 'c'}, @@ -828,13 +829,13 @@ purple_accounts_restore_current_statuses(); } - if ((accounts = purple_accounts_get_all_active()) == NULL) + if ((active_accounts = purple_accounts_get_all_active()) == NULL) { pidgin_accounts_window_show(); } else { - g_list_free(accounts); + g_list_free(active_accounts); } #ifdef HAVE_STARTUP_NOTIFICATION
--- a/pidgin/gtkpounce.c Thu Jun 07 03:13:02 2007 +0000 +++ b/pidgin/gtkpounce.c Thu Jun 07 04:22:42 2007 +0000 @@ -496,7 +496,7 @@ } else { - GList *connections = purple_connections_get_all(); + const GList *connections = purple_connections_get_all(); PurpleConnection *gc; if (connections != NULL)
--- a/pidgin/gtkroomlist.c Thu Jun 07 03:13:02 2007 +0000 +++ b/pidgin/gtkroomlist.c Thu Jun 07 04:22:42 2007 +0000 @@ -343,7 +343,7 @@ gboolean pidgin_roomlist_is_showable() { - GList *c; + const GList *c; PurpleConnection *gc; for (c = purple_connections_get_all(); c != NULL; c = c->next) {
--- a/pidgin/gtksavedstatuses.c Thu Jun 07 03:13:02 2007 +0000 +++ b/pidgin/gtksavedstatuses.c Thu Jun 07 04:22:42 2007 +0000 @@ -1012,7 +1012,7 @@ static void status_editor_populate_list(StatusEditor *dialog, PurpleSavedStatus *saved_status) { - GList *iter; + const GList *iter; PurpleSavedStatusSub *substatus; gtk_list_store_clear(dialog->model);
--- a/pidgin/gtkstatusbox.c Thu Jun 07 03:13:02 2007 +0000 +++ b/pidgin/gtkstatusbox.c Thu Jun 07 04:22:42 2007 +0000 @@ -1434,7 +1434,7 @@ } } } else { - GList *accounts; + const GList *accounts; for (accounts = purple_accounts_get_all(); accounts != NULL; accounts = accounts->next) { PurpleAccount *account = accounts->data; PurplePlugin *plug = purple_find_prpl(purple_account_get_protocol_id(account));
--- a/pidgin/gtkthemes.c Thu Jun 07 03:13:02 2007 +0000 +++ b/pidgin/gtkthemes.c Thu Jun 07 04:22:42 2007 +0000 @@ -237,7 +237,7 @@ } if (load) { - GList *cnv; + const GList *cnv; if (current_smiley_theme) pidgin_themes_destroy_smiley_theme(current_smiley_theme);
--- a/pidgin/gtkutils.c Thu Jun 07 03:13:02 2007 +0000 +++ b/pidgin/gtkutils.c Thu Jun 07 04:22:42 2007 +0000 @@ -687,8 +687,8 @@ AopMenu *aop_menu = NULL; PurpleAccount *account; GdkPixbuf *pixbuf = NULL; - GList *list; - GList *p; + const GList *list; + const GList *p; GtkSizeGroup *sg; int i; char buf[256]; @@ -995,9 +995,9 @@ /* Check for a compatible account. */ if (ret_account != NULL) { - GList *list; + const GList *list; PurpleAccount *account = NULL; - GList *l; + const GList *l; const char *protoname; if (all_accounts)
--- a/pidgin/plugins/gestures/gestures.c Thu Jun 07 03:13:02 2007 +0000 +++ b/pidgin/plugins/gestures/gestures.c Thu Jun 07 04:22:42 2007 +0000 @@ -176,7 +176,7 @@ plugin_load(PurplePlugin *plugin) { PurpleConversation *conv; - GList *l; + const GList *l; for (l = purple_get_conversations(); l != NULL; l = l->next) { conv = (PurpleConversation *)l->data; @@ -199,7 +199,7 @@ { PurpleConversation *conv; PidginConversation *gtkconv; - GList *l; + const GList *l; for (l = purple_get_conversations(); l != NULL; l = l->next) { conv = (PurpleConversation *)l->data;
--- a/pidgin/plugins/gevolution/add_buddy_dialog.c Thu Jun 07 03:13:02 2007 +0000 +++ b/pidgin/plugins/gevolution/add_buddy_dialog.c Thu Jun 07 04:22:42 2007 +0000 @@ -162,7 +162,7 @@ GList *list, const char *id) { PurpleAccount *account = NULL; - GList *l; + const GList *l; GtkTreeIter iter; GdkPixbuf *pixbuf;
--- a/pidgin/plugins/gevolution/gevolution.c Thu Jun 07 03:13:02 2007 +0000 +++ b/pidgin/plugins/gevolution/gevolution.c Thu Jun 07 04:22:42 2007 +0000 @@ -70,7 +70,8 @@ const char *prpl_id, EContactField field) { GList *ims = e_contact_get(contact, field); - GList *l, *l2; + const GList *l; + const GList *l2; if (ims == NULL) return; @@ -401,7 +402,7 @@ GtkCellRenderer *renderer; GdkPixbuf *pixbuf; GtkListStore *model; - GList *l; + const GList *l; /* Outside container */ ret = gtk_vbox_new(FALSE, 18);
--- a/pidgin/plugins/notify.c Thu Jun 07 03:13:02 2007 +0000 +++ b/pidgin/plugins/notify.c Thu Jun 07 04:22:42 2007 +0000 @@ -624,7 +624,7 @@ static void apply_method() { - GList *convs; + const GList *convs; PidginWindow *purplewin = NULL; for (convs = purple_get_conversations(); convs != NULL; @@ -644,7 +644,7 @@ static void apply_notify() { - GList *convs = purple_get_conversations(); + const GList *convs = purple_get_conversations(); while (convs) { PurpleConversation *conv = (PurpleConversation *)convs->data; @@ -818,7 +818,7 @@ static gboolean plugin_load(PurplePlugin *plugin) { - GList *convs = purple_get_conversations(); + const GList *convs = purple_get_conversations(); void *conv_handle = purple_conversations_get_handle(); void *gtk_conv_handle = pidgin_conversations_get_handle(); @@ -860,7 +860,7 @@ static gboolean plugin_unload(PurplePlugin *plugin) { - GList *convs = purple_get_conversations(); + const GList *convs = purple_get_conversations(); while (convs) { PurpleConversation *conv = (PurpleConversation *)convs->data;
--- a/pidgin/plugins/spellchk.c Thu Jun 07 03:13:02 2007 +0000 +++ b/pidgin/plugins/spellchk.c Thu Jun 07 04:22:42 2007 +0000 @@ -2118,7 +2118,7 @@ plugin_load(PurplePlugin *plugin) { void *conv_handle = purple_conversations_get_handle(); - GList *convs; + const GList *convs; load_conf(); @@ -2137,7 +2137,7 @@ static gboolean plugin_unload(PurplePlugin *plugin) { - GList *convs; + const GList *convs; /* Detach from existing conversations */ for (convs = purple_get_conversations(); convs != NULL; convs = convs->next)
--- a/pidgin/plugins/timestamp.c Thu Jun 07 03:13:02 2007 +0000 +++ b/pidgin/plugins/timestamp.c Thu Jun 07 04:22:42 2007 +0000 @@ -77,7 +77,7 @@ time_t now = time(NULL) / interval * interval; time_t then; - if (!g_list_find(purple_get_conversations(), conv)) + if (!g_list_find((GList *)purple_get_conversations(), conv)) return FALSE; then = GPOINTER_TO_INT(purple_conversation_get_data( @@ -98,7 +98,7 @@ PidginConversation *gtk_conv = PIDGIN_CONVERSATION(conv); GtkTextBuffer *buffer; - if (!g_list_find(purple_get_conversations(), conv)) + if (!g_list_find((GList *)purple_get_conversations(), conv)) return; buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(gtk_conv->imhtml));
--- a/pidgin/plugins/xmppconsole.c Thu Jun 07 03:13:02 2007 +0000 +++ b/pidgin/plugins/xmppconsole.c Thu Jun 07 04:22:42 2007 +0000 @@ -731,7 +731,7 @@ GtkWidget *label; GtkTextBuffer *buffer; GtkWidget *toolbar; - GList *connections; + const GList *connections; #if GTK_CHECK_VERSION(2,4,0) GtkToolItem *button; #endif