/pidgin/main: ab26d8e3da97: silc: Use appropriate datatype for S...

[Daniel Atallah]

Changeset: ab26d8e3da97790e16e9e62c81a969817f12d920
Author:	 Daniel Atallah <datallah at pidgin.im>
Date:	 2013-02-26 21:20 -0500
Branch:	 release-2.x.y
URL: https://hg.pidgin.im/pidgin/main/rev/ab26d8e3da97

Description:

silc: Use appropriate datatype for SilcMessageFlags

diffstat:

 libpurple/protocols/silc/chat.c       |  4 ++--
 libpurple/protocols/silc/silc.c       |  5 ++---
 libpurple/protocols/silc/silcpurple.h |  2 +-
 libpurple/protocols/silc/util.c       |  2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diffs (67 lines):

diff --git a/libpurple/protocols/silc/chat.c b/libpurple/protocols/silc/chat.c
--- a/libpurple/protocols/silc/chat.c
+++ b/libpurple/protocols/silc/chat.c
@@ -151,7 +151,7 @@ silcpurple_chat_getinfo(PurpleConnection
 	}
 
 	if (channel->mode) {
-		g_string_append_printf(s, _("<br><b>Channel Modes:</b> "));
+		g_string_append(s, _("<br><b>Channel Modes:</b> "));
 		silcpurple_get_chmode_string(channel->mode, tmp, sizeof(tmp));
 		g_string_append(s, tmp);
 	}
@@ -1225,7 +1225,7 @@ int silcpurple_chat_send(PurpleConnectio
 	SilcChannelUser chu;
 	SilcChannelEntry channel = NULL;
 	SilcChannelPrivateKey key = NULL;
-	SilcUInt32 flags;
+	SilcMessageFlags flags;
 	int ret = 0;
 	char *msg2, *tmp;
 	gboolean found = FALSE;
diff --git a/libpurple/protocols/silc/silc.c b/libpurple/protocols/silc/silc.c
--- a/libpurple/protocols/silc/silc.c
+++ b/libpurple/protocols/silc/silc.c
@@ -1388,8 +1388,7 @@ silcpurple_send_im_resolved(SilcClient c
 
 	/* Check for images */
 	if (im->gflags & PURPLE_MESSAGE_IMAGES) {
-		list = silcpurple_image_message(im->message,
-						(SilcUInt32 *)(void *)&im->flags);
+		list = silcpurple_image_message(im->message, &im->flags);
 		if (list) {
 			/* Send one or more MIME message.  If more than one, they
 			   are MIME fragments due to over large message */
@@ -1438,7 +1437,7 @@ silcpurple_send_im(PurpleConnection *gc,
 	SilcClientConnection conn = sg->conn;
 	SilcDList clients;
 	SilcClientEntry client_entry;
-	SilcUInt32 mflags;
+	SilcMessageFlags mflags;
 	char *msg, *tmp;
 	int ret = 0;
 	gboolean sign = purple_account_get_bool(sg->account, "sign-verify", FALSE);
diff --git a/libpurple/protocols/silc/silcpurple.h b/libpurple/protocols/silc/silcpurple.h
--- a/libpurple/protocols/silc/silcpurple.h
+++ b/libpurple/protocols/silc/silcpurple.h
@@ -153,7 +153,7 @@ void silcpurple_parse_attrs(SilcDList at
 					 char **tzstr, char **geostr);
 void silcpurple_buddy_set_icon(PurpleConnection *gc, PurpleStoredImage *img);
 char *silcpurple_file2mime(const char *filename);
-SilcDList silcpurple_image_message(const char *msg, SilcUInt32 *mflags);
+SilcDList silcpurple_image_message(const char *msg, SilcMessageFlags *mflags);
 
 #ifdef _WIN32
 typedef int uid_t;
diff --git a/libpurple/protocols/silc/util.c b/libpurple/protocols/silc/util.c
--- a/libpurple/protocols/silc/util.c
+++ b/libpurple/protocols/silc/util.c
@@ -648,7 +648,7 @@ char *silcpurple_file2mime(const char *f
    there are multiple images and/or text with images multipart MIME
    message is created. */
 
-SilcDList silcpurple_image_message(const char *msg, SilcUInt32 *mflags)
+SilcDList silcpurple_image_message(const char *msg, SilcMessageFlags *mflags)
 {
 	SilcMime mime = NULL, p;
 	SilcDList list, parts = NULL;