/soc/2013/ankitkv/gobjectification: 42e9e59fbf0f: win32: fix bui...
Ankit Vani
a at nevitus.org
Sun Sep 29 07:25:40 EDT 2013
Changeset: 42e9e59fbf0f401bb843016ded168fb0f2c49049
Author: Ankit Vani <a at nevitus.org>
Date: 2013-09-29 16:48 +0530
Branch: soc.2013.gobjectification
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/42e9e59fbf0f
Description:
win32: fix build problems
diffstat:
libpurple/plugins/tcl/tcl_signals.c | 4 ++--
libpurple/protocols/bonjour/mdns_win32.c | 3 ++-
libpurple/protocols/irc/msgs.c | 2 +-
libpurple/protocols/jabber/auth.c | 3 ++-
libpurple/protocols/jabber/auth_cyrus.c | 3 ++-
libpurple/protocols/null/nullprpl.c | 18 ++++++++++++------
pidgin/gtkutils.c | 5 +++--
pidgin/gtkxfer.c | 5 +++--
8 files changed, 27 insertions(+), 16 deletions(-)
diffs (164 lines):
diff --git a/libpurple/plugins/tcl/tcl_signals.c b/libpurple/plugins/tcl/tcl_signals.c
--- a/libpurple/plugins/tcl/tcl_signals.c
+++ b/libpurple/plugins/tcl/tcl_signals.c
@@ -332,8 +332,8 @@ static void *tcl_signal_callback(va_list
{
/* 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);
diff --git a/libpurple/protocols/bonjour/mdns_win32.c b/libpurple/protocols/bonjour/mdns_win32.c
--- a/libpurple/protocols/bonjour/mdns_win32.c
+++ b/libpurple/protocols/bonjour/mdns_win32.c
@@ -105,7 +105,8 @@ static void
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."));
}
}
diff --git a/libpurple/protocols/irc/msgs.c b/libpurple/protocols/irc/msgs.c
--- a/libpurple/protocols/irc/msgs.c
+++ b/libpurple/protocols/irc/msgs.c
@@ -1558,7 +1558,7 @@ irc_auth_start_cyrus(struct irc_conn *ir
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);
diff --git a/libpurple/protocols/jabber/auth.c b/libpurple/protocols/jabber/auth.c
--- a/libpurple/protocols/jabber/auth.c
+++ b/libpurple/protocols/jabber/auth.c
@@ -105,7 +105,8 @@ auth_old_pass_cb(PurpleConnection *gc, P
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;
}
diff --git a/libpurple/protocols/jabber/auth_cyrus.c b/libpurple/protocols/jabber/auth_cyrus.c
--- a/libpurple/protocols/jabber/auth_cyrus.c
+++ b/libpurple/protocols/jabber/auth_cyrus.c
@@ -145,7 +145,8 @@ static void auth_pass_cb(PurpleConnectio
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;
}
diff --git a/libpurple/protocols/null/nullprpl.c b/libpurple/protocols/null/nullprpl.c
--- a/libpurple/protocols/null/nullprpl.c
+++ b/libpurple/protocols/null/nullprpl.c
@@ -318,7 +318,8 @@ static void blist_example_menu_item(Purp
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 @@ static void nullprpl_get_info(PurpleConn
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 @@ static void nullprpl_join_chat(PurpleCon
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 @@ static void nullprpl_reject_chat(PurpleC
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 @@ static void nullprpl_chat_invite(PurpleC
"%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;
diff --git a/pidgin/gtkutils.c b/pidgin/gtkutils.c
--- a/pidgin/gtkutils.c
+++ b/pidgin/gtkutils.c
@@ -3233,12 +3233,13 @@ file_open_uri(GtkWebView *webview, const
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
diff --git a/pidgin/gtkxfer.c b/pidgin/gtkxfer.c
--- a/pidgin/gtkxfer.c
+++ b/pidgin/gtkxfer.c
@@ -471,12 +471,13 @@ open_button_cb(GtkButton *button, Pidgin
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);
}
More information about the Commits
mailing list