Mercurial > pidgin
changeset 8684:046dd8ef2920
[gaim-migrate @ 9437]
Excess whitespace bad, especially *that* much.
committer: Tailor Script <tailor@pidgin.im>
| author | Christian Hammond <chipx86@chipx86.com> |
|---|---|
| date | Sat, 17 Apr 2004 18:29:20 +0000 |
| parents | 76935eb1bd40 |
| children | 2ac2f4cf1de5 |
| files | src/protocols/novell/nmconference.c src/protocols/novell/nmconference.h src/protocols/novell/nmconn.c src/protocols/novell/nmconn.h src/protocols/novell/nmcontact.c src/protocols/novell/nmcontact.h src/protocols/novell/nmevent.c src/protocols/novell/nmevent.h src/protocols/novell/nmfield.c src/protocols/novell/nmfield.h src/protocols/novell/nmmessage.c src/protocols/novell/nmmessage.h src/protocols/novell/nmrequest.c src/protocols/novell/nmrequest.h src/protocols/novell/nmuser.c src/protocols/novell/nmuser.h src/protocols/novell/nmuserrecord.c src/protocols/novell/nmuserrecord.h src/protocols/novell/novell.c |
| diffstat | 19 files changed, 174 insertions(+), 174 deletions(-) [+] |
line wrap: on
line diff
--- a/src/protocols/novell/nmconference.c Sat Apr 17 18:28:30 2004 +0000 +++ b/src/protocols/novell/nmconference.c Sat Apr 17 18:29:20 2004 +0000 @@ -9,7 +9,7 @@ * RECAST, TRANSFORMED OR ADAPTED WITHOUT THE PRIOR WRITTEN CONSENT OF NOVELL, * INC. ANY USE OR EXPLOITATION OF THIS WORK WITHOUT AUTHORIZATION COULD SUBJECT * THE PERPETRATOR TO CRIMINAL AND CIVIL LIABILITY. - * + * * AS BETWEEN [GAIM] AND NOVELL, NOVELL GRANTS [GAIM] THE RIGHT TO REPUBLISH * THIS WORK UNDER THE GPL (GNU GENERAL PUBLIC LICENSE) WITH ALL RIGHTS AND * LICENSES THEREUNDER. IF YOU HAVE RECEIVED THIS WORK DIRECTLY OR INDIRECTLY
--- a/src/protocols/novell/nmconference.h Sat Apr 17 18:28:30 2004 +0000 +++ b/src/protocols/novell/nmconference.h Sat Apr 17 18:29:20 2004 +0000 @@ -9,7 +9,7 @@ * RECAST, TRANSFORMED OR ADAPTED WITHOUT THE PRIOR WRITTEN CONSENT OF NOVELL, * INC. ANY USE OR EXPLOITATION OF THIS WORK WITHOUT AUTHORIZATION COULD SUBJECT * THE PERPETRATOR TO CRIMINAL AND CIVIL LIABILITY. - * + * * AS BETWEEN [GAIM] AND NOVELL, NOVELL GRANTS [GAIM] THE RIGHT TO REPUBLISH * THIS WORK UNDER THE GPL (GNU GENERAL PUBLIC LICENSE) WITH ALL RIGHTS AND * LICENSES THEREUNDER. IF YOU HAVE RECEIVED THIS WORK DIRECTLY OR INDIRECTLY @@ -51,7 +51,7 @@ /** * Increments the reference count for the conference. * - * The reference to the conference should be released + * The reference to the conference should be released * by calling nm_release_conference * * @param conference The conference to reference @@ -59,7 +59,7 @@ void nm_conference_add_ref(NMConference * conference); /** - * Releases the resources associated with the conference + * Releases the resources associated with the conference * if there are no more references to it, otherwise just * decrements the reference count. * @@ -69,7 +69,7 @@ void nm_release_conference(NMConference * conf); /** - * Set the GUID for the conference. + * Set the GUID for the conference. * * @param conference The conference * @param guid The new conference GUID @@ -78,7 +78,7 @@ void nm_conference_set_guid(NMConference * conference, const char *guid); /** - * Return the GUID for the conference. + * Return the GUID for the conference. * * @param conference The conference * @@ -92,7 +92,7 @@ * @param conference The conference * @param user_record The user record to add as a participant * - * @return + * @return */ void nm_conference_add_participant(NMConference * conference, NMUserRecord * user_record); @@ -132,7 +132,7 @@ * * @param conference The conference * - * @return TRUE if the conference has been instantiated, + * @return TRUE if the conference has been instantiated, * FALSE otherwise. * */
--- a/src/protocols/novell/nmconn.c Sat Apr 17 18:28:30 2004 +0000 +++ b/src/protocols/novell/nmconn.c Sat Apr 17 18:29:20 2004 +0000 @@ -9,7 +9,7 @@ * RECAST, TRANSFORMED OR ADAPTED WITHOUT THE PRIOR WRITTEN CONSENT OF NOVELL, * INC. ANY USE OR EXPLOITATION OF THIS WORK WITHOUT AUTHORIZATION COULD SUBJECT * THE PERPETRATOR TO CRIMINAL AND CIVIL LIABILITY. - * + * * AS BETWEEN [GAIM] AND NOVELL, NOVELL GRANTS [GAIM] THE RIGHT TO REPUBLISH * THIS WORK UNDER THE GPL (GNU GENERAL PUBLIC LICENSE) WITH ALL RIGHTS AND * LICENSES THEREUNDER. IF YOU HAVE RECEIVED THIS WORK DIRECTLY OR INDIRECTLY @@ -95,10 +95,10 @@ } else { *q = '%'; q++; - + *q = hex_table[ch >> 4]; q++; - + *q = hex_table[ch & 15]; q++; } @@ -166,7 +166,7 @@ str = "0"; break; } - + return str; } @@ -283,7 +283,7 @@ switch (field->type) { case NMFIELD_TYPE_UTF8: case NMFIELD_TYPE_DN: - + value = url_escape_string((char *) field->value); bytes_to_send = g_snprintf(buffer, sizeof(buffer), "&val=%s", value); @@ -291,14 +291,14 @@ if (ret < 0) { rc = NMERR_TCP_WRITE; } - + g_free(value); - + break; - + case NMFIELD_TYPE_ARRAY: case NMFIELD_TYPE_MV: - + val = nm_count_fields((NMField *) field->value); bytes_to_send = g_snprintf(buffer, sizeof(buffer), "&val=%u", val); @@ -306,22 +306,22 @@ if (ret < 0) { rc = NMERR_TCP_WRITE; } - + break; - + default: - + bytes_to_send = g_snprintf(buffer, sizeof(buffer), "&val=%u", field->value); ret = nm_tcp_write(conn, buffer, bytes_to_send); if (ret < 0) { rc = NMERR_TCP_WRITE; } - + break; } } - + /* Write the field type */ if (rc == NM_OK) { bytes_to_send = g_snprintf(buffer, sizeof(buffer), @@ -389,7 +389,7 @@ request = nm_copy_field_array(fields); if (request) { char *str = g_strdup_printf("%d", ++(conn->trans_id)); - + request = nm_add_field(request, NM_A_SZ_TRANSACTION_ID, 0, NMFIELD_METHOD_VALID, 0, (guint32) str, NMFIELD_TYPE_UTF8); @@ -450,7 +450,7 @@ ptr++; } rtn_buf[i] = '\0'; - + if (i > 0) rtn_code = atoi(rtn_buf); }
--- a/src/protocols/novell/nmconn.h Sat Apr 17 18:28:30 2004 +0000 +++ b/src/protocols/novell/nmconn.h Sat Apr 17 18:29:20 2004 +0000 @@ -9,7 +9,7 @@ * RECAST, TRANSFORMED OR ADAPTED WITHOUT THE PRIOR WRITTEN CONSENT OF NOVELL, * INC. ANY USE OR EXPLOITATION OF THIS WORK WITHOUT AUTHORIZATION COULD SUBJECT * THE PERPETRATOR TO CRIMINAL AND CIVIL LIABILITY. - * + * * AS BETWEEN [GAIM] AND NOVELL, NOVELL GRANTS [GAIM] THE RIGHT TO REPUBLISH * THIS WORK UNDER THE GPL (GNU GENERAL PUBLIC LICENSE) WITH ALL RIGHTS AND * LICENSES THEREUNDER. IF YOU HAVE RECEIVED THIS WORK DIRECTLY OR INDIRECTLY
--- a/src/protocols/novell/nmcontact.c Sat Apr 17 18:28:30 2004 +0000 +++ b/src/protocols/novell/nmcontact.c Sat Apr 17 18:29:20 2004 +0000 @@ -9,7 +9,7 @@ * RECAST, TRANSFORMED OR ADAPTED WITHOUT THE PRIOR WRITTEN CONSENT OF NOVELL, * INC. ANY USE OR EXPLOITATION OF THIS WORK WITHOUT AUTHORIZATION COULD SUBJECT * THE PERPETRATOR TO CRIMINAL AND CIVIL LIABILITY. - * + * * AS BETWEEN [GAIM] AND NOVELL, NOVELL GRANTS [GAIM] THE RIGHT TO REPUBLISH * THIS WORK UNDER THE GPL (GNU GENERAL PUBLIC LICENSE) WITH ALL RIGHTS AND * LICENSES THEREUNDER. IF YOU HAVE RECEIVED THIS WORK DIRECTLY OR INDIRECTLY @@ -56,7 +56,7 @@ static void _add_folders(NMFolder * root, NMField * fields); /********************************************************************* - * Contact API + * Contact API *********************************************************************/ NMContact * @@ -73,8 +73,8 @@ } /* - * This creates a contact for the contact list. The - * field array that is passed in should be a + * This creates a contact for the contact list. The + * field array that is passed in should be a * NM_A_FA_CONTACT array. * */ @@ -108,7 +108,7 @@ if ((field = nm_locate_field(NM_A_SZ_SEQUENCE_NUMBER, (NMField *) fields->value))) { - + if (field->value) contact->seq = atoi((char *) field->value); @@ -116,7 +116,7 @@ if ((field = nm_locate_field(NM_A_SZ_DISPLAY_NAME, (NMField *) fields->value))) { - + if (field->value) contact->display_name = g_strdup((char *) field->value); @@ -141,14 +141,14 @@ return; if ((field = nm_locate_field(NM_A_SZ_OBJECT_ID, (NMField *) fields->value))) { - + if (field->value) contact->id = atoi((char *)field->value); } if ((field = nm_locate_field(NM_A_SZ_PARENT_ID, (NMField *) fields->value))) { - + if (field->value) contact->parent_id = atoi((char *) field->value); @@ -164,7 +164,7 @@ if ((field = nm_locate_field(NM_A_SZ_DISPLAY_NAME, (NMField *) fields->value))) { - + if (field->value) { if (contact->display_name) g_free(contact->display_name); @@ -179,7 +179,7 @@ if (field->value) { if (contact->dn) g_free(contact->dn); - + contact->dn = g_strdup((char *) field->value); } @@ -284,7 +284,7 @@ } else { /* If auth attribute is set use it */ - if (nm_user_record_get_auth_attr(contact->user_record) && + if (nm_user_record_get_auth_attr(contact->user_record) && display_id != NULL) { contact->display_name = g_strdup(display_id); @@ -320,7 +320,7 @@ g_free(contact->display_name); contact->display_name = NULL; } - + if (display_name) contact->display_name = g_strdup(display_name); } @@ -444,7 +444,7 @@ /********************************************************************* - * Folder API + * Folder API *********************************************************************/ NMFolder * @@ -472,14 +472,14 @@ folder = g_new0(NMFolder, 1); if ((field = nm_locate_field(NM_A_SZ_OBJECT_ID, (NMField *) fields->value))) { - + if (field->value) folder->id = atoi((char *) field->value); } if ((field = nm_locate_field(NM_A_SZ_SEQUENCE_NUMBER, (NMField *) fields->value))) { - + if (field->value) folder->seq = atoi((char *) field->value); } @@ -537,7 +537,7 @@ return; if ((field = nm_locate_field(NM_A_SZ_OBJECT_ID, (NMField *) fields->value))) { - + if (field->value) folder->id = atoi((char *) field->value); @@ -545,7 +545,7 @@ if ((field = nm_locate_field(NM_A_SZ_SEQUENCE_NUMBER, (NMField *) fields->value))) { - + if (field->value) folder->seq = atoi((char *) field->value); @@ -557,7 +557,7 @@ if (field->value) { if (folder->name) g_free(folder->name); - + folder->name = g_strdup((char *) field->value); } @@ -721,7 +721,7 @@ { GSList *node = NULL; NMFolder *folder = root_folder; - + if (folder == NULL || contact == NULL) return; @@ -843,7 +843,7 @@ { int cnt, i; NMContact *tmp, *contact = NULL; - + if (folder == NULL || dn == NULL) return NULL; @@ -885,7 +885,7 @@ { GSList *fnode; NMFolder *subfolder; - + if (folder == NULL) return;
--- a/src/protocols/novell/nmcontact.h Sat Apr 17 18:28:30 2004 +0000 +++ b/src/protocols/novell/nmcontact.h Sat Apr 17 18:29:20 2004 +0000 @@ -9,7 +9,7 @@ * RECAST, TRANSFORMED OR ADAPTED WITHOUT THE PRIOR WRITTEN CONSENT OF NOVELL, * INC. ANY USE OR EXPLOITATION OF THIS WORK WITHOUT AUTHORIZATION COULD SUBJECT * THE PERPETRATOR TO CRIMINAL AND CIVIL LIABILITY. - * + * * AS BETWEEN [GAIM] AND NOVELL, NOVELL GRANTS [GAIM] THE RIGHT TO REPUBLISH * THIS WORK UNDER THE GPL (GNU GENERAL PUBLIC LICENSE) WITH ALL RIGHTS AND * LICENSES THEREUNDER. IF YOU HAVE RECEIVED THIS WORK DIRECTLY OR INDIRECTLY @@ -46,7 +46,7 @@ * Creates a contact from a field array representing the * contact * - * Should be released by calling nm_release_contact + * Should be released by calling nm_release_contact * * @param fields Should be the NM_A_FA_CONTACT for * the contact @@ -60,7 +60,7 @@ * Add a reference to an existing contact * * The reference should be released by calling - * nm_release_contact + * nm_release_contact * * @param contact The contact * @@ -105,7 +105,7 @@ /** * Set the display name for a contact. This is called - * by nm_send_rename_contact. It should not be called + * by nm_send_rename_contact. It should not be called * directly (it does not change the display name on the * server side list -- nm_send_rename_conact does). * @@ -210,7 +210,7 @@ void nm_contact_set_data(NMContact * contact, gpointer data); /** - * Create a folder with the given name + * Create a folder with the given name * * @param name The name of the folder * @@ -292,7 +292,7 @@ /** * Set the name of a folder. Do not call this directly. * It does not change the name of the folder in the - * server side contact list. You must call + * server side contact list. You must call * nm_send_set_folder_name(). * * @param folder The folder @@ -317,7 +317,7 @@ * @param user The logged in user * @param root The root folder * @param fields The contact list field array - * + * */ void nm_folder_add_contacts_and_folders(NMUser * user, NMFolder * root, NMField * fields);
--- a/src/protocols/novell/nmevent.c Sat Apr 17 18:28:30 2004 +0000 +++ b/src/protocols/novell/nmevent.c Sat Apr 17 18:29:20 2004 +0000 @@ -9,7 +9,7 @@ * RECAST, TRANSFORMED OR ADAPTED WITHOUT THE PRIOR WRITTEN CONSENT OF NOVELL, * INC. ANY USE OR EXPLOITATION OF THIS WORK WITHOUT AUTHORIZATION COULD SUBJECT * THE PERPETRATOR TO CRIMINAL AND CIVIL LIABILITY. - * + * * AS BETWEEN [GAIM] AND NOVELL, NOVELL GRANTS [GAIM] THE RIGHT TO REPUBLISH * THIS WORK UNDER THE GPL (GNU GENERAL PUBLIC LICENSE) WITH ALL RIGHTS AND * LICENSES THEREUNDER. IF YOU HAVE RECEIVED THIS WORK DIRECTLY OR INDIRECTLY @@ -132,7 +132,7 @@ if (ret_val == NM_OK) { if (event && user_record) { - /* Add the user record to the event structure + /* Add the user record to the event structure * and make the callback. */ nm_event_set_user_record(event, user_record); @@ -175,7 +175,7 @@ /* Add source of event as recip of the conference */ nm_conference_add_participant(conference, user_record); - /* Add the user record to the event structure + /* Add the user record to the event structure * and make the callback. */ nm_event_set_user_record(event, user_record); @@ -469,7 +469,7 @@ } /* Read the conference left event, set up the event object, and - * remove the conference from the list if there are no more + * remove the conference from the list if there are no more * participants */ static NMERR_T @@ -500,12 +500,12 @@ if (conference) { nm_event_set_conference(event, conference); nm_conference_set_flags(conference, flags); - + nm_conference_remove_participant(conference, nm_event_get_source(event)); if (nm_conference_get_participant_count(conference) == 0) { nm_conference_list_remove(user, conference); } - + } else { rc = NMERR_CONFERENCE_NOT_FOUND; } @@ -585,22 +585,22 @@ conference = nm_conference_list_find(user, guid); if (conference) { nm_conference_set_flags(conference, flags); - + nm_event_set_conference(event, conference); - + /* Add the new user to the participants list */ user_record = nm_find_user_record(user, nm_event_get_source(event)); if (user_record) { nm_conference_add_participant(conference, user_record); } else { - + /* Need to go to the server to get details for the user */ rc = nm_send_get_details(user, nm_event_get_source(event), _got_user_for_conference, event); if (rc == NM_OK) rc = -1; /* Not done processing the event yet! */ } - + } else { rc = NMERR_CONFERENCE_NOT_FOUND; }
--- a/src/protocols/novell/nmevent.h Sat Apr 17 18:28:30 2004 +0000 +++ b/src/protocols/novell/nmevent.h Sat Apr 17 18:29:20 2004 +0000 @@ -9,7 +9,7 @@ * RECAST, TRANSFORMED OR ADAPTED WITHOUT THE PRIOR WRITTEN CONSENT OF NOVELL, * INC. ANY USE OR EXPLOITATION OF THIS WORK WITHOUT AUTHORIZATION COULD SUBJECT * THE PERPETRATOR TO CRIMINAL AND CIVIL LIABILITY. - * + * * AS BETWEEN [GAIM] AND NOVELL, NOVELL GRANTS [GAIM] THE RIGHT TO REPUBLISH * THIS WORK UNDER THE GPL (GNU GENERAL PUBLIC LICENSE) WITH ALL RIGHTS AND * LICENSES THEREUNDER. IF YOU HAVE RECEIVED THIS WORK DIRECTLY OR INDIRECTLY @@ -28,7 +28,7 @@ #include "nmuser.h" /** - * Defines for the event types + * Defines for the event types */ #define NMEVT_INVALID_RECIPIENT 101 #define NMEVT_UNDELIVERABLE_STATUS 102 @@ -115,7 +115,7 @@ void nm_event_set_user_record(NMEvent * event, NMUserRecord * user_record); /** - * Returns the NMUserRecord object associated with the given event. + * Returns the NMUserRecord object associated with the given event. * The user record represents the event source. This should not * be released. If it needs to be kept around call * nm_user_record_add_ref(). @@ -173,7 +173,7 @@ * @param event The event. * * @return The timestamp for the event. This is the number of - * seconds since 1/1/1970 (as returned by the time() + * seconds since 1/1/1970 (as returned by the time() * system call). */ guint32 nm_event_get_gmt(NMEvent * event);
--- a/src/protocols/novell/nmfield.c Sat Apr 17 18:28:30 2004 +0000 +++ b/src/protocols/novell/nmfield.c Sat Apr 17 18:29:20 2004 +0000 @@ -9,7 +9,7 @@ * OR ADAPTED WITHOUT THE PRIOR WRITTEN CONSENT OF NOVELL, INC. ANY USE OR * EXPLOITATION OF THIS WORK WITHOUT AUTHORIZATION COULD SUBJECT THE PERPETRATOR * TO CRIMINAL AND CIVIL LIABILITY. - * + * * AS BETWEEN [GAIM] AND NOVELL, NOVELL GRANTS [GAIM] THE RIGHT TO REPUBLISH THIS * WORK UNDER THE GPL (GNU GENERAL PUBLIC LICENSE) WITH ALL RIGHTS AND LICENSES * THEREUNDER. IF YOU HAVE RECEIVED THIS WORK DIRECTLY OR INDIRECTLY FROM [GAIM]
--- a/src/protocols/novell/nmfield.h Sat Apr 17 18:28:30 2004 +0000 +++ b/src/protocols/novell/nmfield.h Sat Apr 17 18:29:20 2004 +0000 @@ -9,7 +9,7 @@ * RECAST, TRANSFORMED OR ADAPTED WITHOUT THE PRIOR WRITTEN CONSENT OF NOVELL, * INC. ANY USE OR EXPLOITATION OF THIS WORK WITHOUT AUTHORIZATION COULD SUBJECT * THE PERPETRATOR TO CRIMINAL AND CIVIL LIABILITY. - * + * * AS BETWEEN [GAIM] AND NOVELL, NOVELL GRANTS [GAIM] THE RIGHT TO REPUBLISH * THIS WORK UNDER THE GPL (GNU GENERAL PUBLIC LICENSE) WITH ALL RIGHTS AND * LICENSES THEREUNDER. IF YOU HAVE RECEIVED THIS WORK DIRECTLY OR INDIRECTLY @@ -127,7 +127,7 @@ #define NM_FIELD_FALSE "0" /** - * Count the number of fields + * Count the number of fields * * @param fields Field array *
--- a/src/protocols/novell/nmmessage.c Sat Apr 17 18:28:30 2004 +0000 +++ b/src/protocols/novell/nmmessage.c Sat Apr 17 18:29:20 2004 +0000 @@ -9,7 +9,7 @@ * RECAST, TRANSFORMED OR ADAPTED WITHOUT THE PRIOR WRITTEN CONSENT OF NOVELL, * INC. ANY USE OR EXPLOITATION OF THIS WORK WITHOUT AUTHORIZATION COULD SUBJECT * THE PERPETRATOR TO CRIMINAL AND CIVIL LIABILITY. - * + * * AS BETWEEN [GAIM] AND NOVELL, NOVELL GRANTS [GAIM] THE RIGHT TO REPUBLISH * THIS WORK UNDER THE GPL (GNU GENERAL PUBLIC LICENSE) WITH ALL RIGHTS AND * LICENSES THEREUNDER. IF YOU HAVE RECEIVED THIS WORK DIRECTLY OR INDIRECTLY
--- a/src/protocols/novell/nmmessage.h Sat Apr 17 18:28:30 2004 +0000 +++ b/src/protocols/novell/nmmessage.h Sat Apr 17 18:29:20 2004 +0000 @@ -9,7 +9,7 @@ * RECAST, TRANSFORMED OR ADAPTED WITHOUT THE PRIOR WRITTEN CONSENT OF NOVELL, * INC. ANY USE OR EXPLOITATION OF THIS WORK WITHOUT AUTHORIZATION COULD SUBJECT * THE PERPETRATOR TO CRIMINAL AND CIVIL LIABILITY. - * + * * AS BETWEEN [GAIM] AND NOVELL, NOVELL GRANTS [GAIM] THE RIGHT TO REPUBLISH * THIS WORK UNDER THE GPL (GNU GENERAL PUBLIC LICENSE) WITH ALL RIGHTS AND * LICENSES THEREUNDER. IF YOU HAVE RECEIVED THIS WORK DIRECTLY OR INDIRECTLY @@ -28,13 +28,13 @@ #include "nmconference.h" /** - * Creates a new message. + * Creates a new message. * * The returned message should be released by calling * nm_release_message * * @param text The message text - * @return A newly allocated message + * @return A newly allocated message */ NMMessage *nm_create_message(const char *text); @@ -65,8 +65,8 @@ /** * Returns the conference object associated with the message * - * Note: this does not increment the reference count for the - * conference and the conference should NOT be released with + * Note: this does not increment the reference count for the + * conference and the conference should NOT be released with * nm_release_conference. If the reference needs to be kept * around nm_conference_add_ref should be called. *
--- a/src/protocols/novell/nmrequest.c Sat Apr 17 18:28:30 2004 +0000 +++ b/src/protocols/novell/nmrequest.c Sat Apr 17 18:29:20 2004 +0000 @@ -9,7 +9,7 @@ * RECAST, TRANSFORMED OR ADAPTED WITHOUT THE PRIOR WRITTEN CONSENT OF NOVELL, * INC. ANY USE OR EXPLOITATION OF THIS WORK WITHOUT AUTHORIZATION COULD SUBJECT * THE PERPETRATOR TO CRIMINAL AND CIVIL LIABILITY. - * + * * AS BETWEEN [GAIM] AND NOVELL, NOVELL GRANTS [GAIM] THE RIGHT TO REPUBLISH * THIS WORK UNDER THE GPL (GNU GENERAL PUBLIC LICENSE) WITH ALL RIGHTS AND * LICENSES THEREUNDER. IF YOU HAVE RECEIVED THIS WORK DIRECTLY OR INDIRECTLY
--- a/src/protocols/novell/nmrequest.h Sat Apr 17 18:28:30 2004 +0000 +++ b/src/protocols/novell/nmrequest.h Sat Apr 17 18:29:20 2004 +0000 @@ -9,7 +9,7 @@ * RECAST, TRANSFORMED OR ADAPTED WITHOUT THE PRIOR WRITTEN CONSENT OF NOVELL, * INC. ANY USE OR EXPLOITATION OF THIS WORK WITHOUT AUTHORIZATION COULD SUBJECT * THE PERPETRATOR TO CRIMINAL AND CIVIL LIABILITY. - * + * * AS BETWEEN [GAIM] AND NOVELL, NOVELL GRANTS [GAIM] THE RIGHT TO REPUBLISH * THIS WORK UNDER THE GPL (GNU GENERAL PUBLIC LICENSE) WITH ALL RIGHTS AND * LICENSES THEREUNDER. IF YOU HAVE RECEIVED THIS WORK DIRECTLY OR INDIRECTLY @@ -27,7 +27,7 @@ #include "nmuser.h" -/** +/** * Create a new request object. Object must be release with nm_release_object. * * @param cmd The request command string (e.g. "login") @@ -38,14 +38,14 @@ */ NMRequest *nm_create_request(const char *cmd, int trans_id, int gmt); -/** +/** * Release a request object. * * @param req The request to release */ void nm_release_request(NMRequest * req); -/** +/** * Add a new reference to this object. This reference must be released by * a call to nm_release_object. * @@ -53,7 +53,7 @@ */ void nm_request_add_ref(NMRequest * req); -/** +/** * Set the response callback for this request object. This is the callback * that will be made when we get a response from the server. * @@ -63,8 +63,8 @@ */ void nm_request_set_callback(NMRequest * req, nm_response_cb callback); -/** - * Set the response data. This will be set differently depending on +/** + * Set the response data. This will be set differently depending on * the request type (for example to nm_send_get_details will set this * to be the newly create NMUserRecord object). * @@ -74,19 +74,19 @@ */ void nm_request_set_data(NMRequest * req, gpointer data); -/** +/** * Set the user defined data. This is the data that the client * passes to the various nm_send_* functions. We will pass it * back when we make the callback. * * @param req The request object - * @param user_define Pointer to some data + * @param user_define Pointer to some data * */ void nm_request_set_user_define(NMRequest * req, gpointer user_define); -/** - * Set the return code. This is the return code that we recieved in +/** + * Set the return code. This is the return code that we recieved in * the server response fields. * * @param req The request object @@ -94,7 +94,7 @@ */ void nm_request_set_ret_code(NMRequest * req, NMERR_T rc); -/** +/** * Get the transaction id for this request. * * @param req The request object @@ -103,7 +103,7 @@ */ int nm_request_get_trans_id(NMRequest * req); -/** +/** * Get the command (request type) for this request. * * @param req The request object @@ -112,7 +112,7 @@ */ const char *nm_request_get_cmd(NMRequest * req); -/** +/** * Get the response data for this request * * @param req The request object @@ -121,7 +121,7 @@ */ gpointer nm_request_get_data(NMRequest * req); -/** +/** * Get the user defined data for this request * * @param req The request object @@ -130,7 +130,7 @@ */ gpointer nm_request_get_user_define(NMRequest * req); -/** +/** * Get the response callback for this request * * @param req The request object @@ -139,7 +139,7 @@ */ nm_response_cb nm_request_get_callback(NMRequest * req); -/** +/** * Get the return code * * @param req The request object
--- a/src/protocols/novell/nmuser.c Sat Apr 17 18:28:30 2004 +0000 +++ b/src/protocols/novell/nmuser.c Sat Apr 17 18:29:20 2004 +0000 @@ -9,7 +9,7 @@ * RECAST, TRANSFORMED OR ADAPTED WITHOUT THE PRIOR WRITTEN CONSENT OF NOVELL, * INC. ANY USE OR EXPLOITATION OF THIS WORK WITHOUT AUTHORIZATION COULD SUBJECT * THE PERPETRATOR TO CRIMINAL AND CIVIL LIABILITY. - * + * * AS BETWEEN [GAIM] AND NOVELL, NOVELL GRANTS [GAIM] THE RIGHT TO REPUBLISH * THIS WORK UNDER THE GPL (GNU GENERAL PUBLIC LICENSE) WITH ALL RIGHTS AND * LICENSES THEREUNDER. IF YOU HAVE RECEIVED THIS WORK DIRECTLY OR INDIRECTLY @@ -29,7 +29,7 @@ #include "nmuserrecord.h" #include "util.h" -/* This is the template that we wrap outgoing messages in, since the other +/* This is the template that we wrap outgoing messages in, since the other * GW Messenger clients expect messages to be in RTF. */ #define RTF_TEMPLATE "{\\rtf1\\fbidis\\ansi\\ansicpg1252\\deff0\\deflang1033"\ @@ -126,7 +126,7 @@ fields = nm_add_field(fields, NM_A_SZ_USERID, 0, NMFIELD_METHOD_VALID, 0, (guint32) g_strdup(user->name), NMFIELD_TYPE_UTF8); - + fields = nm_add_field(fields, NM_A_SZ_CREDENTIALS, 0, NMFIELD_METHOD_VALID, 0, (guint32) g_strdup(pwd), NMFIELD_TYPE_UTF8); @@ -338,7 +338,7 @@ NMFIELD_METHOD_VALID, 0, (guint32) tmp, NMFIELD_TYPE_ARRAY); tmp = NULL; - + /* Send the request to the server */ rc = nm_send_request(user->conn, "leaveconf", fields, &req); if (rc == NM_OK && req) { @@ -615,7 +615,7 @@ if (display_name) fields = nm_add_field(fields, NM_A_SZ_DISPLAY_NAME, 0, NMFIELD_METHOD_VALID, 0, (guint32) g_strdup(display_name), NMFIELD_TYPE_UTF8); - + /* Dispatch the request */ rc = nm_send_request(user->conn, "createcontact", fields, &req); if (rc == NM_OK && req) { @@ -1387,7 +1387,7 @@ const char *cmd; nm_response_cb cb; gboolean done = TRUE; - + if (user == NULL || request == NULL || fields == NULL) return NMERR_BAD_PARM; @@ -1398,7 +1398,7 @@ } else { ret_code = NMERR_PROTOCOL; } - + cmd = nm_request_get_cmd(request); if (ret_code == NM_OK && cmd != NULL) {
--- a/src/protocols/novell/nmuser.h Sat Apr 17 18:28:30 2004 +0000 +++ b/src/protocols/novell/nmuser.h Sat Apr 17 18:29:20 2004 +0000 @@ -9,7 +9,7 @@ * RECAST, TRANSFORMED OR ADAPTED WITHOUT THE PRIOR WRITTEN CONSENT OF NOVELL, * INC. ANY USE OR EXPLOITATION OF THIS WORK WITHOUT AUTHORIZATION COULD SUBJECT * THE PERPETRATOR TO CRIMINAL AND CIVIL LIABILITY. - * + * * AS BETWEEN [GAIM] AND NOVELL, NOVELL GRANTS [GAIM] THE RIGHT TO REPUBLISH * THIS WORK UNDER THE GPL (GNU GENERAL PUBLIC LICENSE) WITH ALL RIGHTS AND * LICENSES THEREUNDER. IF YOU HAVE RECEIVED THIS WORK DIRECTLY OR INDIRECTLY @@ -143,7 +143,7 @@ #define NMERR_FOLDER_EXISTS (NMERR_BASE + 0x0008) -/** +/** * Initialize the user that we are going to login to the system as. * * @param name The userid of the user @@ -159,14 +159,14 @@ gpointer data, nm_event_cb event_callback); -/** +/** * Free up resources associated with the user object. * * @param user The user to deinitialize */ void nm_deinitialize_user(NMUser * user); -/** +/** * Send a login request to the server. * * The response data sent to the callback will be NULL. @@ -177,7 +177,7 @@ * @param user_agent String describing the client (eg. "Gaim/0.76 (Linux; 2.4.20)") * @param callback Function to call when we get the response from the server * @param data User defined data to be passed to the callback function - * + * * * @return NM_OK if login is sent successfully, error otherwise. */ @@ -185,7 +185,7 @@ const char *user_agent, nm_response_cb callback, gpointer data); -/** +/** * Send a set status request to the server. * * The response data sent to the callback will be NULL. @@ -202,7 +202,7 @@ const char *auto_resp, nm_response_cb callback, gpointer data); -/** +/** * Send a create conference to the server. * * The response data sent to the callback will be NULL. @@ -217,9 +217,9 @@ NMERR_T nm_send_create_conference(NMUser * user, NMConference * conference, nm_response_cb callback, gpointer data); -/** +/** * Tell server we have left the conference. - * + * * The response data sent to the callback will be NULL. * * @param user The logged in User @@ -232,7 +232,7 @@ NMERR_T nm_send_leave_conference(NMUser * user, NMConference * conference, nm_response_cb callback, gpointer data); -/** +/** * Send a join conference request to the server. * * The response data sent to the callback will be NULL. @@ -248,10 +248,10 @@ NMERR_T nm_send_join_conference(NMUser * user, NMConference * conference, nm_response_cb callback, gpointer data); -/** +/** * Send a conference reject request to the server. * - * The response data sent to the callback will be NULL. + * The response data sent to the callback will be NULL. * * @param user The logged in User * @param conference Conference the user is rejecting @@ -264,9 +264,9 @@ NMERR_T nm_send_reject_conference(NMUser * user, NMConference * conference, nm_response_cb callback, gpointer data); -/** +/** * Get details for a user from the server. - * + * * The response data sent to the callback will be an NMUserRecord which should be * freed with nm_release_user_record * @@ -280,11 +280,11 @@ NMERR_T nm_send_get_details(NMUser * user, const char *name, nm_response_cb callback, gpointer data); -/** +/** * Get details for multiple users from the server. - * + * * The response data to the callback will be a list of NMUserRecord, which should be - * freed (each user record should be released with nm_release_user_record and the + * freed (each user record should be released with nm_release_user_record and the * list should be freed) * * @param user The logged in User @@ -297,7 +297,7 @@ NMERR_T nm_send_multiple_get_details(NMUser *user, GSList *names, nm_response_cb callback, gpointer data); -/** +/** * Send a message. * * The response data sent to the callback will be NULL. @@ -311,7 +311,7 @@ NMERR_T nm_send_message(NMUser * user, NMMessage * message, nm_response_cb callback); -/** +/** * Sends a typing event to the server. * * The response data sent to the callback will be NULL. @@ -327,7 +327,7 @@ NMERR_T nm_send_typing(NMUser * user, NMConference * conf, gboolean typing, nm_response_cb callback); -/** +/** * Send a create contact request to the server. * * The given folder should already exist on the server. If not, @@ -348,7 +348,7 @@ NMContact * contact, nm_response_cb callback, gpointer data); -/** +/** * Send a remove contact request to the server. * * The response data sent to the callback will be NULL. @@ -365,7 +365,7 @@ NMContact * contact, nm_response_cb callback, gpointer data); -/** +/** * Send a create folder request to the server. * * The response data sent to the callback will be a NMFolder which should be @@ -381,7 +381,7 @@ NMERR_T nm_send_create_folder(NMUser * user, const char *name, nm_response_cb callback, gpointer data); -/** +/** * Send a delete folder request to the server. * * The response data sent to the callback will be NULL. @@ -396,7 +396,7 @@ NMERR_T nm_send_remove_folder(NMUser * user, NMFolder * folder, nm_response_cb callback, gpointer data); -/** +/** * Send a rename contact request to the server. * * The response data sent to the callback will be NULL. @@ -413,7 +413,7 @@ const char *new_name, nm_response_cb callback, gpointer data); -/** +/** * Send a rename folder request to the server. * * The response data sent to the callback will be NULL. @@ -430,7 +430,7 @@ const char *new_name, nm_response_cb callback, gpointer data); -/** +/** * Send a move contact request to the server. * * The response data sent to the callback will be NULL. @@ -447,7 +447,7 @@ NMFolder * folder, nm_response_cb callback, gpointer data); -/** +/** * Send a get status request to the server. * * The response data sent to the callback will be a NMUserRecord. @@ -463,14 +463,14 @@ NMERR_T nm_send_get_status(NMUser * user, NMUserRecord * user_record, nm_response_cb callback, gpointer data); -/** +/** * Reads a response/event from the server and processes it. * * @param user The logged in User */ NMERR_T nm_process_new_data(NMUser * user); -/** +/** * Return the root folder of the contact list * * @param user The logged in User @@ -479,7 +479,7 @@ */ NMFolder *nm_get_root_folder(NMUser * user); -/** +/** * Create the contact list based on the login fields * * @param user The logged in User @@ -522,7 +522,7 @@ /** Some utility functions **/ /** - * Check to see if the conference GUIDs are equivalent. + * Check to see if the conference GUIDs are equivalent. * * @param guid1 First guid to compare * @param guid2 Second guid to compare
--- a/src/protocols/novell/nmuserrecord.c Sat Apr 17 18:28:30 2004 +0000 +++ b/src/protocols/novell/nmuserrecord.c Sat Apr 17 18:29:20 2004 +0000 @@ -9,7 +9,7 @@ * RECAST, TRANSFORMED OR ADAPTED WITHOUT THE PRIOR WRITTEN CONSENT OF NOVELL, * INC. ANY USE OR EXPLOITATION OF THIS WORK WITHOUT AUTHORIZATION COULD SUBJECT * THE PERPETRATOR TO CRIMINAL AND CIVIL LIABILITY. - * + * * AS BETWEEN [GAIM] AND NOVELL, NOVELL GRANTS [GAIM] THE RIGHT TO REPUBLISH * THIS WORK UNDER THE GPL (GNU GENERAL PUBLIC LICENSE) WITH ALL RIGHTS AND * LICENSES THEREUNDER. IF YOU HAVE RECEIVED THIS WORK DIRECTLY OR INDIRECTLY @@ -83,7 +83,7 @@ * just pick the first value and return it */ NMField *tmp = (NMField *)field->value; - if ((tmp != NULL) && + if ((tmp != NULL) && ((tmp->type == NMFIELD_TYPE_UTF8) || (tmp->type == NMFIELD_TYPE_DN))) { @@ -96,12 +96,12 @@ } else { return NULL; } - + return g_strdup(value); } /* - * This creates a user_record for the reference list the - * field array that is passed in should be a + * This creates a user_record for the reference list the + * field array that is passed in should be a * NM_A_FA_USER_DETAILS array. */ NMUserRecord * @@ -123,7 +123,7 @@ user_record = nm_create_user_record(); if ((field = nm_locate_field(NM_A_SZ_AUTH_ATTRIBUTE, fields))) { - + if (field->value) { user_record->display_id = _get_attribute_value(field); user_record->auth_attr = TRUE; @@ -131,7 +131,7 @@ } if ((field = nm_locate_field(NM_A_SZ_DN, fields))) { - + if (field->value) { user_record->dn = _get_attribute_value(field); } @@ -152,7 +152,7 @@ } if ((field = nm_locate_field("Surname", fields))) { - + if (field->value) { user_record->lname = _get_attribute_value(field); } @@ -257,11 +257,11 @@ /* Copy fields */ if (src->fields) { - + if (dest->fields) { nm_free_fields(&dest->fields); } - + dest->fields = nm_copy_field_array(src->fields); } @@ -307,7 +307,7 @@ if (user_record->full_name) { g_free(user_record->full_name); } - + if (user_record->status_text) { g_free(user_record->status_text); } @@ -471,7 +471,7 @@ g_free(user_record->status_text); user_record->status_text = NULL; } - + if (text) user_record->status_text = g_strdup(text); }
--- a/src/protocols/novell/nmuserrecord.h Sat Apr 17 18:28:30 2004 +0000 +++ b/src/protocols/novell/nmuserrecord.h Sat Apr 17 18:29:20 2004 +0000 @@ -9,7 +9,7 @@ * RECAST, TRANSFORMED OR ADAPTED WITHOUT THE PRIOR WRITTEN CONSENT OF NOVELL, * INC. ANY USE OR EXPLOITATION OF THIS WORK WITHOUT AUTHORIZATION COULD SUBJECT * THE PERPETRATOR TO CRIMINAL AND CIVIL LIABILITY. - * + * * AS BETWEEN [GAIM] AND NOVELL, NOVELL GRANTS [GAIM] THE RIGHT TO REPUBLISH * THIS WORK UNDER THE GPL (GNU GENERAL PUBLIC LICENSE) WITH ALL RIGHTS AND * LICENSES THEREUNDER. IF YOU HAVE RECEIVED THIS WORK DIRECTLY OR INDIRECTLY @@ -46,7 +46,7 @@ * Creates an NMUserRecord * * The NMUserRecord should be released by calling - * nm_release_user_record + * nm_release_user_record * * @param details Should be a NM_A_FA_USER_DETAILS * @@ -60,7 +60,7 @@ * Add a reference to an existing user_record * * The reference should be released by calling - * nm_release_user_record + * nm_release_user_record * * @param user_record The contact to addref * @@ -124,7 +124,7 @@ const char *nm_user_record_get_dn(NMUserRecord * user_record); /** - * Set the user id for the + * Set the user id for the * * @param user_record The user record * @param userid The userid (CN) for the user record @@ -192,7 +192,7 @@ * Get the last name for the user record * * @param user_record The user record - * + * * @return The last name for the user */ const char *nm_user_record_get_last_name(NMUserRecord * user_record); @@ -202,7 +202,7 @@ * * @param user_record The user record * @param data The user defined data for the user record - * + * */ void nm_user_record_set_data(NMUserRecord * user_record, gpointer data);
--- a/src/protocols/novell/novell.c Sat Apr 17 18:28:30 2004 +0000 +++ b/src/protocols/novell/novell.c Sat Apr 17 18:29:20 2004 +0000 @@ -9,7 +9,7 @@ * RECAST, TRANSFORMED OR ADAPTED WITHOUT THE PRIOR WRITTEN CONSENT OF NOVELL, * INC. ANY USE OR EXPLOITATION OF THIS WORK WITHOUT AUTHORIZATION COULD SUBJECT * THE PERPETRATOR TO CRIMINAL AND CIVIL LIABILITY. - * + * * AS BETWEEN [GAIM] AND NOVELL, NOVELL GRANTS [GAIM] THE RIGHT TO REPUBLISH * THIS WORK UNDER THE GPL (GNU GENERAL PUBLIC LICENSE) WITH ALL RIGHTS AND * LICENSES THEREUNDER. IF YOU HAVE RECEIVED THIS WORK DIRECTLY OR INDIRECTLY @@ -219,7 +219,7 @@ } } else { - + gc = gaim_account_get_connection(user->client_data); if (gc != NULL) { char *err = g_strdup_printf(_("Unable to send message." @@ -349,7 +349,7 @@ /* Save the new buddy as part of the contact object */ nm_contact_set_data(new_contact, (gpointer) buddy); - /* We need details for the user before we can setup the + /* We need details for the user before we can setup the * new Gaim buddy. We always call this because the * 'createcontact' response fields do not always contain * everything that we need. @@ -524,7 +524,7 @@ /* Tell the server to move the contact to the new folder */ /* rc = nm_send_move_contact(user, contact, new_folder, _move_contact_resp_cb, NULL); */ - + rc = nm_send_create_contact(user, new_folder, contact, NULL, NULL); @@ -680,7 +680,7 @@ const char *release = ""; const char *template = "Gaim/%s (%s; %s)"; struct utsname u; - + if (uname(&u) == 0) { sysname = u.sysname; release = u.release; @@ -697,18 +697,18 @@ const char *template = "Gaim/%s (%s; %d.%d)"; OSVERSIONINFO os_info; SYSTEM_INFO sys_info; - + os_info.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); GetVersionEx(&os_info); GetSystemInfo(&sys_info); - + if (os_info.dwPlatformId == VER_PLATFORM_WIN32_NT) { switch (os_info.dwMajorVersion) { case 3: - case 4: + case 4: sysname = "Windows NT"; break; - case 5: + case 5: switch (os_info.dwMinorVersion) { case 0: sysname = "Windows 2000"; @@ -728,7 +728,7 @@ sysname = "Windows"; break; } - + } else if (os_info.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) { switch (os_info.dwMinorVersion) { case 0: @@ -747,13 +747,13 @@ } else { sysname = "Windows"; } - + return g_strdup_printf(template, VERSION, sysname, os_info.dwMajorVersion, os_info.dwMinorVersion); - + #endif - - + + } static gboolean @@ -791,7 +791,7 @@ conf = nm_message_get_conference(message); if (conf) { - /* We have a conference make sure that the + /* We have a conference make sure that the server knows about it already. */ if (nm_conference_is_instantiated(conf)) { @@ -935,7 +935,7 @@ } else { /* NULL contact. This should not happen, but - * let's break out of the loop. + * let's break out of the loop. */ break; } @@ -1158,7 +1158,7 @@ } else { gaim_connection_error(gc, _("Unable to connect to server.")); } - + gaim_connection_update_progress(gc, _("Waiting for response..."), 3, NOVELL_CONNECT_STEPS); @@ -1501,7 +1501,7 @@ break; case NMEVT_CONFERENCE_INVITE_NOTIFY: /* Someone else has been invited to join a - * conference that we are currently a part of + * conference that we are currently a part of */ /* TODO: show the invite notify in chat window */ break; @@ -1517,7 +1517,7 @@ break; case NMEVT_CONFERENCE_LEFT: /* Someone else has left a conference that we - * are currently a part of + * are currently a part of */ _evt_conference_left(user, event); break; @@ -1525,7 +1525,7 @@ gaim_debug(GAIM_DEBUG_INFO, "novell", "_event_callback(): unhandled event, %d\n", nm_event_get_type(event)); - break; + break; } } @@ -1552,7 +1552,7 @@ server = gaim_account_get_string(account, "server", NULL); if (server == NULL || *server == '\0') { - /* TODO: Would be nice to prompt if not set! + /* TODO: Would be nice to prompt if not set! * gaim_request_fields(gc, _("Server Address"),...); */ @@ -1582,7 +1582,7 @@ gaim_connection_error(gc, _("Error." " SSL support is not installed.")); } - } + } } static void @@ -1678,7 +1678,7 @@ created_conf = TRUE; nm_message_set_conference(message, conf); - + rc = nm_send_get_details(user, name, _get_details_resp_send_msg, message); _check_for_disconnect(user, rc); @@ -1871,7 +1871,7 @@ contact = nm_create_contact(); nm_contact_set_dn(contact, name); - /* Remove the GaimBuddy (we will add it back after adding it + /* Remove the GaimBuddy (we will add it back after adding it * to the server side list). Save the alias if there is one. */ buddy = gaim_find_buddy_in_group(user->client_data, name, group);