maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Swap mimetype/filename parameters.

Browse Source
This commit is contained in:
Michael Jumper 2013-06-24 12:41:01 -07:00
parent 8920bc0c76
commit a8b5c9fc5b
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/libguac/guacamole/protocol.h
View File

@ -358,12 +358,11 @@ int guac_protocol_send_audio_end(guac_socket* socket);
* @param socket The guac_socket connection to use. * @param socket The guac_socket connection to use.
* @param index The index of the blob that will contain the contents * @param index The index of the blob that will contain the contents
* of this file. * of this file.
* @param name A name describing the file being sent.
* @param mimetype The mimetype of the data being sent. * @param mimetype The mimetype of the data being sent.
* @param name A name describing the file being sent.
* @return Zero on success, non-zero on error. * @return Zero on success, non-zero on error.
*/ */
int guac_protocol_send_file(guac_socket* socket, int index, int guac_protocol_send_file(guac_socket* socket, int index, const char* mimetype, const char* name);
const char* name, const char* mimetype);
/** /**
* Writes a block of data to the currently in-progress blob which was already * Writes a block of data to the currently in-progress blob which was already

6
src/libguac/protocol.c
View File

@ -691,15 +691,15 @@ int guac_protocol_send_error(guac_socket* socket, const char* error) {
} }
int guac_protocol_send_file(guac_socket* socket, int index, const char* name, const char* mimetype) { int guac_protocol_send_file(guac_socket* socket, int index, const char* mimetype, const char* name) {
return return
guac_socket_write_string(socket, "4.file,") guac_socket_write_string(socket, "4.file,")
|| __guac_socket_write_length_int(socket, index) || __guac_socket_write_length_int(socket, index)
|| guac_socket_write_string(socket, ",") || guac_socket_write_string(socket, ",")
|| __guac_socket_write_length_string(socket, name)
|| guac_socket_write_string(socket, ",")
|| __guac_socket_write_length_string(socket, mimetype) || __guac_socket_write_length_string(socket, mimetype)
|| guac_socket_write_string(socket, ",")
|| __guac_socket_write_length_string(socket, name)
|| guac_socket_write_string(socket, ";"); || guac_socket_write_string(socket, ";");
} }