pidgin: 830037b4: Do you hear that? It sounds like an ax.....

qulogic at pidgin.im qulogic at pidgin.im
Wed Mar 10 00:25:58 EST 2010 

-----------------------------------------------------------------
Revision: 830037b48e3f815fcca84b9781302b5e1843c0a4
Ancestor: d8fb6ab92784a1996fd5f44e42fbb00a9d07299c
Author: qulogic at pidgin.im
Date: 2010-03-08T05:56:34
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/830037b48e3f815fcca84b9781302b5e1843c0a4

Deleted entries:
        libpurple/protocols/msnp9
        libpurple/protocols/msnp9/Makefile.am
        libpurple/protocols/msnp9/Makefile.mingw
        libpurple/protocols/msnp9/cmdproc.c
        libpurple/protocols/msnp9/cmdproc.h
        libpurple/protocols/msnp9/command.c
        libpurple/protocols/msnp9/command.h
        libpurple/protocols/msnp9/dialog.c
        libpurple/protocols/msnp9/dialog.h
        libpurple/protocols/msnp9/directconn.c
        libpurple/protocols/msnp9/directconn.h
        libpurple/protocols/msnp9/error.c
        libpurple/protocols/msnp9/error.h
        libpurple/protocols/msnp9/group.c
        libpurple/protocols/msnp9/group.h
        libpurple/protocols/msnp9/history.c
        libpurple/protocols/msnp9/history.h
        libpurple/protocols/msnp9/httpconn.c
        libpurple/protocols/msnp9/httpconn.h
        libpurple/protocols/msnp9/msg.c
        libpurple/protocols/msnp9/msg.h
        libpurple/protocols/msnp9/msn-utils.c
        libpurple/protocols/msnp9/msn-utils.h
        libpurple/protocols/msnp9/msn.c
        libpurple/protocols/msnp9/msn.h
        libpurple/protocols/msnp9/nexus.c
        libpurple/protocols/msnp9/nexus.h
        libpurple/protocols/msnp9/notification.c
        libpurple/protocols/msnp9/notification.h
        libpurple/protocols/msnp9/object.c
        libpurple/protocols/msnp9/object.h
        libpurple/protocols/msnp9/page.c
        libpurple/protocols/msnp9/page.h
        libpurple/protocols/msnp9/servconn.c
        libpurple/protocols/msnp9/servconn.h
        libpurple/protocols/msnp9/session.c
        libpurple/protocols/msnp9/session.h
        libpurple/protocols/msnp9/slp.c
        libpurple/protocols/msnp9/slp.h
        libpurple/protocols/msnp9/slpcall.c
        libpurple/protocols/msnp9/slpcall.h
        libpurple/protocols/msnp9/slplink.c
        libpurple/protocols/msnp9/slplink.h
        libpurple/protocols/msnp9/slpmsg.c
        libpurple/protocols/msnp9/slpmsg.h
        libpurple/protocols/msnp9/slpsession.c
        libpurple/protocols/msnp9/slpsession.h
        libpurple/protocols/msnp9/state.c
        libpurple/protocols/msnp9/state.h
        libpurple/protocols/msnp9/switchboard.c
        libpurple/protocols/msnp9/switchboard.h
        libpurple/protocols/msnp9/sync.c
        libpurple/protocols/msnp9/sync.h
        libpurple/protocols/msnp9/table.c
        libpurple/protocols/msnp9/table.h
        libpurple/protocols/msnp9/transaction.c
        libpurple/protocols/msnp9/transaction.h
        libpurple/protocols/msnp9/user.c
        libpurple/protocols/msnp9/user.h
        libpurple/protocols/msnp9/userlist.c
        libpurple/protocols/msnp9/userlist.h
Modified files:
        configure.ac libpurple/protocols/Makefile.am

ChangeLog: 

Do you hear that? It sounds like an ax... A source code chopping ax...

