/soc/2013/ankitkv/gobjectification: 7004e53e3495: Merged default...
Ankit Vani
a at nevitus.org
Tue Feb 18 01:30:19 EST 2014
Changeset: 7004e53e34955d484bdbf5236c99f5cacd691fef
Author: Ankit Vani <a at nevitus.org>
Date: 2014-02-18 12:00 +0530
Branch: soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/7004e53e3495
Description:
Merged default branch
diffstat:
ChangeLog | 4 +
Makefile.am | 20 +-
configure.ac | 8 +-
libpurple/protocols.h | 7 +-
libpurple/protocols/Makefile.am | 2 +-
libpurple/protocols/Makefile.mingw | 2 +-
libpurple/protocols/gg/Makefile.am | 3 +-
libpurple/protocols/myspace/Makefile.am | 45 -
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 | 3580 ---------------------
libpurple/protocols/myspace/myspace.h | 221 -
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/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 -
pidgin/win32/nsis/pidgin-installer.nsi | 6 -
po/POTFILES.in | 3 -
42 files changed, 25 insertions(+), 7939 deletions(-)
diffs (truncated from 8334 to 300 lines):
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -48,6 +48,10 @@ 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.
+ (Robbie Vehse) (#15356)
+
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/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -83,17 +83,23 @@ if ENABLE_GNT
GNT_DIR=finch
endif
-# This is phony, so that we always try to rebuild it. If it succeeds
-# in calculating changes, it produces its target; otherwise, its
-# target does not exist.
-.PHONY: package_revision_raw.txt
+# We always try to rebuild all objects that depends on this dummy target.
+.FORCE:
+
# if both attempts fail, then we need to remove the empty file that >
# creates, and also make sure that the shell command exits
# successfully; the rm -f ensures both
-package_revision_raw.txt:
+package_revision_raw.txt: .FORCE
$(AM_V_GEN)REAL_BLDDIR=$$PWD/$(top_builddir); \
- (hg --cwd $(srcdir) id -i --debug) 2>/dev/null >$@ \
- || rm -f $@
+ (hg --cwd $(srcdir) id -i --debug) 2>/dev/null >$@.new \
+ || rm -f $@.new
+ $(AM_V_at)if test -f $@.new; then \
+ if ! diff $@ $@.new > /dev/null; then \
+ mv $@.new $@; \
+ else \
+ rm $@.new; \
+ fi \
+ fi
package_revision.h: package_revision_raw.txt
$(AM_V_GEN)if test -f $<; then \
echo "#define REVISION \"`cat $<`\"" > $@; \
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//'`
@@ -1354,7 +1354,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 ;;
@@ -1373,7 +1372,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")
@@ -1389,7 +1387,7 @@ AC_DEFINE_UNQUOTED(STATIC_PROTO_UNLOAD,
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//'`
@@ -1409,7 +1407,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 ;;
@@ -2618,7 +2615,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.h b/libpurple/protocols.h
--- a/libpurple/protocols.h
+++ b/libpurple/protocols.h
@@ -489,10 +489,9 @@ GList *purple_protocol_get_statuses(Purp
* purple_protocol_send_attention:
* @gc: The connection to send the message on.
* @who: Whose attention to request.
- * @type_code: An index into the protocol's attention_types list
- * determining the type of the attention request command to
- * send. 0 if protocol only defines one (for example, Yahoo and
- * MSN), but some protocols define more (MySpaceIM).
+ * @type_code: An index into the protocol's attention_types list determining the type
+ * of the attention request command to send. 0 if protocol only defines one
+ * (for example, Yahoo and MSN), but protocols are allowed to define more.
*
* Send an attention request message.
*
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/gg/Makefile.am b/libpurple/protocols/gg/Makefile.am
--- a/libpurple/protocols/gg/Makefile.am
+++ b/libpurple/protocols/gg/Makefile.am
@@ -56,8 +56,7 @@ INTGGSOURCES = \
INTGG_CFLAGS = -I$(top_srcdir)/libpurple/protocols/gg/lib \
$(ZLIB_CFLAGS) \
- -DGG_IGNORE_DEPRECATED \
- -DGG_INTERNAL_LIBGADU_VERSION=$(GADU_LIBGADU_VERSION)
+ -DGG_IGNORE_DEPRECATED
GADU_LIBS += $(ZLIB_LIBS)
endif
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,45 +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) \
- $(GPLUGIN_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,
More information about the Commits
mailing list