Mercurial > pidgin
changeset 30472:ae615b3d3e47
First shot at refactoring the Google-specific XMPP code.
TODO: decouple GoogleSession from PurpleMedia
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Thu, 25 Mar 2010 20:16:48 +0000 |
| parents | e3eda7aa0653 |
| children | 34f586bffe4e |
| 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 |
| diffstat | 10 files changed, 35 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/Makefile.am Mon Mar 22 22:23:35 2010 +0000 +++ b/libpurple/protocols/jabber/Makefile.am Thu Mar 25 20:16:48 2010 +0000 @@ -26,8 +26,18 @@ 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 \
--- a/libpurple/protocols/jabber/Makefile.mingw Mon Mar 22 22:23:35 2010 +0000 +++ b/libpurple/protocols/jabber/Makefile.mingw Thu Mar 25 20:16:48 2010 +0000 @@ -55,7 +55,12 @@ 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 \
--- a/libpurple/protocols/jabber/buddy.c Mon Mar 22 22:23:35 2010 +0000 +++ b/libpurple/protocols/jabber/buddy.c Thu Mar 25 20:16:48 2010 +0000 @@ -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;
--- a/libpurple/protocols/jabber/disco.c Mon Mar 22 22:23:35 2010 +0000 +++ b/libpurple/protocols/jabber/disco.c Thu Mar 25 20:16:48 2010 +0000 @@ -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"
--- a/libpurple/protocols/jabber/iq.c Mon Mar 22 22:23:35 2010 +0000 +++ b/libpurple/protocols/jabber/iq.c Thu Mar 25 20:16:48 2010 +0000 @@ -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"
--- a/libpurple/protocols/jabber/jabber.c Mon Mar 22 22:23:35 2010 +0000 +++ b/libpurple/protocols/jabber/jabber.c Thu Mar 25 20:16:48 2010 +0000 @@ -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"
--- a/libpurple/protocols/jabber/libxmpp.c Mon Mar 22 22:23:35 2010 +0000 +++ b/libpurple/protocols/jabber/libxmpp.c Thu Mar 25 20:16:48 2010 +0000 @@ -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"
--- a/libpurple/protocols/jabber/message.c Mon Mar 22 22:23:35 2010 +0000 +++ b/libpurple/protocols/jabber/message.c Thu Mar 25 20:16:48 2010 +0000 @@ -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"
--- a/libpurple/protocols/jabber/presence.c Mon Mar 22 22:23:35 2010 +0000 +++ b/libpurple/protocols/jabber/presence.c Thu Mar 25 20:16:48 2010 +0000 @@ -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"
--- a/libpurple/protocols/jabber/roster.c Mon Mar 22 22:23:35 2010 +0000 +++ b/libpurple/protocols/jabber/roster.c Thu Mar 25 20:16:48 2010 +0000 @@ -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"