/soc/2013/ankitkv/gobjectification: 5bef44ba334a: Build a single...
Ankit Vani
a at nevitus.org
Tue Sep 3 17:14:45 EDT 2013
Changeset: 5bef44ba334abbbbf1e4e9e7c91d665c5d1dc383
Author: Ankit Vani <a at nevitus.org>
Date: 2013-09-04 01:21 +0530
Branch: soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/5bef44ba334a
Description:
Build a single library for jabber.
Renamed lib{gtalk|facebook|xmpp}.[ch] to {gtalk|facebook|xmpp}.[ch].
diffstat:
libpurple/protocols/jabber/Makefile.am | 30 ++++++++++--------------------
libpurple/protocols/jabber/libfacebook.c | 2 +-
libpurple/protocols/jabber/libfacebook.h | 6 +++---
libpurple/protocols/jabber/libgtalk.c | 2 +-
libpurple/protocols/jabber/libgtalk.h | 6 +++---
libpurple/protocols/jabber/libxmpp.c | 2 +-
libpurple/protocols/jabber/libxmpp.h | 6 +++---
7 files changed, 22 insertions(+), 32 deletions(-)
diffs (182 lines):
diff --git a/libpurple/protocols/jabber/Makefile.am b/libpurple/protocols/jabber/Makefile.am
--- a/libpurple/protocols/jabber/Makefile.am
+++ b/libpurple/protocols/jabber/Makefile.am
@@ -27,6 +27,8 @@ JABBERSOURCES = \
data.h \
disco.c \
disco.h \
+ facebook.c \
+ facebook.h \
google/gmail.c \
google/gmail.h \
google/google.c \
@@ -43,6 +45,8 @@ JABBERSOURCES = \
google/jingleinfo.h \
google/relay.c \
google/relay.h \
+ gtalk.c \
+ gtalk.h \
ibb.c \
ibb.h \
iq.c \
@@ -91,11 +95,13 @@ JABBERSOURCES = \
usertune.c \
usertune.h \
xdata.c \
- xdata.h
+ xdata.h \
+ xmpp.c \
+ xmpp.h
AM_CFLAGS = $(st)
-libxmpp_la_LDFLAGS = -module -avoid-version
+libjabber_la_LDFLAGS = -module -avoid-version
if USE_CYRUS_SASL
JABBERSOURCES += auth_cyrus.c
@@ -105,34 +111,18 @@ if STATIC_JABBER
st = -DPURPLE_STATIC_PRPL
noinst_LTLIBRARIES = libjabber.la
-libjabber_la_SOURCES = $(JABBERSOURCES) \
- libfacebook.c \
- libfacebook.h \
- libgtalk.c \
- libgtalk.h \
- libxmpp.c \
- libxmpp.h
-
+libjabber_la_SOURCES = $(JABBERSOURCES)
libjabber_la_CFLAGS = $(AM_CFLAGS)
else
st =
-pkg_LTLIBRARIES = libjabber.la libfacebook.la libgtalk.la libxmpp.la
+pkg_LTLIBRARIES = libjabber.la
libjabber_la_SOURCES = $(JABBERSOURCES)
libjabber_la_LIBADD = $(GLIB_LIBS) $(SASL_LIBS) $(LIBXML_LIBS) $(IDN_LIBS)\
$(FARSTREAM_LIBS) \
$(GSTREAMER_LIBS)
-libfacebook_la_SOURCES = libfacebook.c libfacebook.h
-libfacebook_la_LIBADD = libjabber.la
-
-libgtalk_la_SOURCES = libgtalk.c libgtalk.h
-libgtalk_la_LIBADD = libjabber.la
-
-libxmpp_la_SOURCES = libxmpp.c libxmpp.h
-libxmpp_la_LIBADD = libjabber.la
-
endif
AM_CPPFLAGS = \
diff --git a/libpurple/protocols/jabber/libfacebook.c b/libpurple/protocols/jabber/facebook.c
rename from libpurple/protocols/jabber/libfacebook.c
rename to libpurple/protocols/jabber/facebook.c
--- a/libpurple/protocols/jabber/libfacebook.c
+++ b/libpurple/protocols/jabber/facebook.c
@@ -30,7 +30,7 @@
#include "core.h"
#include "plugins.h"
-#include "libfacebook.h"
+#include "facebook.h"
static PurpleProtocol *my_protocol = NULL;
diff --git a/libpurple/protocols/jabber/libfacebook.h b/libpurple/protocols/jabber/facebook.h
rename from libpurple/protocols/jabber/libfacebook.h
rename to libpurple/protocols/jabber/facebook.h
--- a/libpurple/protocols/jabber/libfacebook.h
+++ b/libpurple/protocols/jabber/facebook.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*
*/
-#ifndef _LIBFACEBOOK_H_
-#define _LIBFACEBOOK_H_
+#ifndef _FACEBOOK_H_
+#define _FACEBOOK_H_
#include "jabber.h"
@@ -46,4 +46,4 @@ typedef struct _FacebookProtocolClass
*/
GType facebook_protocol_get_type(void);
-#endif /* _LIBFACEBOOK_H_ */
+#endif /* _FACEBOOK_H_ */
diff --git a/libpurple/protocols/jabber/libgtalk.c b/libpurple/protocols/jabber/gtalk.c
rename from libpurple/protocols/jabber/libgtalk.c
rename to libpurple/protocols/jabber/gtalk.c
--- a/libpurple/protocols/jabber/libgtalk.c
+++ b/libpurple/protocols/jabber/gtalk.c
@@ -30,7 +30,7 @@
#include "core.h"
#include "plugins.h"
-#include "libgtalk.h"
+#include "gtalk.h"
static PurpleProtocol *my_protocol = NULL;
diff --git a/libpurple/protocols/jabber/libgtalk.h b/libpurple/protocols/jabber/gtalk.h
rename from libpurple/protocols/jabber/libgtalk.h
rename to libpurple/protocols/jabber/gtalk.h
--- a/libpurple/protocols/jabber/libgtalk.h
+++ b/libpurple/protocols/jabber/gtalk.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*
*/
-#ifndef _LIBGTALK_H_
-#define _LIBGTALK_H_
+#ifndef _GTALK_H_
+#define _GTALK_H_
#include "jabber.h"
@@ -46,4 +46,4 @@ typedef struct _GTalkProtocolClass
*/
GType gtalk_protocol_get_type(void);
-#endif /* _LIBGTALK_H_ */
+#endif /* _GTALK_H_ */
diff --git a/libpurple/protocols/jabber/libxmpp.c b/libpurple/protocols/jabber/xmpp.c
rename from libpurple/protocols/jabber/libxmpp.c
rename to libpurple/protocols/jabber/xmpp.c
--- a/libpurple/protocols/jabber/libxmpp.c
+++ b/libpurple/protocols/jabber/xmpp.c
@@ -30,7 +30,7 @@
#include "core.h"
#include "plugins.h"
-#include "libxmpp.h"
+#include "xmpp.h"
static PurpleProtocol *my_protocol = NULL;
diff --git a/libpurple/protocols/jabber/libxmpp.h b/libpurple/protocols/jabber/xmpp.h
rename from libpurple/protocols/jabber/libxmpp.h
rename to libpurple/protocols/jabber/xmpp.h
--- a/libpurple/protocols/jabber/libxmpp.h
+++ b/libpurple/protocols/jabber/xmpp.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*
*/
-#ifndef _LIBXMPP_H_
-#define _LIBXMPP_H_
+#ifndef _XMPP_H_
+#define _XMPP_H_
#include "jabber.h"
@@ -46,4 +46,4 @@ typedef struct _XMPPProtocolClass
*/
GType xmpp_protocol_get_type(void);
-#endif /* _LIBXMPP_H_ */
+#endif /* _XMPP_H_ */
More information about the Commits
mailing list