Mercurial > pidgin

changeset 30742:a99b6dcdb60d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove unnecesary includes from msn.h. Replace msn.h with the needed includes, most of the cases only debug.h was needed.
author masca@cpw.pidgin.im
date Fri, 28 May 2010 08:05:38 +0000
parents 417899347f8a
children a6975076d86e
files libpurple/protocols/msn/cmdproc.c libpurple/protocols/msn/command.c libpurple/protocols/msn/contact.c libpurple/protocols/msn/directconn.c libpurple/protocols/msn/error.c libpurple/protocols/msn/msg.c libpurple/protocols/msn/msn.c libpurple/protocols/msn/msn.h libpurple/protocols/msn/nexus.c libpurple/protocols/msn/notification.c libpurple/protocols/msn/oim.c libpurple/protocols/msn/servconn.c libpurple/protocols/msn/session.c libpurple/protocols/msn/slp.c libpurple/protocols/msn/slpcall.c libpurple/protocols/msn/slplink.c libpurple/protocols/msn/slpmsg.c libpurple/protocols/msn/state.c libpurple/protocols/msn/switchboard.c libpurple/protocols/msn/transaction.c libpurple/protocols/msn/user.c libpurple/protocols/msn/userlist.c
diffstat 22 files changed, 62 insertions(+), 27 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/msn/cmdproc.c	Thu May 27 22:14:53 2010 +0000
+++ b/libpurple/protocols/msn/cmdproc.c	Fri May 28 08:05:38 2010 +0000
@@ -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 *
--- a/libpurple/protocols/msn/command.c	Thu May 27 22:14:53 2010 +0000
+++ b/libpurple/protocols/msn/command.c	Fri May 28 08:05:38 2010 +0000
@@ -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
--- a/libpurple/protocols/msn/contact.c	Thu May 27 22:14:53 2010 +0000
+++ b/libpurple/protocols/msn/contact.c	Fri May 28 08:05:38 2010 +0000
@@ -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"
--- a/libpurple/protocols/msn/directconn.c	Thu May 27 22:14:53 2010 +0000
+++ b/libpurple/protocols/msn/directconn.c	Fri May 28 08:05:38 2010 +0000
@@ -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"
 
--- a/libpurple/protocols/msn/error.c	Thu May 27 22:14:53 2010 +0000
+++ b/libpurple/protocols/msn/error.c	Fri May 28 08:05:38 2010 +0000
@@ -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
--- a/libpurple/protocols/msn/msg.c	Thu May 27 22:14:53 2010 +0000
+++ b/libpurple/protocols/msn/msg.c	Fri May 28 08:05:38 2010 +0000
@@ -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"
--- a/libpurple/protocols/msn/msn.c	Thu May 27 22:14:53 2010 +0000
+++ b/libpurple/protocols/msn/msn.c	Fri May 28 08:05:38 2010 +0000
@@ -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"
--- a/libpurple/protocols/msn/msn.h	Thu May 27 22:14:53 2010 +0000
+++ b/libpurple/protocols/msn/msn.h	Fri May 28 08:05:38 2010 +0000
@@ -83,18 +83,6 @@
 
 #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"
--- a/libpurple/protocols/msn/nexus.c	Thu May 27 22:14:53 2010 +0000
+++ b/libpurple/protocols/msn/nexus.c	Fri May 28 08:05:38 2010 +0000
@@ -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"
--- a/libpurple/protocols/msn/notification.c	Thu May 27 22:14:53 2010 +0000
+++ b/libpurple/protocols/msn/notification.c	Fri May 28 08:05:38 2010 +0000
@@ -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"
--- a/libpurple/protocols/msn/oim.c	Thu May 27 22:14:53 2010 +0000
+++ b/libpurple/protocols/msn/oim.c	Fri May 28 08:05:38 2010 +0000
@@ -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"
--- a/libpurple/protocols/msn/servconn.c	Thu May 27 22:14:53 2010 +0000
+++ b/libpurple/protocols/msn/servconn.c	Fri May 28 08:05:38 2010 +0000
@@ -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"
 
--- a/libpurple/protocols/msn/session.c	Thu May 27 22:14:53 2010 +0000
+++ b/libpurple/protocols/msn/session.c	Fri May 28 08:05:38 2010 +0000
@@ -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"
--- a/libpurple/protocols/msn/slp.c	Thu May 27 22:14:53 2010 +0000
+++ b/libpurple/protocols/msn/slp.c	Fri May 28 08:05:38 2010 +0000
@@ -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"
--- a/libpurple/protocols/msn/slpcall.c	Thu May 27 22:14:53 2010 +0000
+++ b/libpurple/protocols/msn/slpcall.c	Fri May 28 08:05:38 2010 +0000
@@ -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"
 
--- a/libpurple/protocols/msn/slplink.c	Thu May 27 22:14:53 2010 +0000
+++ b/libpurple/protocols/msn/slplink.c	Fri May 28 08:05:38 2010 +0000
@@ -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"
 
--- a/libpurple/protocols/msn/slpmsg.c	Thu May 27 22:14:53 2010 +0000
+++ b/libpurple/protocols/msn/slpmsg.c	Fri May 28 08:05:38 2010 +0000
@@ -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"
 
--- a/libpurple/protocols/msn/state.c	Thu May 27 22:14:53 2010 +0000
+++ b/libpurple/protocols/msn/state.c	Fri May 28 08:05:38 2010 +0000
@@ -23,10 +23,10 @@
  */
 
 #include "internal.h"
+#include "debug.h"
 
 #include "core.h"
 
-#include "msn.h"
 #include "notification.h"
 #include "state.h"
 
--- a/libpurple/protocols/msn/switchboard.c	Thu May 27 22:14:53 2010 +0000
+++ b/libpurple/protocols/msn/switchboard.c	Fri May 28 08:05:38 2010 +0000
@@ -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"
--- a/libpurple/protocols/msn/transaction.c	Thu May 27 22:14:53 2010 +0000
+++ b/libpurple/protocols/msn/transaction.c	Fri May 28 08:05:38 2010 +0000
@@ -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"
 
--- a/libpurple/protocols/msn/user.c	Thu May 27 22:14:53 2010 +0000
+++ b/libpurple/protocols/msn/user.c	Fri May 28 08:05:38 2010 +0000
@@ -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"
 
--- a/libpurple/protocols/msn/userlist.c	Thu May 27 22:14:53 2010 +0000
+++ b/libpurple/protocols/msn/userlist.c	Fri May 28 08:05:38 2010 +0000
@@ -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"