cpw.malu.xmpp.google_refactor: 35e9d717: First shot at refactoring the Google-spe...

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 35e9d7172573aa5f552d9b4b37967fc9965ebbdc
Ancestor: 4bc08b46766e0e90fc3cffefe00104882456b92f
Author: malu at pidgin.im
Date: 2010-03-25T20:16:48
Branch: im.pidgin.cpw.malu.xmpp.google_refactor
URL: http://d.pidgin.im/viewmtn/revision/info/35e9d7172573aa5f552d9b4b37967fc9965ebbdc

Modified files:
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/iq.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/roster.c

ChangeLog: 

First shot at refactoring the Google-specific XMPP code.
TODO: decouple GoogleSession from PurpleMedia

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/Makefile.am	e8fd2a79ca1e64d01ae20a8d79eaba17ef9ca3ad
+++ libpurple/protocols/jabber/Makefile.am	40c47743fa89822c3dad9364f826a9b5165dab06
@@ -26,8 +26,18 @@ JABBERSOURCES = \
 			  data.h \
 			  disco.c \
 			  disco.h \
-			  google.c \
-			  google.h \
+			  google/gmail.c \
+			  google/gmail.h \
+			  google/google.c \
+			  google/google.h \
+			  google/google_presence.c \
+			  google/google_presence.h \
+			  google/google_roster.c \
+			  google/google_roster.h \
+			  google/google_session.c \
+			  google/google_session.h \
+			  google/jingleinfo.c \
+			  google/jingleinfo.h \
 			  ibb.c \
 			  ibb.h \
 			  iq.c \
============================================================
--- libpurple/protocols/jabber/Makefile.mingw	7bb0e9cda528a26147ad515314a0f18cc66705f1
+++ libpurple/protocols/jabber/Makefile.mingw	21684906e355ce47b0955947844e33f20a391a8e
@@ -55,7 +55,12 @@ C_SRC =	\
 			chat.c \
 			data.c \
 			disco.c \
-			google.c \
+			google/gmail.c \
+			google/google.c \
+			google/google_presence.c \
+			google/google_roster.c \
+			google/google_session.c \
+			google/jingleinfo.c \
 			ibb.c \
 			iq.c \
 			jabber.c \
============================================================
--- libpurple/protocols/jabber/buddy.c	aba7addd78b84f0da611ca243b6eebbfcdf2850d
+++ libpurple/protocols/jabber/buddy.c	67d90979886125e97c9bc2713a1c396140f30e9c
@@ -38,7 +38,7 @@
 #include "xdata.h"
 #include "pep.h"
 #include "adhoccommands.h"
-#include "google.h"
+#include "google/google.h"
 
 typedef struct {
 	long idle_seconds;
============================================================
--- libpurple/protocols/jabber/disco.c	286a227929ab79f327026aed65bcc9d1adf1a13c
+++ libpurple/protocols/jabber/disco.c	71946c81d96c39fb9bfe50ebc883c1ea2760c959
@@ -30,7 +30,9 @@
 #include "adhoccommands.h"
 #include "buddy.h"
 #include "disco.h"
-#include "google.h"
+#include "google/google.h"
+#include "google/gmail.h"
+#include "google/jingleinfo.h"
 #include "iq.h"
 #include "jabber.h"
 #include "jingle/jingle.h"
============================================================
--- libpurple/protocols/jabber/iq.c	8ca0741b201d341c9835196185bfd208e2bb6e5f
+++ libpurple/protocols/jabber/iq.c	fd8b3d5e40c06e8b6c120344b5474f229c3f3f27
@@ -28,7 +28,10 @@
 
 #include "buddy.h"
 #include "disco.h"
-#include "google.h"
+#include "google/gmail.h"
+#include "google/google.h"
+#include "google/jingleinfo.h"
+#include "google/google_session.h"
 #include "iq.h"
 #include "jingle/jingle.h"
 #include "oob.h"
============================================================
--- libpurple/protocols/jabber/jabber.c	b09411d87fd0ab1a6a4546abcd8038d2ff08ee40
+++ libpurple/protocols/jabber/jabber.c	94126040f2aaa3b6fa25c16d24bd51f3d04b6109
@@ -51,7 +51,9 @@
 #include "chat.h"
 #include "data.h"
 #include "disco.h"
-#include "google.h"
+#include "google/google.h"
+#include "google/google_roster.h"
+#include "google/google_session.h"
 #include "ibb.h"
 #include "iq.h"
 #include "jutil.h"
============================================================
--- libpurple/protocols/jabber/libxmpp.c	eb3c713d4904a50323e1e11e5474a3c5af410cef
+++ libpurple/protocols/jabber/libxmpp.c	d3d33c3eb5e59b4b95ba61f57cb1f347eb19e657
@@ -41,7 +41,7 @@
 #include "si.h"
 #include "message.h"
 #include "presence.h"
-#include "google.h"
+#include "google/google.h"
 #include "pep.h"
 #include "usermood.h"
 #include "usertune.h"
============================================================
--- libpurple/protocols/jabber/message.c	4caeee14cbf11de04d3ff9565774b9581127f44f
+++ libpurple/protocols/jabber/message.c	c2a89e1f6eb072ce79f7ed2edfcb119e6b25bdaa
@@ -30,7 +30,7 @@
 #include "buddy.h"
 #include "chat.h"
 #include "data.h"
-#include "google.h"
+#include "google/google.h"
 #include "message.h"
 #include "xmlnode.h"
 #include "pep.h"
============================================================
--- libpurple/protocols/jabber/presence.c	2d9b60975109d2df702aee042359bd2531e203ef
+++ libpurple/protocols/jabber/presence.c	589e0782473627db91a29c91592a133f22d4a37b
@@ -34,7 +34,8 @@
 
 #include "buddy.h"
 #include "chat.h"
-#include "google.h"
+#include "google/google.h"
+#include "google/google_presence.h"
 #include "presence.h"
 #include "iq.h"
 #include "jutil.h"
============================================================
--- libpurple/protocols/jabber/roster.c	2a1c4c9b444c919089b4ed98041c6214a5ec97c4
+++ libpurple/protocols/jabber/roster.c	23740dd33cba905b7761f633c2537cc980c0b50a
@@ -27,7 +27,8 @@
 
 #include "buddy.h"
 #include "chat.h"
-#include "google.h"
+#include "google/google.h"
+#include "google/google_roster.h"
 #include "presence.h"
 #include "roster.h"
 #include "iq.h"