[empathy: 53/53] Merge branch 'debug'

[Jonny Lamb <jonnylamb src gnome org>]

commit b1d33938778faa1faa3687e87bb8646d6668992d
Merge: b788f7c... c06f26d...
Author: Jonny Lamb <jonny lamb collabora co uk>
Date:   Thu Jun 4 17:09:44 2009 +0100

    Merge branch 'debug'
    
    Conflicts:
    	extensions/Makefile.am
    	extensions/misc.xml
    	po/POTFILES.in
    
    Signed-off-by: Jonny Lamb <jonny lamb collabora co uk>

 extensions/Debug.xml       |  166 ++++++
 extensions/Makefile.am     |    3 +-
 extensions/misc.xml        |    1 +
 po/POTFILES.in             |    1 +
 src/Makefile.am            |    1 +
 src/empathy-debug-dialog.c | 1244 ++++++++++++++++++++++++++++++++++++++++++++
 src/empathy-debug-dialog.h |   63 +++
 src/empathy-main-window.c  |    9 +
 src/empathy-main-window.ui |    7 +
 9 files changed, 1494 insertions(+), 1 deletions(-)

diff --cc extensions/Makefile.am
index 85d2c0e,f179ebc..0ed6fc5
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@@ -15,8 -13,11 +15,9 @@@ EXTRA_DIST = 
      generic-types.xml \
      misc.xml \
      Channel_Handler.xml \
 +    Connection_Interface_Location.xml \
-     Tube_Handler.xml
+     Tube_Handler.xml \
 -    Channel_Interface_Tube.xml \
 -    Channel_Type_DBus_Tube.xml \
 -    Channel_Type_Stream_Tube.xml \
+     Debug.xml
  
  noinst_LTLIBRARIES = libemp-extensions.la
  
diff --cc extensions/misc.xml
index 8b29ebb,38e802e..dd3125f
--- a/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 f5f4f40,01b279d..e80a29c
--- a/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 8973d53,b776396..081b6f4
--- a/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 6dcd697,9015a5d..5830d2b
--- a/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>