/pidgin/main: 0c337fe8f655: Mxit: fix cipher.h conflict

[Tomasz Wasilczyk]

Changeset: 0c337fe8f6558ed0ab9f877b05a82c1a365d0c60
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-04-03 04:23 +0200
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/0c337fe8f655

Description:

Mxit: fix cipher.h conflict

diffstat:

 libpurple/protocols/mxit/Makefile.am |  4 ++--
 libpurple/protocols/mxit/actions.c   |  2 +-
 libpurple/protocols/mxit/cipher.c    |  8 ++++----
 libpurple/protocols/mxit/cipher.h    |  0 
 libpurple/protocols/mxit/login.c     |  2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diffs (63 lines):

diff --git a/libpurple/protocols/mxit/Makefile.am b/libpurple/protocols/mxit/Makefile.am
--- a/libpurple/protocols/mxit/Makefile.am
+++ b/libpurple/protocols/mxit/Makefile.am
@@ -8,8 +8,8 @@ MXITSOURCES = \
 	actions.h \
 	chunk.c \
 	chunk.h \
-	cipher.c \
-	cipher.h \
+	cipher-mxit.c \
+	cipher-mxit.h \
 	filexfer.c \
 	filexfer.h \
 	formcmds.c \
diff --git a/libpurple/protocols/mxit/actions.c b/libpurple/protocols/mxit/actions.c
--- a/libpurple/protocols/mxit/actions.c
+++ b/libpurple/protocols/mxit/actions.c
@@ -32,7 +32,7 @@
 #include	"roster.h"
 #include	"actions.h"
 #include	"splashscreen.h"
-#include	"cipher.h"
+#include	"cipher-mxit.h"
 #include	"profile.h"
 
 
diff --git a/libpurple/protocols/mxit/cipher.c b/libpurple/protocols/mxit/cipher-mxit.c
rename from libpurple/protocols/mxit/cipher.c
rename to libpurple/protocols/mxit/cipher-mxit.c
--- a/libpurple/protocols/mxit/cipher.c
+++ b/libpurple/protocols/mxit/cipher-mxit.c
@@ -20,12 +20,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
  */
 
-#include "internal.h"
-#include "debug.h"
-#include "libpurple/cipher.h"
-#include "ciphers/aescipher.h"
+#include "cipher-mxit.h"
 
 #include "cipher.h"
+#include "ciphers/aescipher.h"
+#include "debug.h"
+#include "internal.h"
 
 #define INITIAL_KEY "6170383452343567"
 #define SECRET_HEADER "<mxit/>"
diff --git a/libpurple/protocols/mxit/cipher.h b/libpurple/protocols/mxit/cipher-mxit.h
rename from libpurple/protocols/mxit/cipher.h
rename to libpurple/protocols/mxit/cipher-mxit.h
diff --git a/libpurple/protocols/mxit/login.c b/libpurple/protocols/mxit/login.c
--- a/libpurple/protocols/mxit/login.c
+++ b/libpurple/protocols/mxit/login.c
@@ -31,7 +31,7 @@
 
 #include	"protocol.h"
 #include	"mxit.h"
-#include	"cipher.h"
+#include	"cipher-mxit.h"
 #include	"login.h"
 #include	"profile.h"