diff options
| -rw-r--r-- | COPYRIGHT | 1 | ||||
| -rw-r--r-- | libpurple/circbuffer.c | 4 | ||||
| -rw-r--r-- | libpurple/circbuffer.h | 2 | ||||
| -rw-r--r-- | libpurple/whiteboard.c | 8 | ||||
| -rw-r--r-- | libpurple/whiteboard.h | 10 | ||||
| -rw-r--r-- | libpurple/xmlnode.c | 2 | ||||
| -rw-r--r-- | libpurple/xmlnode.h | 2 |
7 files changed, 15 insertions, 14 deletions
@@ -97,6 +97,7 @@ Marc E. Andrew Echols John Eckerdal Sean Egan <seanegan@gmail.com> +Markus Elfring Nelson Elhage Ignacio J. Elia Brian Enigma diff --git a/libpurple/circbuffer.c b/libpurple/circbuffer.c index 441e700479..7ca715359e 100644 --- a/libpurple/circbuffer.c +++ b/libpurple/circbuffer.c @@ -122,8 +122,8 @@ void gaim_circ_buffer_append(GaimCircBuffer *buf, gconstpointer src, gsize len) buf->bufused += len; } -gsize gaim_circ_buffer_get_max_read(GaimCircBuffer *buf) { - int max_read; +gsize gaim_circ_buffer_get_max_read(const GaimCircBuffer *buf) { + gsize max_read; g_return_val_if_fail(buf != NULL, 0); diff --git a/libpurple/circbuffer.h b/libpurple/circbuffer.h index 27229efc11..f4d627d497 100644 --- a/libpurple/circbuffer.h +++ b/libpurple/circbuffer.h @@ -97,7 +97,7 @@ void gaim_circ_buffer_append(GaimCircBuffer *buf, gconstpointer src, gsize len); * * @return the number of bytes that can be read from the GaimCircBuffer */ -gsize gaim_circ_buffer_get_max_read(GaimCircBuffer *buf); +gsize gaim_circ_buffer_get_max_read(const GaimCircBuffer *buf); /** * Mark the number of bytes that have been read from the buffer. diff --git a/libpurple/whiteboard.c b/libpurple/whiteboard.c index f910084298..a4128cfe69 100644 --- a/libpurple/whiteboard.c +++ b/libpurple/whiteboard.c @@ -101,9 +101,9 @@ void gaim_whiteboard_start(GaimWhiteboard *wb) * usernames 'me' and 'who'. Returns a pointer to a matching whiteboard * session; if none match, it returns NULL. */ -GaimWhiteboard *gaim_whiteboard_get_session(GaimAccount *account, const char *who) +GaimWhiteboard *gaim_whiteboard_get_session(const GaimAccount *account, const char *who) { - GaimWhiteboard *wb = NULL; + GaimWhiteboard *wb; GList *l = wbList; @@ -127,7 +127,7 @@ void gaim_whiteboard_draw_list_destroy(GList *draw_list) g_list_free(draw_list); } -gboolean gaim_whiteboard_get_dimensions(GaimWhiteboard *wb, int *width, int *height) +gboolean gaim_whiteboard_get_dimensions(const GaimWhiteboard *wb, int *width, int *height) { GaimWhiteboardPrplOps *prpl_ops = wb->prpl_ops; @@ -188,7 +188,7 @@ void gaim_whiteboard_send_brush(GaimWhiteboard *wb, int size, int color) prpl_ops->set_brush(wb, size, color); } -gboolean gaim_whiteboard_get_brush(GaimWhiteboard *wb, int *size, int *color) +gboolean gaim_whiteboard_get_brush(const GaimWhiteboard *wb, int *size, int *color) { GaimWhiteboardPrplOps *prpl_ops = wb->prpl_ops; diff --git a/libpurple/whiteboard.h b/libpurple/whiteboard.h index dc150c547a..4cbc514232 100644 --- a/libpurple/whiteboard.h +++ b/libpurple/whiteboard.h @@ -73,9 +73,9 @@ struct _GaimWhiteboardPrplOps { void (*start)(GaimWhiteboard *wb); /**< start function */ void (*end)(GaimWhiteboard *wb); /**< end function */ - void (*get_dimensions)(GaimWhiteboard *wb, int *width, int *height); /**< get_dimensions function */ + void (*get_dimensions)(const GaimWhiteboard *wb, int *width, int *height); /**< get_dimensions function */ void (*set_dimensions)(GaimWhiteboard *wb, int width, int height); /**< set_dimensions function */ - void (*get_brush) (GaimWhiteboard *wb, int *size, int *color); /**< get the brush size and color */ + void (*get_brush) (const GaimWhiteboard *wb, int *size, int *color); /**< get the brush size and color */ void (*set_brush) (GaimWhiteboard *wb, int size, int color); /**< set the brush size and color */ void (*send_draw_list)(GaimWhiteboard *wb, GList *draw_list); /**< send_draw_list function */ void (*clear)(GaimWhiteboard *wb); /**< clear function */ @@ -138,7 +138,7 @@ void gaim_whiteboard_start(GaimWhiteboard *wb); * * @return The whiteboard if found, otherwise @c NULL. */ -GaimWhiteboard *gaim_whiteboard_get_session(GaimAccount *account, const char *who); +GaimWhiteboard *gaim_whiteboard_get_session(const GaimAccount *account, const char *who); /** * Destorys a drawing list for a whiteboard @@ -156,7 +156,7 @@ void gaim_whiteboard_draw_list_destroy(GList *draw_list); * * @return TRUE if the values of width and height were set. */ -gboolean gaim_whiteboard_get_dimensions(GaimWhiteboard *wb, int *width, int *height); +gboolean gaim_whiteboard_get_dimensions(const GaimWhiteboard *wb, int *width, int *height); /** * Sets the dimensions for a whiteboard. @@ -231,7 +231,7 @@ void gaim_whiteboard_send_brush(GaimWhiteboard *wb, int size, int color); * * @return TRUE if the size and color were set. */ -gboolean gaim_whiteboard_get_brush(GaimWhiteboard *wb, int *size, int *color); +gboolean gaim_whiteboard_get_brush(const GaimWhiteboard *wb, int *size, int *color); /** * Sets the size and color of the brush. diff --git a/libpurple/xmlnode.c b/libpurple/xmlnode.c index 0e30593939..9b624bb77f 100644 --- a/libpurple/xmlnode.c +++ b/libpurple/xmlnode.c @@ -583,7 +583,7 @@ xmlnode_from_str(const char *str, gssize size) } xmlnode * -xmlnode_copy(xmlnode *src) +xmlnode_copy(const xmlnode *src) { xmlnode *ret; xmlnode *child; diff --git a/libpurple/xmlnode.h b/libpurple/xmlnode.h index 607585fa56..7716f54e15 100644 --- a/libpurple/xmlnode.h +++ b/libpurple/xmlnode.h @@ -249,7 +249,7 @@ xmlnode *xmlnode_from_str(const char *str, gssize size); * * @return A new copy of the src node. */ -xmlnode *xmlnode_copy(xmlnode *src); +xmlnode *xmlnode_copy(const xmlnode *src); /** * Frees a node and all of it's children. |