Merge branch 'debug'

Conflicts:
	extensions/Makefile.am
	extensions/misc.xml
	po/POTFILES.in

Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

diff --cc extensions/Makefile.am
index 85d2c0eda2713256eb0e9298c8f7cbb924ab3894,f179ebc1972907ed6e7827da6cfd5c0cdec2d335..0ed6fc5223a5f97df74e6b1d85b147a4bb09a008
--- 1/extensions/Makefile.am
--- 2/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@@ -15,8 -13,11 +15,9 @@@ EXTRA_DIST = 
      generic-types.xml \
      misc.xml \
      Channel_Handler.xml \
-     Tube_Handler.xml
 +    Connection_Interface_Location.xml \
 -    Channel_Interface_Tube.xml \
 -    Channel_Type_DBus_Tube.xml \
 -    Channel_Type_Stream_Tube.xml \
+     Tube_Handler.xml \
+     Debug.xml
  
  noinst_LTLIBRARIES = libemp-extensions.la
  

diff --cc extensions/misc.xml
index 8b29ebb7cb5d27228623bc97cc18e5bcf40742d9,38e802e97485145cb0b445f37b717689542fa798..dd3125fb280ab2b5d930ee5651aff29ca25168cd
--- 1/extensions/misc.xml
--- 2/extensions/misc.xml
+++ b/extensions/misc.xml
@@@ -6,6 -6,9 +6,7 @@@
  
  <xi:include href="Channel_Handler.xml"/>
  <xi:include href="Tube_Handler.xml"/>
 -<xi:include href="Channel_Interface_Tube.xml" />
 -<xi:include href="Channel_Type_DBus_Tube.xml" />
 -<xi:include href="Channel_Type_Stream_Tube.xml" />
 +<xi:include href="Connection_Interface_Location.xml"/>
+ <xi:include href="Debug.xml" />
  
  </tp:spec>

diff --cc po/POTFILES.in
index f5f4f401b256b8f718bbe5d2fc0a408219450642,01b279d1a7ac28736fd06c573e2c95214c2ec8dd..e80a29c67d2c908c9074dd234461dbea90af5a3c
--- 1/po/POTFILES.in
--- 2/po/POTFILES.in
+++ b/po/POTFILES.in
@@@ -81,6 -80,5 +81,7 @@@ src/empathy-preferences.
  src/empathy-status-icon.c
  [type: gettext/glade]src/empathy-status-icon.ui
  src/empathy-tube-dispatch.c
 -
 +[type: gettext/glade]src/empathy-call-window-fullscreen.ui
 +src/empathy-map-view.c
 +[type: gettext/glade]src/empathy-map-view.ui
+ src/empathy-debug-dialog.c

diff --cc src/Makefile.am
index 8973d533f28ee21dc39d46fdc3e83f85440f9db7,b776396aaa13a78ca8ac5fbb702630f9770f9efe..081b6f4f2aced30d142f0f9b58cc9ccb9416c3f8
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -29,8 -26,8 +29,9 @@@ empathy_handwritten_source = 
        empathy-about-dialog.c empathy-about-dialog.h                   \
        empathy-accounts-dialog.c empathy-accounts-dialog.h             \
        empathy-call-window.c empathy-call-window.h                     \
 +      empathy-call-window-fullscreen.c empathy-call-window-fullscreen.h                       \
        empathy-chatrooms-window.c empathy-chatrooms-window.h           \
+       empathy-debug-dialog.c empathy-debug-dialog.h                   \
        empathy-chat-window.c empathy-chat-window.h                     \
        empathy-event-manager.c empathy-event-manager.h                 \
        empathy-ft-manager.c empathy-ft-manager.h                       \

diff --cc src/empathy-main-window.c
index 6dcd6975e58ecbb4f2cf56ba0d85908cd12542aa,9015a5d25bf30ccfa36046183565c411fe69bd39..5830d2b71b00c78c64fc5cf0a0b2a9d92f88ba20
--- 1/src/empathy-main-window.c
--- 2/src/empathy-main-window.c
+++ b/src/empathy-main-window.c
@@@ -55,11 -55,10 +55,12 @@@
  #include "ephy-spinner.h"
  #include "empathy-preferences.h"
  #include "empathy-about-dialog.h"
+ #include "empathy-debug-dialog.h"
  #include "empathy-new-chatroom-dialog.h"
 +#include "empathy-map-view.h"
  #include "empathy-chatrooms-window.h"
  #include "empathy-event-manager.h"
 +#include "empathy-ft-manager.h"
  
  #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
  #include <libempathy/empathy-debug.h>

diff --cc src/empathy-main-window.ui
Simple merge