[empathy: 3/3] Merge branch 'debug-window'

[Xavier Claessens <xclaesse src gnome org>]

commit 1669cc99bae84e2506bb6b671843bd980f16b2bc
Merge: fbaa610... 13c650f...
Author: Xavier Claessens <xclaesse gmail com>
Date:   Wed Aug 26 09:54:29 2009 +0200

    Merge branch 'debug-window'
    
    Conflicts:
    	src/empathy-debug-window.c

 src/Makefile.am                                    |    2 +-
 src/empathy-debug-dialog.h                         |   63 -----
 ...pathy-debug-dialog.c => empathy-debug-window.c} |  242 ++++++++++----------
 src/empathy-debug-window.h                         |   63 +++++
 src/empathy-main-window.c                          |    4 +-
 5 files changed, 188 insertions(+), 186 deletions(-)
---
diff --cc src/Makefile.am
index 6896c03,9faea86..980f002
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -36,15 -35,12 +36,15 @@@ empathy_handwritten_source = 
  	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-debug-window.c empathy-debug-window.h			\
  	empathy-chat-window.c empathy-chat-window.h			\
  	empathy-event-manager.c empathy-event-manager.h			\
 +	empathy-import-mc4-accounts.c empathy-import-mc4-accounts.h	\
  	empathy-ft-manager.c empathy-ft-manager.h			\
  	empathy-import-dialog.c empathy-import-dialog.h			\
 +	empathy-import-widget.c empathy-import-widget.h			\
  	empathy-import-pidgin.c empathy-import-pidgin.h			\
 +	empathy-import-utils.c empathy-import-utils.h			\
  	empathy-main-window.c empathy-main-window.h			\
  	empathy-misc.c empathy-misc.h					\
  	empathy-new-chatroom-dialog.c empathy-new-chatroom-dialog.h	\
diff --cc src/empathy-debug-window.c
index d71542d,12b7eeb..e2f7202
--- a/src/empathy-debug-window.c
+++ b/src/empathy-debug-window.c
@@@ -280,10 -280,11 +280,10 @@@ debug_window_get_messages_cb (TpProxy *
  }
  
  static void
- debug_dialog_cm_chooser_changed_cb (GtkComboBox *cm_chooser,
-     EmpathyDebugDialog *debug_dialog)
+ debug_window_cm_chooser_changed_cb (GtkComboBox *cm_chooser,
+     EmpathyDebugWindow *debug_window)
  {
-   EmpathyDebugDialogPriv *priv = GET_PRIV (debug_dialog);
+   EmpathyDebugWindowPriv *priv = GET_PRIV (debug_window);
 -  MissionControl *mc;
    TpDBusDaemon *dbus;
    GError *error = NULL;
    gchar *bus_name;
@@@ -338,9 -341,10 +338,9 @@@
    tp_proxy_add_interface_by_id (priv->proxy, emp_iface_quark_debug ());
  
    emp_cli_debug_call_get_messages (priv->proxy, -1,
-       debug_dialog_get_messages_cb, debug_dialog, NULL, NULL);
+       debug_window_get_messages_cb, debug_window, NULL, NULL);
  
    g_object_unref (dbus);
 -  g_object_unref (mc);
  }
  
  typedef struct