rendered paste body#
#
# patch "libpurple/protocols/msn/cmdproc.c"
# from [b784e3ff7a7febe1306288a22cc334ef234721f8]
# to [c9a4ff348a884da1830f934099f05abc04181eeb]
#
# patch "libpurple/protocols/msn/command.c"
# from [6b87cf6d057c7316c02d2bb0963d306c705903f6]
# to [40dc8d52ac2cd25f0a39ebc1cd63f00a56ba0aaf]
#
# patch "libpurple/protocols/msn/contact.c"
# from [5da17d0a0c99522bf27a7b90e979840b71aa6529]
# to [f4b50f718e065ddad4673fc47f041159007692b9]
#
# patch "libpurple/protocols/msn/directconn.c"
# from [21df6e8a863a710fb6c63347b6d80a863faf1071]
# to [251869dd95cfd01f832233c111dd0270d6944981]
#
# patch "libpurple/protocols/msn/error.c"
# from [8d33dd4ecd569adfed1f40fb5577414afbedbdd6]
# to [a023b07a6cbea0c782f73da878b8a69a92cefa68]
#
# patch "libpurple/protocols/msn/msg.c"
# from [8e4cd2074eaa4ec3e517ec78a21113345073e073]
# to [3097eb922d25acbb560e95ad4b248a402f9325f1]
#
# patch "libpurple/protocols/msn/msn.c"
# from [6fdfb4ba18b54aa48956b97270849951aff037d4]
# to [b64a4f39e8a3a9b57dd12c67f3e5e735a6761f58]
#
# patch "libpurple/protocols/msn/msn.h"
# from [23aeabe84887f5a56a8d5540614beec9a20d54dd]
# to [9b4ea0d4df35c5f1c38443635f30667f2b7da3dc]
#
# patch "libpurple/protocols/msn/nexus.c"
# from [53079e3db6bb1f9e7f40c75fe0b90d3ac651f543]
# to [df35ce7fdd8a3e3788b8338e1aa9277b6c605e1a]
#
# patch "libpurple/protocols/msn/notification.c"
# from [a14229c9f796f0e82458001cf52e39331a313395]
# to [9a84227a0dc237d9b7335674afae0a7e20cdfedb]
#
# patch "libpurple/protocols/msn/oim.c"
# from [3e136ef5911a7f3edb95b22cde0e9fb8280086a4]
# to [db228e817d68dc930e7e27f245532a0fa11b852d]
#
# patch "libpurple/protocols/msn/servconn.c"
# from [1df0225b419679610dd807ce9daf4feb92405919]
# to [203fbbdc2a84666ae0495116eedc1f20c9f10e8c]
#
# patch "libpurple/protocols/msn/session.c"
# from [d822a80f01e188823a57ae9233bc6a059909fd7c]
# to [bdb464c809a2d94d1d28bc253efb04207883f13b]
#
# patch "libpurple/protocols/msn/slp.c"
# from [d0b03809f9c371b2af8fc1a1898d03b46da9dc1a]
# to [50288c93d9a1452e96986318ab260e17d654ab54]
#
# patch "libpurple/protocols/msn/slpcall.c"
# from [6bc12efafffec9f0cf74910ba6be61eb65167bbb]
# to [ae7e451f37059ed9ee912ac7848aba8d6c860fb6]
#
# patch "libpurple/protocols/msn/slplink.c"
# from [f5a38f70c0508a73b442a1303e2ba1dc00d0e4bf]
# to [b864ded5a018dac0919b8a87eeaea86f8bd858ef]
#
# patch "libpurple/protocols/msn/slpmsg.c"
# from [918ae21b3e5386ce0cb06eea47654b9741a96230]
# to [3bbaf9295182852e3ccb0defac59cc1b14bf2585]
#
# patch "libpurple/protocols/msn/state.c"
# from [0919056fe84c88fc4faa59cb40407cdd3b895bf5]
# to [d161a79f1526fc4f61a1ecb22a33cef9145a7e7a]
#
# patch "libpurple/protocols/msn/switchboard.c"
# from [83c3ca16bf9e62336ce8985821307e69507cfad7]
# to [4811fa5638f7fb1c1960ddf3345a94dc20fd5710]
#
# patch "libpurple/protocols/msn/transaction.c"
# from [0ab94e772b185096a51820c3e685b56e06595996]
# to [ec34904e685258e8a0e3753e51d3e6a43eef8117]
#
# patch "libpurple/protocols/msn/user.c"
# from [debd8b72139bca885422efed84284e1954207ce1]
# to [e5e43079857cdb54e99f66d5c69e26d439b4f18e]
#
# patch "libpurple/protocols/msn/userlist.c"
# from [55316d6e01132e0c66b0e0e3048623b7366f1779]
# to [00bafeb66099795f6118535df8b4df6308d6e606]
#
============================================================
--- libpurple/protocols/msn/cmdproc.c b784e3ff7a7febe1306288a22cc334ef234721f8
+++ libpurple/protocols/msn/cmdproc.c c9a4ff348a884da1830f934099f05abc04181eeb
@@ -21,7 +21,9 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
-#include "msn.h"
+
+#include "debug.h"
+
#include "cmdproc.h"
MsnCmdProc *
============================================================
--- libpurple/protocols/msn/command.c 6b87cf6d057c7316c02d2bb0963d306c705903f6
+++ libpurple/protocols/msn/command.c 40dc8d52ac2cd25f0a39ebc1cd63f00a56ba0aaf
@@ -21,7 +21,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
-#include "msn.h"
#include "command.h"
static gboolean
============================================================
--- libpurple/protocols/msn/contact.c 5da17d0a0c99522bf27a7b90e979840b71aa6529
+++ libpurple/protocols/msn/contact.c f4b50f718e065ddad4673fc47f041159007692b9
@@ -24,7 +24,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "msn.h"
+#include "debug.h"
+
#include "contact.h"
#include "xmlnode.h"
#include "group.h"
============================================================
--- libpurple/protocols/msn/directconn.c 21df6e8a863a710fb6c63347b6d80a863faf1071
+++ libpurple/protocols/msn/directconn.c 251869dd95cfd01f832233c111dd0270d6944981
@@ -21,6 +21,10 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
+
+#include "cipher.h"
+#include "debug.h"
+
#include "msn.h"
#include "directconn.h"
============================================================
--- libpurple/protocols/msn/error.c 8d33dd4ecd569adfed1f40fb5577414afbedbdd6
+++ libpurple/protocols/msn/error.c a023b07a6cbea0c782f73da878b8a69a92cefa68
@@ -21,7 +21,11 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
-#include "msn.h"
+
+#include "debug.h"
+/* Masca: can we get rid of the sync issue dialog? */
+#include "request.h"
+
#include "error.h"
typedef struct
============================================================
--- libpurple/protocols/msn/msg.c 8e4cd2074eaa4ec3e517ec78a21113345073e073
+++ libpurple/protocols/msn/msg.c 3097eb922d25acbb560e95ad4b248a402f9325f1
@@ -21,6 +21,9 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
+
+#include "debug.h"
+
#include "msn.h"
#include "msg.h"
#include "msnutils.h"
============================================================
--- libpurple/protocols/msn/msn.c 6fdfb4ba18b54aa48956b97270849951aff037d4
+++ libpurple/protocols/msn/msn.c b64a4f39e8a3a9b57dd12c67f3e5e735a6761f58
@@ -23,7 +23,9 @@
*/
#define PHOTO_SUPPORT 1
-#include "msn.h"
+#include "debug.h"
+#include "request.h"
+
#include "accountopt.h"
#include "contact.h"
#include "msg.h"
============================================================
--- libpurple/protocols/msn/msn.h 23aeabe84887f5a56a8d5540614beec9a20d54dd
+++ libpurple/protocols/msn/msn.h 9b4ea0d4df35c5f1c38443635f30667f2b7da3dc
@@ -83,18 +83,6 @@ typedef enum
#include "internal.h"
-#include "account.h"
-#include "accountopt.h"
-#include "blist.h"
-#include "connection.h"
-#include "conversation.h"
-#include "debug.h"
-#include "cipher.h"
-#include "notify.h"
-#include "privacy.h"
-#include "proxy.h"
-#include "prpl.h"
-#include "request.h"
#include "servconn.h"
#include "sslconn.h"
#include "util.h"
============================================================
--- libpurple/protocols/msn/nexus.c 53079e3db6bb1f9e7f40c75fe0b90d3ac651f543
+++ libpurple/protocols/msn/nexus.c df35ce7fdd8a3e3788b8338e1aa9277b6c605e1a
@@ -21,7 +21,10 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
-#include "msn.h"
+
+#include "cipher.h"
+#include "debug.h"
+
#include "soap.h"
#include "nexus.h"
#include "notification.h"
============================================================
--- libpurple/protocols/msn/notification.c a14229c9f796f0e82458001cf52e39331a313395
+++ libpurple/protocols/msn/notification.c 9a84227a0dc237d9b7335674afae0a7e20cdfedb
@@ -21,7 +21,10 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
-#include "msn.h"
+
+#include "debug.h"
+#include "cipher.h"
+
#include "core.h"
#include "notification.h"
#include "contact.h"
============================================================
--- libpurple/protocols/msn/oim.c 3e136ef5911a7f3edb95b22cde0e9fb8280086a4
+++ libpurple/protocols/msn/oim.c db228e817d68dc930e7e27f245532a0fa11b852d
@@ -23,7 +23,9 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "msn.h"
+
+#include "debug.h"
+
#include "soap.h"
#include "oim.h"
#include "msnutils.h"
============================================================
--- libpurple/protocols/msn/servconn.c 1df0225b419679610dd807ce9daf4feb92405919
+++ libpurple/protocols/msn/servconn.c 203fbbdc2a84666ae0495116eedc1f20c9f10e8c
@@ -21,7 +21,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
-#include "msn.h"
+#include "debug.h"
+
#include "servconn.h"
#include "error.h"
============================================================
--- libpurple/protocols/msn/session.c d822a80f01e188823a57ae9233bc6a059909fd7c
+++ libpurple/protocols/msn/session.c bdb464c809a2d94d1d28bc253efb04207883f13b
@@ -21,8 +21,10 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
+
+#include "debug.h"
+
#include "error.h"
-#include "msn.h"
#include "msnutils.h"
#include "session.h"
#include "notification.h"
============================================================
--- libpurple/protocols/msn/slp.c d0b03809f9c371b2af8fc1a1898d03b46da9dc1a
+++ libpurple/protocols/msn/slp.c 50288c93d9a1452e96986318ab260e17d654ab54
@@ -21,7 +21,9 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
-#include "msn.h"
+
+#include "debug.h"
+
#include "slp.h"
#include "slpcall.h"
#include "slpmsg.h"
============================================================
--- libpurple/protocols/msn/slpcall.c 6bc12efafffec9f0cf74910ba6be61eb65167bbb
+++ libpurple/protocols/msn/slpcall.c ae7e451f37059ed9ee912ac7848aba8d6c860fb6
@@ -21,7 +21,9 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
-#include "msn.h"
+
+#include "debug.h"
+
#include "msnutils.h"
#include "slpcall.h"
============================================================
--- libpurple/protocols/msn/slplink.c f5a38f70c0508a73b442a1303e2ba1dc00d0e4bf
+++ libpurple/protocols/msn/slplink.c b864ded5a018dac0919b8a87eeaea86f8bd858ef
@@ -21,6 +21,9 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
+
+#include "debug.h"
+
#include "msn.h"
#include "slplink.h"
============================================================
--- libpurple/protocols/msn/slpmsg.c 918ae21b3e5386ce0cb06eea47654b9741a96230
+++ libpurple/protocols/msn/slpmsg.c 3bbaf9295182852e3ccb0defac59cc1b14bf2585
@@ -21,7 +21,9 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
-#include "msn.h"
+
+#include "debug.h"
+
#include "slpmsg.h"
#include "slplink.h"
============================================================
--- libpurple/protocols/msn/state.c 0919056fe84c88fc4faa59cb40407cdd3b895bf5
+++ libpurple/protocols/msn/state.c d161a79f1526fc4f61a1ecb22a33cef9145a7e7a
@@ -23,10 +23,10 @@
*/
#include "internal.h"
+#include "debug.h"
#include "core.h"
-#include "msn.h"
#include "notification.h"
#include "state.h"
============================================================
--- libpurple/protocols/msn/switchboard.c 83c3ca16bf9e62336ce8985821307e69507cfad7
+++ libpurple/protocols/msn/switchboard.c 4811fa5638f7fb1c1960ddf3345a94dc20fd5710
@@ -21,6 +21,9 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
+
+#include "debug.h"
+
#include "msn.h"
#include "prefs.h"
#include "switchboard.h"
============================================================
--- libpurple/protocols/msn/transaction.c 0ab94e772b185096a51820c3e685b56e06595996
+++ libpurple/protocols/msn/transaction.c ec34904e685258e8a0e3753e51d3e6a43eef8117
@@ -21,6 +21,9 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
+
+#include "debug.h"
+
#include "msn.h"
#include "transaction.h"
============================================================
--- libpurple/protocols/msn/user.c debd8b72139bca885422efed84284e1954207ce1
+++ libpurple/protocols/msn/user.c e5e43079857cdb54e99f66d5c69e26d439b4f18e
@@ -21,7 +21,9 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
-#include "msn.h"
+
+#include "debug.h"
+
#include "user.h"
#include "slp.h"
============================================================
--- libpurple/protocols/msn/userlist.c 55316d6e01132e0c66b0e0e3048623b7366f1779
+++ libpurple/protocols/msn/userlist.c 00bafeb66099795f6118535df8b4df6308d6e606
@@ -21,6 +21,10 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
+
+#include "debug.h"
+#include "request.h"
+
#include "msn.h"
#include "userlist.h"