--- a/libpurple/protocols/novell/nmconn.c Sat Nov 02 16:33:36 2019 -0400
+++ b/libpurple/protocols/novell/nmconn.c Sat Nov 02 16:40:40 2019 -0400
@@ -23,7 +23,6 @@
@@ -455,8 +454,8 @@
/* Create a request struct, add it to our queue, and return it */
- NMRequest *new_request = nm_create_request(cmd, conn->trans_id,
- time(0), cb, NULL, data);
+ NMRequest *new_request = + nm_create_request(cmd, conn->trans_id, cb, NULL, data); nm_conn_add_request_item(conn, new_request);
/* Set the out param if it was sent in, otherwise release the request */
@@ -663,21 +662,3 @@
-nm_conn_get_addr(NMConn * conn)
-nm_conn_get_port(NMConn * conn)
--- a/libpurple/protocols/novell/nmconn.h Sat Nov 02 16:33:36 2019 -0400
+++ b/libpurple/protocols/novell/nmconn.h Sat Nov 02 16:40:40 2019 -0400
@@ -45,12 +45,6 @@
/* A list of requests currently awaiting a response. */
- /* Are we connected? TRUE if so, FALSE if not. */
- /* Have we been redirected? */
@@ -218,23 +212,4 @@
NMRequest *nm_conn_find_request(NMConn * conn, int trans_id);
- * Get the server address for the connection.
- * @param conn The connection.
- * @return The server address for the connection.
-const char *nm_conn_get_addr(NMConn * conn);
- * Get the port for the connection.
- * @param conn The connection.
- * @return The port that we are connected to.
-int nm_conn_get_port(NMConn * conn);
#endif /* PURPLE_NOVELL_NMCONN_H */
--- a/libpurple/protocols/novell/nmrequest.c Sat Nov 02 16:33:36 2019 -0400
+++ b/libpurple/protocols/novell/nmrequest.c Sat Nov 02 16:40:40 2019 -0400
@@ -26,16 +26,15 @@
-NMRequest *nm_create_request(const char *cmd, int trans_id, int gmt, nm_response_cb cb,
- gpointer resp_data, gpointer user_define)
+nm_create_request(const char *cmd, int trans_id, nm_response_cb cb, + gpointer resp_data, gpointer user_define) @@ -45,7 +44,6 @@
req = g_new0(NMRequest, 1);
req->cmd = g_strdup(cmd);
req->trans_id = trans_id;
req->user_define = user_define;
@@ -141,20 +139,3 @@
-nm_request_set_ret_code(NMRequest * req, NMERR_T rc)
-nm_request_get_ret_code(NMRequest * req)
--- a/libpurple/protocols/novell/nmrequest.h Sat Nov 02 16:33:36 2019 -0400
+++ b/libpurple/protocols/novell/nmrequest.h Sat Nov 02 16:40:40 2019 -0400
@@ -30,12 +30,11 @@
* @param cmd The request command string (e.g. "login")
* @param trans_id The request transaction id
- * @param gmt The time in seconds that the request was created
* @return The new request object
-NMRequest *nm_create_request(const char *cmd, int trans_id, int gmt, nm_response_cb cb,
- gpointer resp_data, gpointer user_define);
+NMRequest *nm_create_request(const char *cmd, int trans_id, nm_response_cb cb, + gpointer resp_data, gpointer user_define); * Release a request object.
@@ -85,15 +84,6 @@
void nm_request_set_user_define(NMRequest * req, gpointer user_define);
- * Set the return code. This is the return code that we received in
- * the server response fields.
- * @param req The request object
- * @param rc The return code to set
-void nm_request_set_ret_code(NMRequest * req, NMERR_T rc);
* Get the transaction id for this request.
* @param req The request object
@@ -138,13 +128,4 @@
nm_response_cb nm_request_get_callback(NMRequest * req);
- * @param req The request object
- * @return The return code (from the response fields)
-NMERR_T nm_request_get_ret_code(NMRequest * req);
#endif /* PURPLE_NOVELL_NMREQUEST_H */
--- a/libpurple/protocols/novell/nmuser.h Sat Nov 02 16:33:36 2019 -0400
+++ b/libpurple/protocols/novell/nmuser.h Sat Nov 02 16:40:40 2019 -0400
@@ -81,9 +81,6 @@
/* Our connection information */
- /* Our public IP address */
/* This is the contact list */
@@ -110,15 +107,6 @@
- /* Pending requests. If we need to go to the server to more info
- * before processing a request we will queue it up and process when
- GSList *pending_requests;
- /* Pending events. Same as above except for events. */
- GSList *pending_events;
/* Generic pointer to data needed by the client
--- a/libpurple/protocols/novell/novell.c Sat Nov 02 16:33:36 2019 -0400
+++ b/libpurple/protocols/novell/novell.c Sat Nov 02 16:40:40 2019 -0400
@@ -1743,7 +1743,6 @@
rc = nm_send_login(user, pwd, my_addr, ua, _login_resp_cb, NULL);
- conn->connected = TRUE;
purple_ssl_input_add(gsc, novell_ssl_recv_cb, gc);
purple_connection_error(gc,