-------------- next part --------------
============================================================
--- configure.ac	4af33f87b5b01e5c9894118a253cc45409dcf0c8
+++ configure.ac	71c834a27e6579515f7a3495b381f9b6c9dcee0c
@@ -1075,9 +1075,6 @@ AC_SUBST(GADU_CFLAGS)
 AC_SUBST(GADU_LIBS)
 AC_SUBST(GADU_CFLAGS)
 
-# change the next line to not make MSNP15 the default (s/disable/enable/; s/yes/no/;)
-AC_ARG_ENABLE(msnp15,[AC_HELP_STRING([--disable-msnp15], [Disable the newer MSNP15 protocol])],enable_msnp15=$enableval,enable_msnp15=yes)
-
 AC_ARG_ENABLE(distrib,,,enable_distrib=no)
 AM_CONDITIONAL(DISTRIB, test "x$enable_distrib" = "xyes")
 DYNAMIC_PRPLS=all
@@ -1095,9 +1092,6 @@ fi
 if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then
 	STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/bonjour//'`
 fi
-if test "x$enable_msnp15" != "xyes" ; then
-	STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/msn/msnp9/'`
-fi
 if test "x$silcincludes" != "xyes" -o "x$silcclient" != "xyes"; then
 	STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/silc/silc10/'`
 fi
@@ -1128,8 +1122,6 @@ for i in $STATIC_PRPLS ; do
 			STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.la"
 		elif test "x$i" = "xsilc10"; then
 			STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libsilcpurple.la"
-		elif test "x$i" = "xmsnp9"; then
-			STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libmsn.la"
 		else
 			STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib$i.la"
 		fi
@@ -1142,7 +1134,6 @@ for i in $STATIC_PRPLS ; do
 		irc)		static_irc=yes ;;
 		jabber)		static_jabber=yes ;;
 		msn)		static_msn=yes ;;
-		msnp9)		static_msn=yes ;;
 		myspace)	static_myspace=yes ;;
 		mxit)		static_mxit=yes ;;
 		novell)		static_novell=yes ;;
@@ -1188,9 +1179,6 @@ fi
 if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then
 	DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/bonjour//'`
 fi
-if test "x$enable_msnp15" != "xyes" ; then
-	DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/msn/msnp9/'`
-fi
 if test "x$silcincludes" != "xyes" -o "x$silcclient" != "xyes"; then
 	DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/silc/silc10/'`
 fi
@@ -1205,7 +1193,6 @@ for i in $DYNAMIC_PRPLS ; do
 		irc)		dynamic_irc=yes ;;
 		jabber)		dynamic_jabber=yes ;;
 		msn)		dynamic_msn=yes ;;
-		msnp9)		dynamic_msn=yes ;;
 		myspace)	dynamic_myspace=yes ;;
 		mxit)		dynamic_mxit=yes ;;
 		novell)		dynamic_novell=yes ;;
@@ -2552,7 +2539,6 @@ AC_CONFIG_FILES([Makefile
 		   libpurple/protocols/irc/Makefile
 		   libpurple/protocols/jabber/Makefile
 		   libpurple/protocols/msn/Makefile
-		   libpurple/protocols/msnp9/Makefile
 		   libpurple/protocols/myspace/Makefile
 		   libpurple/protocols/mxit/Makefile
 		   libpurple/protocols/novell/Makefile
============================================================
--- libpurple/protocols/Makefile.am	69e284b088c74b5f75c782bef342a4eebccc7b1a
+++ libpurple/protocols/Makefile.am	5f196fd01403a22854270d8f585700839347063e
@@ -1,5 +1,5 @@ EXTRA_DIST = Makefile.mingw
 EXTRA_DIST = Makefile.mingw
 
-DIST_SUBDIRS = bonjour gg irc jabber msn msnp9 myspace mxit novell null oscar qq sametime silc silc10 simple yahoo zephyr
+DIST_SUBDIRS = bonjour gg irc jabber msn myspace mxit novell null oscar qq sametime silc silc10 simple yahoo zephyr
 
 SUBDIRS = $(DYNAMIC_PRPLS) $(STATIC_PRPLS)

More information about the Commits mailing list