Mercurial > pidgin3 / file diff

--- a/libpurple/protocols/novell/novell.c	Wed Sep 18 18:24:28 2013 +0200
+++ b/libpurple/protocols/novell/novell.c	Sat Sep 21 11:54:03 2013 +0200
@@ -256,7 +256,8 @@
 										  " Could not get details for user (%s)."),
 						    nm_error_to_string (ret_code));
 
-			purple_notify_error(gc, NULL, err, NULL);
+			purple_notify_error(gc, NULL, err, NULL,
+				purple_request_cpar_from_connection(gc));
 			g_free(err);
 		}
 
@@ -403,7 +404,8 @@
 		err =
 			g_strdup_printf(_("Unable to add %s to your buddy list (%s)."),
 					name, nm_error_to_string (ret_code));
-		purple_notify_error(gc, NULL, err, NULL);
+		purple_notify_error(gc, NULL, err, NULL,
+			purple_request_cpar_from_connection(gc));
 		g_free(err);
 
 	}
@@ -429,7 +431,8 @@
 		/* TODO: Improve this! message to who or for what conference? */
 		err = g_strdup_printf(_("Unable to send message (%s)."),
 				      nm_error_to_string (ret_code));
-		purple_notify_error(gc, NULL, err, NULL);
+		purple_notify_error(gc, NULL, err, NULL,
+			purple_request_cpar_from_connection(gc));
 		g_free(err);
 	}
 }
@@ -499,7 +502,8 @@
 	if (ret_code != NM_OK) {
 		gc = purple_account_get_connection(user->client_data);
 		err = g_strdup_printf(_("Unable to invite user (%s)."), nm_error_to_string(ret_code));
-		purple_notify_error(gc, NULL, err, NULL);
+		purple_notify_error(gc, NULL, err, NULL,
+			purple_request_cpar_from_connection(gc));
 		g_free(err);
 
 		purple_debug(PURPLE_DEBUG_INFO, "novell",
@@ -546,7 +550,8 @@
 										" Could not create the conference (%s)."),
 						      nm_error_to_string (ret_code));
 
-			purple_notify_error(gc, NULL, err, NULL);
+			purple_notify_error(gc, NULL, err, NULL,
+				purple_request_cpar_from_connection(gc));
 			g_free(err);
 		}
 
@@ -596,7 +601,8 @@
 					    folder_name,
 					    nm_error_to_string (ret_code));
 
-		purple_notify_error(gc, NULL, err, NULL);
+		purple_notify_error(gc, NULL, err, NULL,
+			purple_request_cpar_from_connection(gc));
 		g_free(err);
 	}
 
@@ -641,7 +647,8 @@
 					  " Error creating folder in server side list (%s)."),
 					name, nm_error_to_string (ret_code));
 
-		purple_notify_error(gc, NULL, err, NULL);
+		purple_notify_error(gc, NULL, err, NULL,
+			purple_request_cpar_from_connection(gc));
 
 		nm_release_contact(contact);
 		g_free(err);
@@ -712,7 +719,8 @@
 		err =
 			g_strdup_printf(_("Could not get details for user %s (%s)."),
 					name, nm_error_to_string (ret_code));
-		purple_notify_error(gc, NULL, err, NULL);
+		purple_notify_error(gc, NULL, err, NULL,
+			purple_request_cpar_from_connection(gc));
 		g_free(err);
 	}
 
@@ -758,7 +766,8 @@
 
 		err = g_strdup_printf(_("Unable to add user to privacy list (%s)."),
 							  nm_error_to_string(ret_code));
-		purple_notify_error(gc, NULL, err, NULL);
+		purple_notify_error(gc, NULL, err, NULL,
+			purple_request_cpar_from_connection(gc));
 		g_free(err);
 
 	}
@@ -805,7 +814,8 @@
 
 		err = g_strdup_printf(_("Unable to add %s to deny list (%s)."),
 							  who, nm_error_to_string(ret_code));
-		purple_notify_error(gc, NULL, err, NULL);
+		purple_notify_error(gc, NULL, err, NULL,
+			purple_request_cpar_from_connection(gc));
 		g_free(err);
 
 	}
@@ -858,7 +868,8 @@
 
 		err = g_strdup_printf(_("Unable to add %s to permit list (%s)."), who,
 							  nm_error_to_string(ret_code));
-		purple_notify_error(gc, NULL, err, NULL);
+		purple_notify_error(gc, NULL, err, NULL,
+			purple_request_cpar_from_connection(gc));
 		g_free(err);
 
 	}
@@ -904,7 +915,8 @@
 
 		err = g_strdup_printf(_("Unable to add user to privacy list (%s)."),
 							  nm_error_to_string(ret_code));
-		purple_notify_error(gc, NULL, err, NULL);
+		purple_notify_error(gc, NULL, err, NULL,
+			purple_request_cpar_from_connection(gc));
 		g_free(err);
 
 	}
@@ -926,7 +938,8 @@
 		gc = purple_account_get_connection(user->client_data);
 		err = g_strdup_printf(_("Unable to remove %s from privacy list (%s)."), who,
 							  nm_error_to_string(ret_code));
-		purple_notify_error(gc, NULL, err, NULL);
+		purple_notify_error(gc, NULL, err, NULL,
+			purple_request_cpar_from_connection(gc));
 		g_free(err);
 	}
 
@@ -949,7 +962,8 @@
 		gc = purple_account_get_connection(user->client_data);
 		err = g_strdup_printf(_("Unable to change server side privacy settings (%s)."),
 							  nm_error_to_string(ret_code));
-		purple_notify_error(gc, NULL, err, NULL);
+		purple_notify_error(gc, NULL, err, NULL,
+			purple_request_cpar_from_connection(gc));
 		g_free(err);
 
 	}
@@ -991,7 +1005,8 @@
 	} else {
 
 		err = g_strdup_printf(_("Unable to invite user (%s)."), nm_error_to_string(ret_code));
-		purple_notify_error(gc, NULL, err, NULL);
+		purple_notify_error(gc, NULL, err, NULL,
+			purple_request_cpar_from_connection(gc));
 		g_free(err);
 
 	}
@@ -1019,7 +1034,8 @@
 	} else {
 		err = g_strdup_printf(_("Unable to create conference (%s)."), nm_error_to_string(ret_code));
 		gc = purple_account_get_connection(user->client_data);
-		purple_notify_error(gc, NULL, err, NULL);
+		purple_notify_error(gc, NULL, err, NULL,
+			purple_request_cpar_from_connection(gc));
 		g_free(err);
 	}
 }
@@ -1664,7 +1680,8 @@
 
 	err = g_strdup_printf(_("Unable to change server side privacy settings (%s)."),
 						  nm_error_to_string(NMERR_ADMIN_LOCKED));
-	purple_notify_error(gc, NULL, err, NULL);
+	purple_notify_error(gc, NULL, err, NULL,
+		purple_request_cpar_from_connection(gc));
 	g_free(err);
 }