/pidgin/main: 2638707f038e: Remove MySpace PRPL.
Mark Doliner
mark at kingant.net
Mon Feb 17 13:18:57 EST 2014
Changeset: 2638707f038e078b395302e845a75d71f8051461
Author: Mark Doliner <mark at kingant.net>
Date: 2014-02-17 10:18 -0800
Branch: default
URL: https://hg.pidgin.im/pidgin/main/rev/2638707f038e
Description:
Remove MySpace PRPL.
The servers for this protocol no longer exist.
Fixes #15356.
diffstat:
ChangeLog | 3 +
configure.ac | 8 +-
libpurple/protocols/Makefile.am | 2 +-
libpurple/protocols/Makefile.mingw | 2 +-
libpurple/protocols/myspace/Makefile.am | 44 -
libpurple/protocols/myspace/Makefile.mingw | 82 -
libpurple/protocols/myspace/README | 27 -
libpurple/protocols/myspace/markup.c | 763 ----
libpurple/protocols/myspace/markup.h | 27 -
libpurple/protocols/myspace/message.c | 1413 --------
libpurple/protocols/myspace/message.h | 109 -
libpurple/protocols/myspace/myspace.c | 3574 ---------------------
libpurple/protocols/myspace/myspace.h | 202 -
libpurple/protocols/myspace/persist.h | 92 -
libpurple/protocols/myspace/session.c | 98 -
libpurple/protocols/myspace/session.h | 61 -
libpurple/protocols/myspace/user.c | 896 -----
libpurple/protocols/myspace/user.h | 62 -
libpurple/protocols/myspace/zap.c | 246 -
libpurple/protocols/myspace/zap.h | 28 -
libpurple/prpl.h | 2 +-
libpurple/purple-url-handler | 7 -
pidgin/pixmaps/Makefile.am | 3 -
pidgin/pixmaps/emotes/default/24/Makefile.am | 7 -
pidgin/pixmaps/emotes/default/24/bulgy-eyes.png | Bin
pidgin/pixmaps/emotes/default/24/default.theme.in | 32 -
pidgin/pixmaps/emotes/default/24/freaked-out.png | Bin
pidgin/pixmaps/emotes/default/24/messed.png | Bin
pidgin/pixmaps/emotes/default/24/mohawk.png | Bin
pidgin/pixmaps/emotes/default/24/sidefrown.png | Bin
pidgin/pixmaps/emotes/default/24/sinister.png | Bin
pidgin/pixmaps/emotes/default/24/smirk.png | Bin
pidgin/pixmaps/emotes/small/16/small.theme.in | 16 -
pidgin/pixmaps/protocols/16/myspace.png | Bin
pidgin/pixmaps/protocols/22/myspace.png | Bin
pidgin/pixmaps/protocols/22/scalable/myspace.svg | 93 -
pidgin/pixmaps/protocols/48/myspace.png | Bin
pidgin/plugins/disco/xmppdisco.c | 1 -
po/POTFILES.in | 3 -
39 files changed, 8 insertions(+), 7895 deletions(-)
diffs (truncated from 8220 to 300 lines):
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -48,6 +48,9 @@ version 3.0.0 (??/??/????):
* The buddy's name was not centered vertically in the buddy-list if they
did not have a status-message or mood set.
+ MySpace:
+ * Remove this protocol because the servers have been taken offline.
+
XMPP:
* Strip element prefixes from XHTML-IM messages as they're presented
to the core (and UIs) as incoming messages (Thijs Alkemade).
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -1318,7 +1318,7 @@ if test "x$STATIC_PRPLS" != "x" -a "x$DY
fi
if test "x$STATIC_PRPLS" = "xall" ; then
- STATIC_PRPLS="bonjour gg irc jabber msn mxit myspace novell oscar sametime silc simple yahoo zephyr"
+ STATIC_PRPLS="bonjour gg irc jabber msn mxit novell oscar sametime silc simple yahoo zephyr"
fi
if test "x$have_meanwhile" != "xyes" ; then
STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/sametime//'`
@@ -1364,7 +1364,6 @@ for i in $STATIC_PRPLS ; do
jabber) static_jabber=yes ;;
msn) static_msn=yes ;;
mxit) static_mxit=yes ;;
- myspace) static_myspace=yes ;;
novell) static_novell=yes ;;
oscar) static_oscar=yes ;;
aim) static_oscar=yes ;;
@@ -1383,7 +1382,6 @@ AM_CONDITIONAL(STATIC_IRC, test "x$stati
AM_CONDITIONAL(STATIC_JABBER, test "x$static_jabber" = "xyes")
AM_CONDITIONAL(STATIC_MSN, test "x$static_msn" = "xyes")
AM_CONDITIONAL(STATIC_MXIT, test "x$static_mxit" = "xyes")
-AM_CONDITIONAL(STATIC_MYSPACE, test "x$static_myspace" = "xyes")
AM_CONDITIONAL(STATIC_NOVELL, test "x$static_novell" = "xyes")
AM_CONDITIONAL(STATIC_OSCAR, test "x$static_oscar" = "xyes")
AM_CONDITIONAL(STATIC_SAMETIME, test "x$static_sametime" = "xyes" -a "x$have_meanwhile" = "xyes")
@@ -1397,7 +1395,7 @@ AC_DEFINE_UNQUOTED(STATIC_PROTO_INIT, $e
AC_ARG_WITH(dynamic_prpls, [AS_HELP_STRING([--with-dynamic-prpls], [specify which protocols to build dynamically])], [DYNAMIC_PRPLS=`echo $withval | $sedpath 's/,/ /g'`])
if test "x$DYNAMIC_PRPLS" = "xall" ; then
- DYNAMIC_PRPLS="bonjour gg irc jabber msn mxit myspace novell oscar sametime silc simple yahoo zephyr"
+ DYNAMIC_PRPLS="bonjour gg irc jabber msn mxit novell oscar sametime silc simple yahoo zephyr"
fi
if test "x$have_meanwhile" != "xyes"; then
DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/sametime//'`
@@ -1417,7 +1415,6 @@ for i in $DYNAMIC_PRPLS ; do
jabber) dynamic_jabber=yes ;;
msn) dynamic_msn=yes ;;
mxit) dynamic_mxit=yes ;;
- myspace) dynamic_myspace=yes ;;
novell) dynamic_novell=yes ;;
null) dynamic_null=yes ;;
oscar) dynamic_oscar=yes ;;
@@ -2936,7 +2933,6 @@ AC_CONFIG_FILES([Makefile
libpurple/protocols/irc/Makefile
libpurple/protocols/jabber/Makefile
libpurple/protocols/msn/Makefile
- libpurple/protocols/myspace/Makefile
libpurple/protocols/mxit/Makefile
libpurple/protocols/novell/Makefile
libpurple/protocols/null/Makefile
diff --git a/libpurple/protocols/Makefile.am b/libpurple/protocols/Makefile.am
--- a/libpurple/protocols/Makefile.am
+++ b/libpurple/protocols/Makefile.am
@@ -1,5 +1,5 @@
EXTRA_DIST = Makefile.mingw
-DIST_SUBDIRS = bonjour gg irc jabber msn mxit myspace novell null oscar sametime silc simple yahoo zephyr
+DIST_SUBDIRS = bonjour gg irc jabber msn mxit novell null oscar sametime silc simple yahoo zephyr
SUBDIRS = $(DYNAMIC_PRPLS) $(STATIC_PRPLS)
diff --git a/libpurple/protocols/Makefile.mingw b/libpurple/protocols/Makefile.mingw
--- a/libpurple/protocols/Makefile.mingw
+++ b/libpurple/protocols/Makefile.mingw
@@ -8,7 +8,7 @@
PIDGIN_TREE_TOP := ../..
include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
-SUBDIRS = gg irc jabber msn mxit novell null oscar sametime silc simple yahoo bonjour myspace
+SUBDIRS = gg irc jabber msn mxit novell null oscar sametime silc simple yahoo bonjour
.PHONY: all install clean
diff --git a/libpurple/protocols/myspace/Makefile.am b/libpurple/protocols/myspace/Makefile.am
deleted file mode 100644
--- a/libpurple/protocols/myspace/Makefile.am
+++ /dev/null
@@ -1,44 +0,0 @@
-EXTRA_DIST = \
- Makefile.mingw
-
-pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
-
-MSIMSOURCES = markup.c \
- markup.h \
- message.c \
- message.h \
- myspace.c \
- myspace.h \
- persist.h \
- session.c \
- session.h \
- user.c \
- user.h \
- zap.c \
- zap.h
-
-AM_CFLAGS = $(st)
-
-libmyspace_la_LDFLAGS = -module -avoid-version
-
-if STATIC_MYSPACE
-
-st = -DPURPLE_STATIC_PRPL
-noinst_LTLIBRARIES = libmyspace.la
-libmyspace_la_SOURCES = $(MSIMSOURCES)
-libmyspace_la_CFLAGS = $(AM_CFLAGS)
-
-else
-
-st =
-pkg_LTLIBRARIES = libmyspace.la
-libmyspace_la_SOURCES = $(MSIMSOURCES)
-libmyspace_la_LIBADD = $(GLIB_LIBS)
-
-endif
-
-AM_CPPFLAGS = \
- -I$(top_srcdir)/libpurple \
- -I$(top_builddir)/libpurple \
- $(GLIB_CFLAGS) \
- $(DEBUG_CFLAGS)
diff --git a/libpurple/protocols/myspace/Makefile.mingw b/libpurple/protocols/myspace/Makefile.mingw
deleted file mode 100644
--- a/libpurple/protocols/myspace/Makefile.mingw
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-# Makefile.mingw
-#
-# Description: Makefile for win32 (mingw) version of libmyspace
-#
-
-PIDGIN_TREE_TOP := ../../..
-include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
-
-TARGET = libmyspace
-TYPE = PLUGIN
-
-# Static or Plugin...
-ifeq ($(TYPE),STATIC)
- DEFINES += -DSTATIC
- DLL_INSTALL_DIR = $(PURPLE_INSTALL_DIR)
-else
-ifeq ($(TYPE),PLUGIN)
- DLL_INSTALL_DIR = $(PURPLE_INSTALL_PLUGINS_DIR)
-endif
-endif
-
-##
-## INCLUDE PATHS
-##
-INCLUDE_PATHS += -I. \
- -I$(GTK_TOP)/include \
- -I$(GTK_TOP)/include/glib-2.0 \
- -I$(GTK_TOP)/lib/glib-2.0/include \
- -I$(PURPLE_TOP) \
- -I$(PURPLE_TOP)/win32 \
- -I$(PIDGIN_TREE_TOP)
-
-LIB_PATHS = -L$(GTK_TOP)/lib \
- -L$(PURPLE_TOP)
-
-##
-## SOURCES, OBJECTS
-##
-C_SRC = myspace.c message.c zap.c session.c markup.c user.c
-
-OBJECTS = $(C_SRC:%.c=%.o)
-
-##
-## LIBRARIES
-##
-LIBS = \
- -lglib-2.0 \
- -lgobject-2.0 \
- -lws2_32 \
- -lintl \
- -lpurple
-
-include $(PIDGIN_COMMON_RULES)
-
-##
-## TARGET DEFINITIONS
-##
-.PHONY: all install clean
-
-all: $(TARGET).dll
-
-install: all $(DLL_INSTALL_DIR)
- cp $(TARGET).dll $(DLL_INSTALL_DIR)
-
-$(OBJECTS): $(PURPLE_CONFIG_H)
-
-##
-## BUILD DLL
-##
-$(TARGET).dll: $(PURPLE_DLL).a $(OBJECTS)
- $(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET).dll
-
-##
-## CLEAN RULES
-##
-
-clean:
- rm -f $(OBJECTS)
- rm -f $(TARGET).dll
-
-include $(PIDGIN_COMMON_TARGETS)
diff --git a/libpurple/protocols/myspace/README b/libpurple/protocols/myspace/README
deleted file mode 100644
--- a/libpurple/protocols/myspace/README
+++ /dev/null
@@ -1,27 +0,0 @@
-MySpaceIM Protocol Plugin for libpurple by Jeff Connelly 2007-08-07
-
-Greetings. This package contains a plugin for libpurple (as used in
-Pidgin, formerly Gaim) to connect to the new MySpaceIM instant messaging
-network and send/receive messages. Functionality is only basic as of yet,
-and this code should be considered alpha quality.
-
-This code was initially developed under Google Summer of Code 2007.
-
-For features and TODO, see https://developer.pidgin.im/wiki/MySpaceIM
-
-Usage:
-
-Login using your _email address_ you use to login to myspace.com. You can't
-login using your numeric ID or alias.
-
-To test it out, send a message to yourself (by your username or numeric
-uid (email not yet supported)) or tom (6221). In either case you should
-get a reply. You should also be able to talk to other MySpaceIM users if
-you desire. Replies will always be shown as coming from a user's username,
-even if you IM by email or userid.
-
-Feedback welcome. You can IM my test account at "msimprpl" if you feel like it.
-
-Enjoy,
--Jeff Connelly
-msimprpl at xyzzy.cjb.net
diff --git a/libpurple/protocols/myspace/markup.c b/libpurple/protocols/myspace/markup.c
deleted file mode 100644
--- a/libpurple/protocols/myspace/markup.c
+++ /dev/null
@@ -1,763 +0,0 @@
-/* MySpaceIM Protocol Plugin - markup
- *
- * Copyright (C) 2007, Jeff Connelly <jeff2 at soc.pidgin.im>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
- */
-
-#include "myspace.h"
-
-typedef int (*MSIM_XMLNODE_CONVERT)(MsimSession *, PurpleXmlNode *, gchar **, gchar **);
-
-/* Globals */
-
-/* The names in in emoticon_names (for <i n=whatever>) map to corresponding
- * entries in emoticon_symbols (for the ASCII representation of the emoticon).
- *
- * Multiple emoticon symbols in Pidgin can map to one name. List the
- * canonical form, as inserted by the "Smile!" dialog, first. For example,
- * :) comes before :-), because although both are recognized as 'happy',
- * the first is inserted by the smiley button (first symbol in theme).
- *
- * Note that symbols are case-sensitive in Pidgin -- :-X is not :-x. */
-static struct MSIM_EMOTICON
-{
- gchar *name;
- gchar *symbol;
-} msim_emoticons[] = {
More information about the Commits
mailing list