[empathy: 6/8] Improve debugging and don't use g_debug

[Sjoerd Simons <sjoerds src gnome org>]

commit 9a9ce40c7f0a6e5fc19e035dba5c1812a9d4434a
Author: Sjoerd Simons <sjoerd simons collabora co uk>
Date:   Tue Mar 2 11:17:35 2010 +0000

    Improve debugging and don't use g_debug

 src/empathy-accounts-common.c |    2 +-
 src/empathy-accounts-dialog.c |    5 +++++
 src/empathy.c                 |    1 -
 3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/src/empathy-accounts-common.c b/src/empathy-accounts-common.c
index 3032e06..334f3cb 100644
--- a/src/empathy-accounts-common.c
+++ b/src/empathy-accounts-common.c
@@ -123,7 +123,7 @@ connection_managers_prepare_for_accounts (GObject *source,
     goto out;
 
   show_account_assistant (cm_mgr, assistant_destroy_cb);
-  g_debug ("would show the account assistant");
+  DEBUG ("would show the account assistant");
 
 out:
   g_object_unref (cm_mgr);
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index c300065..b2e21dc 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -2271,6 +2271,11 @@ empathy_accounts_dialog_show_application (GdkScreen *screen,
   if (hidden)
     argv[i++] = "--hidden";
 
+  DEBUG ("Launching empathy-accounts (if_needed: %d, hidden: %d, account: %s)",
+    if_needed, hidden,
+    selected_account == NULL ? "<none selected>" :
+      tp_proxy_get_object_path (TP_PROXY (selected_account)));
+
   gdk_spawn_on_screen (screen, NULL, argv, NULL,
       G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL,
       &command_pid, &error);
diff --git a/src/empathy.c b/src/empathy.c
index b0c731a..2dc6294 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -256,7 +256,6 @@ static void
 show_accounts_ui (GdkScreen *screen,
     gboolean if_needed)
 {
-  g_debug ("launching accounts UI");
   empathy_accounts_dialog_show_application (screen,
       accounts_application_exited_cb, NULL, NULL, if_needed, start_hidden);
 }