/pidgin/main: 848e16508276: Fixups for mxit

Changeset: 848e16508276b5643fcbb096ac44bf48ec2ea1f2
Author:	 Gary Kramlich <[email protected]>
Date:	 2016-08-19 23:57 -0500
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/848e16508276

Description:

Fixups for mxit

diffstat:

 libpurple/protocols/mxit/chunk.c |  12 ++----------
 libpurple/protocols/mxit/mxit.c  |  11 -----------
 2 files changed, 2 insertions(+), 21 deletions(-)

diffs (57 lines):

diff --git a/libpurple/protocols/mxit/chunk.c b/libpurple/protocols/mxit/chunk.c
--- a/libpurple/protocols/mxit/chunk.c
+++ b/libpurple/protocols/mxit/chunk.c
@@ -180,11 +180,7 @@ static int get_int16( const char* chunkd
 
 	*value = ntohs( *( (const short*) chunkdata ) );	/* host byte-order */
 
-	memcpy(&value_v, chunkdata, sizeof(value_v));
-
-	*value = ntohs(value_v); /* host byte-order */
-
-	return sizeof(value_v);
+	return sizeof( short );
 }
 
 /*------------------------------------------------------------------------
@@ -202,11 +198,7 @@ static int get_int32( const char* chunkd
 
 	*value = ntohl( *( (const int*) chunkdata ) );	/* host byte-order */
 
-	memcpy(&value_v, chunkdata, sizeof(value_v));
-
-	*value = ntohl(value_v); /* host byte-order */
-
-	return sizeof(value_v);
+	return sizeof( int );
 }
 
 #if	0
diff --git a/libpurple/protocols/mxit/mxit.c b/libpurple/protocols/mxit/mxit.c
--- a/libpurple/protocols/mxit/mxit.c
+++ b/libpurple/protocols/mxit/mxit.c
@@ -827,14 +827,6 @@ mxit_protocol_chat_iface_init( PurplePro
 
 
 static void
-mxit_protocol_media_iface_init( PurpleProtocolMediaIface *media_iface )
-{
-	media_iface->initiate_session = mxit_media_initiate;
-	media_iface->get_caps         = mxit_media_caps;
-}
-
-
-static void
 mxit_protocol_xfer_iface_init( PurpleProtocolXferIface *xfer_iface )
 {
 	xfer_iface->can_receive = mxit_xfer_enabled;	/* [filexfer.c] */
@@ -858,9 +850,6 @@ PURPLE_DEFINE_TYPE_EXTENDED(
 	PURPLE_IMPLEMENT_INTERFACE_STATIC( PURPLE_TYPE_PROTOCOL_CHAT_IFACE,
 	                                   mxit_protocol_chat_iface_init )
 
-	PURPLE_IMPLEMENT_INTERFACE_STATIC( PURPLE_TYPE_PROTOCOL_MEDIA_IFACE,
-	                                   mxit_protocol_media_iface_init )
-
 	PURPLE_IMPLEMENT_INTERFACE_STATIC( PURPLE_TYPE_PROTOCOL_XFER_IFACE,
 	                                   mxit_protocol_xfer_iface_init )
 );

_______________________________________________
Commits mailing list
[email protected]
https://pidgin.im/cgi-bin/mailman/listinfo/commits