From: Jonny Lamb <jonny.lamb@collabora.co.uk>
Date: Thu, 4 Jun 2009 16:09:44 +0000 (+0100)
Subject: Merge branch 'debug'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=b1d33938778faa1faa3687e87bb8646d6668992d

Merge branch 'debug'

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

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

b1d33938778faa1faa3687e87bb8646d6668992d
diff --cc extensions/Makefile.am
index 85d2c0ed,f179ebc1..0ed6fc52
--- 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 8b29ebb7,38e802e9..dd3125fb
--- 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 f5f4f401,01b279d1..e80a29c6
--- 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 8973d533,b776396a..081b6f4f
--- 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 6dcd6975,9015a5d2..5830d2b7
--- 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>