changeset
win32: fix build problems
Sun, 29 Sep 2013 16:48:49 +0530
- author
- Ankit Vani <a@nevitus.org>
- date
- Sun, 29 Sep 2013 16:48:49 +0530
- branch
- soc.2013.gobjectification
- changeset 34977
- 42e9e59fbf0f
- parent 34976
- fa4d47377827
- child 34978
- 08260d94d8dd
win32: fix build problems
--- a/libpurple/plugins/tcl/tcl_signals.c Sun Sep 29 16:33:41 2013 +0530 +++ b/libpurple/plugins/tcl/tcl_signals.c Sun Sep 29 16:48:49 2013 +0530 @@ -332,8 +332,8 @@ { /* What? I guess just pass the word ... */ /* treat this as a pointer, but complain first */ - purple_debug(PURPLE_DEBUG_ERROR, "tcl", "unknown GType %lu\n", - handler->argtypes[i]); + purple_debug(PURPLE_DEBUG_ERROR, "tcl", "unknown type %s\n", + g_type_name(handler->argtypes[i])); } } Tcl_ListObjAppendElement(handler->interp, cmd, arg);
--- a/libpurple/protocols/bonjour/mdns_win32.c Sun Sep 29 16:33:41 2013 +0530 +++ b/libpurple/protocols/bonjour/mdns_win32.c Sun Sep 29 16:48:49 2013 +0530 @@ -105,7 +105,8 @@ purple_debug_error("bonjour", "Error (%d) handling mDNS response.\n", errorCode); /* This happens when the mDNSResponder goes down, I haven't seen it happen any other time (in my limited testing) */ if (errorCode == kDNSServiceErr_Unknown) { - purple_connection_error(srh->account->gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, + purple_connection_error(purple_account_get_connection(srh->account), + PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("Error communicating with local mDNSResponder.")); } }
--- a/libpurple/protocols/irc/msgs.c Sun Sep 29 16:33:41 2013 +0530 +++ b/libpurple/protocols/irc/msgs.c Sun Sep 29 16:48:49 2013 +0530 @@ -1558,7 +1558,7 @@ return; } - sasl_setprop(irc->sasl_conn, SASL_AUTH_EXTERNAL, irc->account->username); + sasl_setprop(irc->sasl_conn, SASL_AUTH_EXTERNAL, purple_account_get_username(irc->account)); sasl_setprop(irc->sasl_conn, SASL_SEC_PROPS, &secprops); ret = sasl_client_start(irc->sasl_conn, irc->sasl_mechs->str, NULL, NULL, NULL, &irc->current_mech);
--- a/libpurple/protocols/jabber/auth.c Sun Sep 29 16:33:41 2013 +0530 +++ b/libpurple/protocols/jabber/auth.c Sun Sep 29 16:48:49 2013 +0530 @@ -105,7 +105,8 @@ if (!entry || !*entry) { - purple_notify_error(account, NULL, _("Password is required to sign on."), NULL); + purple_notify_error(account, NULL, _("Password is required to sign on."), NULL, + purple_request_cpar_from_account(account)); return; }
--- a/libpurple/protocols/jabber/auth_cyrus.c Sun Sep 29 16:33:41 2013 +0530 +++ b/libpurple/protocols/jabber/auth_cyrus.c Sun Sep 29 16:48:49 2013 +0530 @@ -145,7 +145,8 @@ if (!entry || !*entry) { - purple_notify_error(account, NULL, _("Password is required to sign on."), NULL); + purple_notify_error(account, NULL, _("Password is required to sign on."), NULL, + purple_request_cpar_from_account(account)); return; }
--- a/libpurple/protocols/null/nullprpl.c Sun Sep 29 16:33:41 2013 +0530 +++ b/libpurple/protocols/null/nullprpl.c Sun Sep 29 16:48:49 2013 +0530 @@ -318,7 +318,8 @@ purple_notify_info(NULL, /* plugin handle or PurpleConnection */ _("Primary title"), _("Secondary title"), - _("This is the callback for the nullprpl menu item.")); + _("This is the callback for the nullprpl menu item."), + NULL); } static GList *nullprpl_blist_node_menu(PurpleBlistNode *node) { @@ -504,13 +505,15 @@ purple_debug_info("nullprpl", "Fetching %s's user info for %s\n", username, purple_account_get_username(purple_connection_get_account(gc))); + acct = purple_accounts_find(username, NULLPRPL_ID); + if (!get_nullprpl_gc(username)) { char *msg = g_strdup_printf(_("%s is not logged in."), username); - purple_notify_error(gc, _("User Info"), _("User info not available. "), msg); + purple_notify_error(gc, _("User Info"), _("User info not available. "), msg, + purple_request_cpar_from_account(acct)); g_free(msg); } - acct = purple_accounts_find(username, NULLPRPL_ID); if (acct) body = purple_account_get_user_info(acct); else @@ -686,7 +689,8 @@ room); purple_debug_info("nullprpl", "%s is already in chat room %s\n", username, room); - purple_notify_info(gc, _("Join chat"), _("Join chat"), tmp); + purple_notify_info(gc, _("Join chat"), _("Join chat"), tmp, + purple_request_cpar_from_connection(gc)); g_free(tmp); } } @@ -709,7 +713,8 @@ purple_notify_info(invited_by_gc, _("Chat invitation rejected"), _("Chat invitation rejected"), - message); + message, + purple_request_cpar_from_connection(gc)); g_free(message); } @@ -737,7 +742,8 @@ "%s is already in chat room %s; " "ignoring invitation from %s\n", who, room, username); - purple_notify_info(gc, _("Chat invitation"), _("Chat invitation"), tmp); + purple_notify_info(gc, _("Chat invitation"), _("Chat invitation"), tmp, + purple_request_cpar_from_conversation(PURPLE_CONVERSATION(to_conv))); g_free(tmp); } else { GHashTable *components;
--- a/pidgin/gtkutils.c Sun Sep 29 16:33:41 2013 +0530 +++ b/pidgin/gtkutils.c Sun Sep 29 16:48:49 2013 +0530 @@ -3233,12 +3233,13 @@ if (code == SE_ERR_ASSOCINCOMPLETE || code == SE_ERR_NOASSOC) { purple_notify_error(webview, NULL, - _("There is no application configured to open this type of file."), NULL); + _("There is no application configured to open this type of file."), + NULL, NULL); } else if (code < 32) { purple_notify_error(webview, NULL, - _("An error occurred while opening the file."), NULL); + _("An error occurred while opening the file."), NULL, NULL); purple_debug_warning("gtkutils", "filename: %s; code: %d\n", uri, code); } #else
--- a/pidgin/gtkxfer.c Sun Sep 29 16:33:41 2013 +0530 +++ b/pidgin/gtkxfer.c Sun Sep 29 16:48:49 2013 +0530 @@ -471,12 +471,13 @@ if (code == SE_ERR_ASSOCINCOMPLETE || code == SE_ERR_NOASSOC) { purple_notify_error(dialog, NULL, - _("There is no application configured to open this type of file."), NULL); + _("There is no application configured to open this type of file."), + NULL, NULL); } else if (code < 32) { purple_notify_error(dialog, NULL, - _("An error occurred while opening the file."), NULL); + _("An error occurred while opening the file."), NULL, NULL); purple_debug_warning("ft", "filename: %s; code: %d\n", purple_xfer_get_local_filename(dialog->selected_xfer), code); }
