Mercurial > pidgin3 / file diff

--- a/libpurple/protocols/jabber/jabber.c	Thu Sep 19 12:26:45 2013 +0530
+++ b/libpurple/protocols/jabber/jabber.c	Sat Sep 21 16:41:50 2013 +0530
@@ -1150,7 +1150,8 @@
 				to);
 		}
 		purple_notify_info(NULL, _("Registration Successful"),
-				_("Registration Successful"), buf);
+			_("Registration Successful"), buf,
+			purple_request_cpar_from_connection(js->gc));
 		g_free(buf);
 	} else {
 		char *msg = jabber_parse_error(js, packet, NULL);
@@ -1159,7 +1160,8 @@
 			msg = g_strdup(_("Unknown Error"));
 
 		purple_notify_error(NULL, _("Registration Failed"),
-				_("Registration Failed"), msg);
+			_("Registration Failed"), msg,
+			purple_request_cpar_from_connection(js->gc));
 		g_free(msg);
 		purple_account_register_completed(account, FALSE);
 	}
@@ -1184,7 +1186,8 @@
 		buf = g_strdup_printf(_("Registration from %s successfully removed"),
 							  to);
 		purple_notify_info(NULL, _("Unregistration Successful"),
-						   _("Unregistration Successful"), buf);
+			_("Unregistration Successful"), buf,
+			purple_request_cpar_from_connection(js->gc));
 		g_free(buf);
 	} else {
 		char *msg = jabber_parse_error(js, packet, NULL);
@@ -1193,7 +1196,8 @@
 			msg = g_strdup(_("Unknown Error"));
 
 		purple_notify_error(NULL, _("Unregistration Failed"),
-							_("Unregistration Failed"), msg);
+			_("Unregistration Failed"), msg,
+			purple_request_cpar_from_connection(js->gc));
 		g_free(msg);
 	}
 	g_free(to);
@@ -1353,7 +1357,8 @@
 
 		if(js->registration) {
 			purple_notify_error(NULL, _("Already Registered"),
-								_("Already Registered"), NULL);
+				_("Already Registered"), NULL,
+				purple_request_cpar_from_connection(js->gc));
 			purple_account_register_completed(account, FALSE);
 			jabber_connection_schedule_close(js);
 			return;
@@ -1518,13 +1523,15 @@
 		char *msg = jabber_parse_error(js, packet, NULL);
 
 		purple_notify_error(js->gc, _("Error unregistering account"),
-							_("Error unregistering account"), msg);
+			_("Error unregistering account"), msg,
+			purple_request_cpar_from_connection(js->gc));
 		g_free(msg);
 		if(js->unregistration_cb)
 			js->unregistration_cb(account, FALSE, js->unregistration_user_data);
 	} else {
-		purple_notify_info(js->gc, _("Account successfully unregistered"),
-						   _("Account successfully unregistered"), NULL);
+		purple_notify_info(js->gc, _("Account successfully "
+			"unregistered"), _("Account successfully unregistered"),
+			NULL, purple_request_cpar_from_connection(js->gc));
 		if(js->unregistration_cb)
 			js->unregistration_cb(account, TRUE, js->unregistration_user_data);
 	}
@@ -1907,7 +1914,8 @@
 	if (!(js->server_caps & JABBER_CAP_BLOCKING))
 	{
 		purple_notify_error(NULL, _("Server doesn't support blocking"),
-							_("Server doesn't support blocking"), NULL);
+			_("Server doesn't support blocking"), NULL,
+			purple_request_cpar_from_connection(gc));
 		return;
 	}
 
@@ -2466,15 +2474,17 @@
                                  PurpleXmlNode *packet, gpointer data)
 {
 	if (type == JABBER_IQ_RESULT) {
-		purple_notify_info(js->gc, _("Password Changed"), _("Password Changed"),
-				_("Your password has been changed."));
+		purple_notify_info(js->gc, _("Password Changed"), _("Password "
+			"Changed"), _("Your password has been changed."),
+			purple_request_cpar_from_connection(js->gc));
 
 		purple_account_set_password(purple_connection_get_account(js->gc), (const char *)data, NULL, NULL);
 	} else {
 		char *msg = jabber_parse_error(js, packet, NULL);
 
 		purple_notify_error(js->gc, _("Error changing password"),
-				_("Error changing password"), msg);
+			_("Error changing password"), msg,
+			purple_request_cpar_from_connection(js->gc));
 		g_free(msg);
 	}
 
@@ -2492,7 +2502,9 @@
 	p2 = purple_request_fields_get_string(fields, "password2");
 
 	if(strcmp(p1, p2)) {
-		purple_notify_error(js->gc, NULL, _("New passwords do not match."), NULL);
+		purple_notify_error(js->gc, NULL,
+			_("New passwords do not match."), NULL,
+			purple_request_cpar_from_connection(js->gc));
 		return;
 	}
 
@@ -3305,7 +3317,8 @@
 		}
 
 		purple_notify_error(account, _("Media Initiation Failed"),
-				_("Media Initiation Failed"), msg);
+			_("Media Initiation Failed"), msg,
+			purple_request_cpar_from_connection(gc));
 		g_free(msg);
 		g_free(resource);
 		return FALSE;