/soc/2013/ankitkv/gobjectification: 48829036ea9b: Backed out cha...

[Ankit Vani]

Changeset: 48829036ea9b9a5fdf2262f0db7cddb713664d24
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-08-19 21:34 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/48829036ea9b

Description:

Backed out changeset 59acaa1605f4

diffstat:

 libpurple/Makefile.am |   6 ++----
 libpurple/protocol.c  |  25 -------------------------
 libpurple/protocol.h  |   2 +-
 libpurple/protocols.h |  32 --------------------------------
 libpurple/purple.h.in |   2 +-
 5 files changed, 4 insertions(+), 63 deletions(-)

diffs (126 lines):

diff --git a/libpurple/Makefile.am b/libpurple/Makefile.am
--- a/libpurple/Makefile.am
+++ b/libpurple/Makefile.am
@@ -82,7 +82,6 @@ purple_coresources = \
 	presence.c \
 	proxy.c \
 	protocol.c \
-	protocols.c \
 	request.c \
 	roomlist.c \
 	savedstatuses.c \
@@ -154,7 +153,6 @@ purple_coreheaders = \
 	presence.h \
 	proxy.h \
 	protocol.h \
-	protocols.h \
 	request.h \
 	roomlist.h \
 	savedstatuses.h \
@@ -192,7 +190,7 @@ purple_enumheaders = \
 	connection.h \
 	conversation.h \
 	conversationtypes.h \
-	protocols.h \
+	protocol.h \
 	status.h
 
 marshallers.h: marshallers.list
@@ -234,7 +232,7 @@ dbus_exported = dbus-useful.h dbus-defin
                 blistnodetypes.h buddylist.h buddyicon.h connection.h conversation.h \
                 conversationtypes.h conversations.h core.h ft.h log.h notify.h \
                 prefs.h presence.h roomlist.h savedstatuses.h smiley.h status.h \
-                server.h util.h xmlnode.h protocol.h protocols.h
+                server.h util.h xmlnode.h protocol.h
 
 purple_build_coreheaders = $(addprefix $(srcdir)/, $(purple_coreheaders)) \
 		$(addprefix $(srcdir)/media/, $(purple_mediaheaders)) \
diff --git a/libpurple/protocol.c b/libpurple/protocol.c
deleted file mode 100644
--- a/libpurple/protocol.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * purple
- *
- * Purple is the legal property of its developers, whose names are too numerous
- * to list here.  Please refer to the COPYRIGHT file distributed with this
- * source distribution.
- *
- * 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 "internal.h"
-#include "protocol.h"
-
diff --git a/libpurple/protocol.h b/libpurple/protocol.h
--- a/libpurple/protocol.h
+++ b/libpurple/protocol.h
@@ -1,5 +1,5 @@
 /**
- * @file protocol.h PurpleProtocol and PurpleProtocolInterface API
+ * @file protocol.h Protocol API
  * @ingroup core
  */
 
diff --git a/libpurple/protocols.h b/libpurple/protocols.h
deleted file mode 100644
--- a/libpurple/protocols.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * @file protocols.h Protocol subsystem API
- * @ingroup core
- */
-
-/* purple
- *
- * Purple is the legal property of its developers, whose names are too numerous
- * to list here.  Please refer to the COPYRIGHT file distributed with this
- * source distribution.
- *
- * 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
- */
-
-#ifndef _PURPLE_PROTOCOLS_H_
-#define _PURPLE_PROTOCOLS_H_
-
-#include "protocol.h"
-
-#endif /* _PROTOCOLS_H_ */
diff --git a/libpurple/purple.h.in b/libpurple/purple.h.in
--- a/libpurple/purple.h.in
+++ b/libpurple/purple.h.in
@@ -77,7 +77,7 @@
 #include <prefs.h>
 #include <presence.h>
 #include <proxy.h>
-#include <protocols.h>
+#include <protocol.h>
 #include <request.h>
 #include <roomlist.h>
 #include <savedstatuses.h>