Prefix debug messages with class name to make output easier to read.

2007-10-30  William Jon McCann  <mccann@jhu.edu>

	* common/gdm-signal-handler.c: (signal_io_watch), (catch_signal),
	(uncatch_signal), (gdm_signal_handler_add),
	(gdm_signal_handler_remove_and_free_data),
	(gdm_signal_handler_finalize):
	* daemon/gdm-display-store.c: (gdm_display_store_clear),
	(gdm_display_store_remove), (gdm_display_store_add),
	(display_unref):
	* daemon/gdm-factory-slave.c: (on_greeter_start),
	(on_greeter_stop), (on_session_info), (on_session_problem),
	(on_session_info_query), (on_session_secret_info_query),
	(on_session_opened), (on_session_user_verified),
	(on_session_user_verification_error), (on_session_session_started),
	(create_product_display), (on_session_relay_disconnected),
	(on_session_relay_connected), (on_greeter_begin_verification),
	(on_greeter_begin_verification_for_user), (on_greeter_answer),
	(on_greeter_connected), (run_greeter), (idle_connect_to_display),
	(server_ready_cb), (gdm_factory_slave_run),
	(gdm_factory_slave_start), (gdm_factory_slave_stop),
	(gdm_factory_slave_finalize):
	* daemon/gdm-greeter-server.c: (send_dbus_message),
	(send_dbus_string_signal), (send_dbus_void_signal),
	(handle_begin_verification), (handle_begin_verification_for_user),
	(handle_answer_query), (handle_select_session),
	(handle_select_hostname), (handle_select_language),
	(handle_select_user), (do_introspect),
	(connection_filter_function), (handle_connection),
	(gdm_greeter_server_start), (gdm_greeter_server_stop):
	* daemon/gdm-greeter-session.c: (listify_hash),
	(open_greeter_session), (greeter_session_child_watch),
	(spawn_child_setup), (start_dbus_daemon),
	(gdm_greeter_session_spawn), (gdm_greeter_session_start),
	(wait_on_child), (greeter_session_died),
	(gdm_greeter_session_stop):
	* daemon/gdm-local-display-factory.c: (create_display_for_device),
	(create_displays_for_pci_devices):
	* daemon/gdm-manager.c: (gdm_manager_start),
	(gdm_manager_set_wait_for_go), (remove_displays_for_connection),
	(bus_name_owner_changed):
	* daemon/gdm-product-display.c:
	(gdm_product_display_get_relay_address):
	* daemon/gdm-product-slave.c: (on_session_opened),
	(on_session_started), (on_session_exited), (on_session_died),
	(gdm_product_slave_create_server), (on_session_user_verified),
	(on_session_user_verification_error), (on_session_info),
	(on_session_problem), (on_session_info_query),
	(on_session_secret_info_query), (on_relay_begin_verification),
	(on_relay_begin_verification_for_user), (on_relay_answer),
	(on_relay_session_selected), (on_relay_language_selected),
	(on_relay_user_selected), (create_new_session),
	(on_relay_cancelled), (session_relay_proxy_destroyed),
	(get_relay_address), (connect_to_session_relay),
	(gdm_product_slave_stop):
	* daemon/gdm-server.c: (_gdm_server_query_ck_for_display_device),
	(emit_ready_idle), (connect_to_parent), (change_user),
	(server_child_setup), (server_child_watch), (gdm_server_spawn),
	(wait_on_child), (server_died), (gdm_server_stop):
	* daemon/gdm-session-direct.c: (send_dbus_string_signal),
	(gdm_session_direct_handle_verified),
	(gdm_session_direct_handle_verification_failed),
	(gdm_session_direct_handle_username_changed),
	(cancel_pending_query), (gdm_session_direct_handle_info_query),
	(gdm_session_direct_handle_secret_info_query),
	(gdm_session_direct_handle_info),
	(gdm_session_direct_handle_problem),
	(gdm_session_direct_handle_session_started),
	(gdm_session_direct_handle_startup_failed),
	(gdm_session_direct_handle_session_exited),
	(gdm_session_direct_handle_session_died), (do_introspect),
	(session_message_handler), (allow_user_function),
	(handle_connection), (setup_server), (worker_stopped),
	(worker_started), (worker_exited), (worker_died),
	(gdm_session_direct_open), (send_begin_verification),
	(send_begin_verification_for_user), (send_environment_variable),
	(get_session_command_for_file), (gdm_session_direct_close),
	(_gdm_session_direct_set_display_device),
	(gdm_session_direct_dispose):
	* daemon/gdm-session-relay.c: (send_dbus_message),
	(send_dbus_string_signal), (send_dbus_void_signal),
	(gdm_session_relay_begin_verification),
	(gdm_session_relay_begin_verification_for_user),
	(gdm_session_relay_answer_query), (handle_info_query),
	(handle_secret_info_query), (handle_info), (handle_problem),
	(handle_user_verified), (handle_user_verification_error),
	(handle_session_started), (handle_session_stopped),
	(handle_opened), (handle_reset), (do_introspect),
	(session_relay_message_handler), (connection_filter_function),
	(handle_connection), (gdm_session_relay_start),
	(gdm_session_relay_stop):
	* daemon/gdm-session-worker-job.c:
	(session_worker_job_child_watch), (gdm_session_worker_job_spawn),
	(gdm_session_worker_job_start), (wait_on_child),
	(session_worker_job_died), (gdm_session_worker_job_stop):
	* daemon/gdm-session-worker.c: (send_dbus_string_method),
	(send_dbus_int_method), (send_user_verified),
	(gdm_session_worker_get_username),
	(gdm_session_worker_update_username), (send_question_method),
	(gdm_session_worker_process_pam_message),
	(gdm_session_worker_pam_new_messages_handler),
	(gdm_session_worker_uninitialize_pam),
	(gdm_session_worker_initialize_pam),
	(gdm_session_worker_authenticate_user),
	(gdm_session_worker_authorize_user),
	(gdm_session_worker_verify_user), (session_worker_child_watch),
	(gdm_session_worker_open_user_session), (gdm_session_worker_open),
	(on_set_environment_variable), (on_start_program), (open_idle),
	(on_begin_verification), (on_begin_verification_for_user),
	(worker_dbus_filter_function), (gdm_session_worker_constructor):
	* daemon/gdm-simple-slave.c: (on_session_started),
	(on_session_exited), (on_session_died), (on_session_info),
	(on_session_problem), (on_session_info_query),
	(on_session_secret_info_query), (on_session_opened),
	(on_session_selected_user_changed), (create_new_session),
	(on_greeter_start), (on_greeter_stop),
	(on_greeter_begin_verification),
	(on_greeter_begin_verification_for_user),
	(on_greeter_user_selected), (on_greeter_cancel),
	(on_greeter_connected), (run_greeter), (gdm_simple_slave_run),
	(gdm_simple_slave_stop):
	* daemon/gdm-slave-proxy.c: (child_watch), (spawn_slave),
	(gdm_slave_proxy_stop), (gdm_slave_proxy_dispose):
	* daemon/gdm-slave.c: (listify_hash), (gdm_slave_run_script),
	(set_local_auth), (gdm_slave_connect_to_x11_display),
	(display_proxy_destroyed_cb), (gdm_slave_real_start),
	(gdm_slave_real_stop), (gdm_slave_start), (gdm_slave_stop),
	(gdm_slave_constructor):
	* daemon/gdm-static-factory-display.c:
	(gdm_static_factory_display_create_product_display):
	* daemon/gdm-xdmcp-display-factory.c: (debug_addrinfo), (do_bind),
	(setup_multicast), (open_port), (gdm_xdmcp_send_willing),
	(gdm_xdmcp_send_unwilling), (gdm_xdmcp_send_forward_query),
	(gdm_forward_query_dispose), (gdm_forward_query_lookup),
	(gdm_xdmcp_handle_forward_query),
	(gdm_xdmcp_really_send_managed_forward),
	(gdm_xdmcp_send_got_managed_forward), (display_dispose_check),
	(gdm_xdmcp_send_decline), (gdm_xdmcp_display_alloc),
	(gdm_xdmcp_send_accept), (gdm_xdmcp_handle_request),
	(gdm_xdmcp_send_failed), (gdm_xdmcp_send_refuse),
	(gdm_xdmcp_handle_manage), (gdm_xdmcp_handle_managed_forward),
	(gdm_xdmcp_handle_got_managed_forward), (gdm_xdmcp_send_alive),
	(gdm_xdmcp_handle_keepalive), (decode_packet),
	(gdm_xdmcp_display_factory_start):
	* daemon/gdm-xdmcp-display.c: (gdm_xdmcp_display_create_authority),
	(gdm_xdmcp_display_add_user_authorization):
	Prefix debug messages with class name to make output easier to read.


svn path=/trunk/; revision=5456

21 files changed, 475 insertions, 332 deletions

diff --git a/ChangeLog b/ChangeLog
index 64ce1a50..f147b0f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,152 @@
 2007-10-30  William Jon McCann  <mccann@jhu.edu>
 
+	* common/gdm-signal-handler.c: (signal_io_watch), (catch_signal),
+	(uncatch_signal), (gdm_signal_handler_add),
+	(gdm_signal_handler_remove_and_free_data),
+	(gdm_signal_handler_finalize):
+	* daemon/gdm-display-store.c: (gdm_display_store_clear),
+	(gdm_display_store_remove), (gdm_display_store_add),
+	(display_unref):
+	* daemon/gdm-factory-slave.c: (on_greeter_start),
+	(on_greeter_stop), (on_session_info), (on_session_problem),
+	(on_session_info_query), (on_session_secret_info_query),
+	(on_session_opened), (on_session_user_verified),
+	(on_session_user_verification_error), (on_session_session_started),
+	(create_product_display), (on_session_relay_disconnected),
+	(on_session_relay_connected), (on_greeter_begin_verification),
+	(on_greeter_begin_verification_for_user), (on_greeter_answer),
+	(on_greeter_connected), (run_greeter), (idle_connect_to_display),
+	(server_ready_cb), (gdm_factory_slave_run),
+	(gdm_factory_slave_start), (gdm_factory_slave_stop),
+	(gdm_factory_slave_finalize):
+	* daemon/gdm-greeter-server.c: (send_dbus_message),
+	(send_dbus_string_signal), (send_dbus_void_signal),
+	(handle_begin_verification), (handle_begin_verification_for_user),
+	(handle_answer_query), (handle_select_session),
+	(handle_select_hostname), (handle_select_language),
+	(handle_select_user), (do_introspect),
+	(connection_filter_function), (handle_connection),
+	(gdm_greeter_server_start), (gdm_greeter_server_stop):
+	* daemon/gdm-greeter-session.c: (listify_hash),
+	(open_greeter_session), (greeter_session_child_watch),
+	(spawn_child_setup), (start_dbus_daemon),
+	(gdm_greeter_session_spawn), (gdm_greeter_session_start),
+	(wait_on_child), (greeter_session_died),
+	(gdm_greeter_session_stop):
+	* daemon/gdm-local-display-factory.c: (create_display_for_device),
+	(create_displays_for_pci_devices):
+	* daemon/gdm-manager.c: (gdm_manager_start),
+	(gdm_manager_set_wait_for_go), (remove_displays_for_connection),
+	(bus_name_owner_changed):
+	* daemon/gdm-product-display.c:
+	(gdm_product_display_get_relay_address):
+	* daemon/gdm-product-slave.c: (on_session_opened),
+	(on_session_started), (on_session_exited), (on_session_died),
+	(gdm_product_slave_create_server), (on_session_user_verified),
+	(on_session_user_verification_error), (on_session_info),
+	(on_session_problem), (on_session_info_query),
+	(on_session_secret_info_query), (on_relay_begin_verification),
+	(on_relay_begin_verification_for_user), (on_relay_answer),
+	(on_relay_session_selected), (on_relay_language_selected),
+	(on_relay_user_selected), (create_new_session),
+	(on_relay_cancelled), (session_relay_proxy_destroyed),
+	(get_relay_address), (connect_to_session_relay),
+	(gdm_product_slave_stop):
+	* daemon/gdm-server.c: (_gdm_server_query_ck_for_display_device),
+	(emit_ready_idle), (connect_to_parent), (change_user),
+	(server_child_setup), (server_child_watch), (gdm_server_spawn),
+	(wait_on_child), (server_died), (gdm_server_stop):
+	* daemon/gdm-session-direct.c: (send_dbus_string_signal),
+	(gdm_session_direct_handle_verified),
+	(gdm_session_direct_handle_verification_failed),
+	(gdm_session_direct_handle_username_changed),
+	(cancel_pending_query), (gdm_session_direct_handle_info_query),
+	(gdm_session_direct_handle_secret_info_query),
+	(gdm_session_direct_handle_info),
+	(gdm_session_direct_handle_problem),
+	(gdm_session_direct_handle_session_started),
+	(gdm_session_direct_handle_startup_failed),
+	(gdm_session_direct_handle_session_exited),
+	(gdm_session_direct_handle_session_died), (do_introspect),
+	(session_message_handler), (allow_user_function),
+	(handle_connection), (setup_server), (worker_stopped),
+	(worker_started), (worker_exited), (worker_died),
+	(gdm_session_direct_open), (send_begin_verification),
+	(send_begin_verification_for_user), (send_environment_variable),
+	(get_session_command_for_file), (gdm_session_direct_close),
+	(_gdm_session_direct_set_display_device),
+	(gdm_session_direct_dispose):
+	* daemon/gdm-session-relay.c: (send_dbus_message),
+	(send_dbus_string_signal), (send_dbus_void_signal),
+	(gdm_session_relay_begin_verification),
+	(gdm_session_relay_begin_verification_for_user),
+	(gdm_session_relay_answer_query), (handle_info_query),
+	(handle_secret_info_query), (handle_info), (handle_problem),
+	(handle_user_verified), (handle_user_verification_error),
+	(handle_session_started), (handle_session_stopped),
+	(handle_opened), (handle_reset), (do_introspect),
+	(session_relay_message_handler), (connection_filter_function),
+	(handle_connection), (gdm_session_relay_start),
+	(gdm_session_relay_stop):
+	* daemon/gdm-session-worker-job.c:
+	(session_worker_job_child_watch), (gdm_session_worker_job_spawn),
+	(gdm_session_worker_job_start), (wait_on_child),
+	(session_worker_job_died), (gdm_session_worker_job_stop):
+	* daemon/gdm-session-worker.c: (send_dbus_string_method),
+	(send_dbus_int_method), (send_user_verified),
+	(gdm_session_worker_get_username),
+	(gdm_session_worker_update_username), (send_question_method),
+	(gdm_session_worker_process_pam_message),
+	(gdm_session_worker_pam_new_messages_handler),
+	(gdm_session_worker_uninitialize_pam),
+	(gdm_session_worker_initialize_pam),
+	(gdm_session_worker_authenticate_user),
+	(gdm_session_worker_authorize_user),
+	(gdm_session_worker_verify_user), (session_worker_child_watch),
+	(gdm_session_worker_open_user_session), (gdm_session_worker_open),
+	(on_set_environment_variable), (on_start_program), (open_idle),
+	(on_begin_verification), (on_begin_verification_for_user),
+	(worker_dbus_filter_function), (gdm_session_worker_constructor):
+	* daemon/gdm-simple-slave.c: (on_session_started),
+	(on_session_exited), (on_session_died), (on_session_info),
+	(on_session_problem), (on_session_info_query),
+	(on_session_secret_info_query), (on_session_opened),
+	(on_session_selected_user_changed), (create_new_session),
+	(on_greeter_start), (on_greeter_stop),
+	(on_greeter_begin_verification),
+	(on_greeter_begin_verification_for_user),
+	(on_greeter_user_selected), (on_greeter_cancel),
+	(on_greeter_connected), (run_greeter), (gdm_simple_slave_run),
+	(gdm_simple_slave_stop):
+	* daemon/gdm-slave-proxy.c: (child_watch), (spawn_slave),
+	(gdm_slave_proxy_stop), (gdm_slave_proxy_dispose):
+	* daemon/gdm-slave.c: (listify_hash), (gdm_slave_run_script),
+	(set_local_auth), (gdm_slave_connect_to_x11_display),
+	(display_proxy_destroyed_cb), (gdm_slave_real_start),
+	(gdm_slave_real_stop), (gdm_slave_start), (gdm_slave_stop),
+	(gdm_slave_constructor):
+	* daemon/gdm-static-factory-display.c:
+	(gdm_static_factory_display_create_product_display):
+	* daemon/gdm-xdmcp-display-factory.c: (debug_addrinfo), (do_bind),
+	(setup_multicast), (open_port), (gdm_xdmcp_send_willing),
+	(gdm_xdmcp_send_unwilling), (gdm_xdmcp_send_forward_query),
+	(gdm_forward_query_dispose), (gdm_forward_query_lookup),
+	(gdm_xdmcp_handle_forward_query),
+	(gdm_xdmcp_really_send_managed_forward),
+	(gdm_xdmcp_send_got_managed_forward), (display_dispose_check),
+	(gdm_xdmcp_send_decline), (gdm_xdmcp_display_alloc),
+	(gdm_xdmcp_send_accept), (gdm_xdmcp_handle_request),
+	(gdm_xdmcp_send_failed), (gdm_xdmcp_send_refuse),
+	(gdm_xdmcp_handle_manage), (gdm_xdmcp_handle_managed_forward),
+	(gdm_xdmcp_handle_got_managed_forward), (gdm_xdmcp_send_alive),
+	(gdm_xdmcp_handle_keepalive), (decode_packet),
+	(gdm_xdmcp_display_factory_start):
+	* daemon/gdm-xdmcp-display.c: (gdm_xdmcp_display_create_authority),
+	(gdm_xdmcp_display_add_user_authorization):
+	Prefix debug messages with class name to make output easier to read.
+
+2007-10-30  William Jon McCann  <mccann@jhu.edu>
+
 	* daemon/gdm-session-direct.c: (stop_worker),
 	(gdm_session_direct_close):
 	Make a stop_worker function for symmetry.
diff --git a/common/gdm-signal-handler.c b/common/gdm-signal-handler.c
index cd132614..ca1c9e78 100644
--- a/common/gdm-signal-handler.c
+++ b/common/gdm-signal-handler.c
@@ -103,16 +103,12 @@ signal_io_watch (GIOChannel       *ioc,
         gsize    bytes_read;
         int      i;
 
-        g_debug ("SIGNAL");
-
         block_signals_push ();
 
         g_io_channel_read_chars (ioc, buf, sizeof (buf), &bytes_read, NULL);
 
         is_fatal = FALSE;
 
-        g_debug ("Read %d chars", (int)bytes_read);
-
         for (i = 0; i < bytes_read; i++) {
                 int     signum;
                 GSList *handlers;
@@ -120,17 +116,17 @@ signal_io_watch (GIOChannel       *ioc,
 
                 signum = (gint32)buf[i];
 
-                g_debug ("handling signal %d", signum);
+                g_debug ("GdmSignalHandler: handling signal %d", signum);
                 handlers = g_hash_table_lookup (handler->priv->lookup, GINT_TO_POINTER (signum));
 
-                g_debug ("Found %u callbacks", g_slist_length (handlers));
+                g_debug ("GdmSignalHandler: Found %u callbacks", g_slist_length (handlers));
                 for (l = handlers; l != NULL; l = l->next) {
                         gboolean      res;
                         CallbackData *data;
 
                         data = g_hash_table_lookup (handler->priv->id_lookup, l->data);
                         if (data != NULL) {
-                                g_debug ("running %d handler: %p", signum, data->func);
+                                g_debug ("GdmSignalHandler: running %d handler: %p", signum, data->func);
                                 res = data->func (signum, data->data);
                                 if (! res) {
                                         is_fatal = TRUE;
@@ -142,12 +138,12 @@ signal_io_watch (GIOChannel       *ioc,
         block_signals_pop ();
 
         if (is_fatal) {
-                g_debug ("Caught termination signal - exiting main loop");
+                g_debug ("GdmSignalHandler: Caught termination signal - exiting main loop");
                 g_main_loop_quit (handler->priv->main_loop);
                 return FALSE;
         }
 
-        g_debug ("Done handling signals");
+        g_debug ("GdmSignalHandler: Done handling signals");
 
         return TRUE;
 }
@@ -265,7 +261,7 @@ catch_signal (GdmSignalHandler *handler,
         struct sigaction  action;
         struct sigaction *old_action;
 
-        g_debug ("Registering for %d signals", signal_number);
+        g_debug ("GdmSignalHandler: Registering for %d signals", signal_number);
 
         action.sa_handler = signal_handler;
         sigemptyset (&action.sa_mask);
@@ -286,7 +282,7 @@ uncatch_signal (GdmSignalHandler *handler,
 {
         struct sigaction *old_action;
 
-        g_debug ("Unregistering for %d signals", signal_number);
+        g_debug ("GdmSignalHandler: Unregistering for %d signals", signal_number);
 
         old_action = g_hash_table_lookup (handler->priv->action_lookup,
                                           GINT_TO_POINTER (signal_number));
@@ -315,7 +311,7 @@ gdm_signal_handler_add (GdmSignalHandler    *handler,
         cdata->data = data;
         cdata->id = handler->priv->next_id++;
 
-        g_debug ("Adding handler %u: signum=%d %p", cdata->id, cdata->signal_number, cdata->func);
+        g_debug ("GdmSignalHandler: Adding handler %u: signum=%d %p", cdata->id, cdata->signal_number, cdata->func);
 
         if (g_hash_table_lookup (handler->priv->action_lookup, GINT_TO_POINTER (signal_number)) == NULL) {
                 catch_signal (handler, signal_number);
@@ -352,7 +348,7 @@ gdm_signal_handler_remove_and_free_data (GdmSignalHandler *handler,
                 uncatch_signal (handler, cdata->signal_number);
         }
 
-        g_debug ("Removing handler %u: signum=%d %p", cdata->signal_number, cdata->id, cdata->func);
+        g_debug ("GdmSignalHandler: Removing handler %u: signum=%d %p", cdata->signal_number, cdata->id, cdata->func);
         /* put changed list back in */
         g_hash_table_insert (handler->priv->lookup, GINT_TO_POINTER (cdata->signal_number), list);
 
@@ -487,7 +483,7 @@ gdm_signal_handler_finalize (GObject *object)
 
         handler = GDM_SIGNAL_HANDLER (object);
 
-        g_debug ("Finalizing signal handler");
+        g_debug ("GdmSignalHandler: Finalizing signal handler");
 
         g_return_if_fail (handler->priv != NULL);
         for (l = g_hash_table_get_values (handler->priv->lookup);
diff --git a/daemon/gdm-display-store.c b/daemon/gdm-display-store.c
index 4943d218..e962f28d 100644
--- a/daemon/gdm-display-store.c
+++ b/daemon/gdm-display-store.c
@@ -68,7 +68,7 @@ gdm_display_store_error_quark (void)
 void
 gdm_display_store_clear (GdmDisplayStore    *store)
 {
-        g_debug ("Clearing display store");
+        g_debug ("GdmDisplayStore: Clearing display store");
         g_hash_table_remove_all (store->priv->displays);
 }
 
@@ -76,7 +76,7 @@ gboolean
 gdm_display_store_remove (GdmDisplayStore    *store,
                           GdmDisplay         *display)
 {
-        g_warning ("Implement me");
+        g_warning ("GdmDisplayStore: Implement me");
         return FALSE;
 }
 
@@ -137,7 +137,7 @@ gdm_display_store_add (GdmDisplayStore *store,
 
         gdm_display_get_id (display, &id, NULL);
 
-        g_debug ("Adding display %s to store", id);
+        g_debug ("GdmDisplayStore: Adding display %s to store", id);
 
         g_hash_table_insert (store->priv->displays,
                              id,
@@ -178,7 +178,7 @@ gdm_display_store_class_init (GdmDisplayStoreClass *klass)
 static void
 display_unref (GdmDisplay *display)
 {
-        g_debug ("Unreffing display: %p", display);
+        g_debug ("GdmDisplayStore: Unreffing display: %p", display);
         g_object_unref (display);
 }
 
diff --git a/daemon/gdm-factory-slave.c b/daemon/gdm-factory-slave.c
index c33ae9b2..25662e9b 100644
--- a/daemon/gdm-factory-slave.c
+++ b/daemon/gdm-factory-slave.c
@@ -96,14 +96,14 @@ static void
 on_greeter_start (GdmGreeterSession *greeter,
                   GdmFactorySlave   *slave)
 {
-        g_debug ("Greeter started");
+        g_debug ("GdmFactorySlave: Greeter started");
 }
 
 static void
 on_greeter_stop (GdmGreeterSession *greeter,
                  GdmFactorySlave   *slave)
 {
-        g_debug ("Greeter stopped");
+        g_debug ("GdmFactorySlave: Greeter stopped");
 }
 
 static void
@@ -111,7 +111,7 @@ on_session_info (GdmSession      *session,
                  const char      *text,
                  GdmFactorySlave *slave)
 {
-        g_debug ("Info: %s", text);
+        g_debug ("GdmFactorySlave: Info: %s", text);
         gdm_greeter_server_info (slave->priv->greeter_server, text);
 }
 
@@ -120,7 +120,7 @@ on_session_problem (GdmSession      *session,
                     const char      *text,
                     GdmFactorySlave *slave)
 {
-        g_debug ("Problem: %s", text);
+        g_debug ("GdmFactorySlave: Problem: %s", text);
         gdm_greeter_server_problem (slave->priv->greeter_server, text);
 }
 
@@ -130,7 +130,7 @@ on_session_info_query (GdmSession      *session,
                        GdmFactorySlave *slave)
 {
 
-        g_debug ("Info query: %s", text);
+        g_debug ("GdmFactorySlave: Info query: %s", text);
         gdm_greeter_server_info_query (slave->priv->greeter_server, text);
 }
 
@@ -139,7 +139,7 @@ on_session_secret_info_query (GdmSession      *session,
                               const char      *text,
                               GdmFactorySlave *slave)
 {
-        g_debug ("Secret info query: %s", text);
+        g_debug ("GdmFactorySlave: Secret info query: %s", text);
         gdm_greeter_server_secret_info_query (slave->priv->greeter_server, text);
 }
 
@@ -147,7 +147,7 @@ static void
 on_session_opened (GdmSession      *session,
                    GdmFactorySlave *slave)
 {
-        g_debug (" session opened");
+        g_debug ("GdmFactorySlave:  session opened");
 
         gdm_greeter_server_ready (slave->priv->greeter_server);
 }
@@ -156,7 +156,7 @@ static void
 on_session_user_verified (GdmSession *session,
                                 GdmFactorySlave *slave)
 {
-        g_debug (" session user verified");
+        g_debug ("GdmFactorySlave:  session user verified");
 
         gdm_greeter_server_reset (slave->priv->greeter_server);
 }
@@ -184,7 +184,7 @@ on_session_user_verification_error (GdmSession      *session,
                                     const char      *message,
                                     GdmFactorySlave *slave)
 {
-        g_debug ("could not successfully authenticate user: %s",
+        g_debug ("GdmFactorySlave: could not successfully authenticate user: %s",
                  message);
 
         gdm_greeter_server_problem (slave->priv->greeter_server, _("Unable to authenticate user"));
@@ -196,7 +196,7 @@ static void
 on_session_session_started (GdmSession      *session,
                             GdmFactorySlave *slave)
 {
-        g_debug ("Relay session started");
+        g_debug ("GdmFactorySlave: Relay session started");
         gdm_greeter_server_reset (slave->priv->greeter_server);
 }
 
@@ -212,13 +212,13 @@ create_product_display (GdmFactorySlave *slave)
 
         ret = FALSE;
 
-        g_debug ("Create product display");
+        g_debug ("GdmFactorySlave: Create product display");
 
         g_object_get (slave,
                       "display-id", &display_id,
                       NULL);
 
-        g_debug ("Connecting to display %s", display_id);
+        g_debug ("GdmFactorySlave: Connecting to display %s", display_id);
         slave->priv->factory_display_proxy = dbus_g_proxy_new_for_name (slave->priv->connection,
                                                                         GDM_DBUS_NAME,
                                                                         display_id,
@@ -262,7 +262,7 @@ static void
 on_session_relay_disconnected (GdmSessionRelay *session,
                                GdmFactorySlave *slave)
 {
-        g_debug ("Relay disconnected");
+        g_debug ("GdmFactorySlave: Relay disconnected");
 
         /* FIXME: do some kind of loop detection */
         gdm_greeter_server_reset (slave->priv->greeter_server);
@@ -273,7 +273,7 @@ static void
 on_session_relay_connected (GdmSessionRelay *session,
                             GdmFactorySlave *slave)
 {
-        g_debug ("Relay Connected");
+        g_debug ("GdmFactorySlave: Relay Connected");
 
         gdm_session_open (GDM_SESSION (slave->priv->session));
 }
@@ -282,7 +282,7 @@ static void
 on_greeter_begin_verification (GdmGreeterServer *greeter_server,
                                GdmFactorySlave  *slave)
 {
-        g_debug ("begin verification");
+        g_debug ("GdmFactorySlave: begin verification");
 
         gdm_session_begin_verification (GDM_SESSION (slave->priv->session));
 }
@@ -292,7 +292,7 @@ on_greeter_begin_verification_for_user (GdmGreeterServer *greeter_server,
                                         const char       *username,
                                         GdmFactorySlave  *slave)
 {
-        g_debug ("begin verification for user");
+        g_debug ("GdmFactorySlave: begin verification for user");
 
         gdm_session_begin_verification_for_user (GDM_SESSION (slave->priv->session),
                                                  username);
@@ -303,7 +303,7 @@ on_greeter_answer (GdmGreeterServer *greeter_server,
                    const char       *text,
                    GdmFactorySlave  *slave)
 {
-        g_debug ("Greeter answer");
+        g_debug ("GdmFactorySlave: Greeter answer");
         gdm_session_answer_query (GDM_SESSION (slave->priv->session), text);
 }
 
@@ -342,7 +342,7 @@ static void
 on_greeter_connected (GdmGreeterServer *greeter_server,
                       GdmFactorySlave  *slave)
 {
-        g_debug ("Greeter started");
+        g_debug ("GdmFactorySlave: Greeter started");
 
         create_product_display (slave);
 }
@@ -365,7 +365,7 @@ run_greeter (GdmFactorySlave *slave)
         char          *auth_file;
         char          *address;
 
-        g_debug ("Running greeter");
+        g_debug ("GdmFactorySlave: Running greeter");
 
         display_is_local = FALSE;
         display_id = NULL;
@@ -428,7 +428,7 @@ run_greeter (GdmFactorySlave *slave)
 
         address = gdm_greeter_server_get_address (slave->priv->greeter_server);
 
-        g_debug ("Creating greeter on %s %s", display_name, display_device);
+        g_debug ("GdmFactorySlave: Creating greeter on %s %s", display_name, display_device);
         slave->priv->greeter = gdm_greeter_session_new (display_name,
                                                         display_device,
                                                         display_hostname,
@@ -463,7 +463,7 @@ idle_connect_to_display (GdmFactorySlave *slave)
 
         slave->priv->connection_attempts++;
 
-        g_debug ("Connect to display");
+        g_debug ("GdmFactorySlave: Connect to display");
 
         res = gdm_slave_connect_to_x11_display (GDM_SLAVE (slave));
         if (res) {
@@ -485,7 +485,7 @@ static void
 server_ready_cb (GdmServer *server,
                  GdmFactorySlave  *slave)
 {
-        g_debug ("Server ready");
+        g_debug ("GdmFactorySlave: Server ready");
 
         g_timeout_add (500, (GSourceFunc)idle_connect_to_display, slave);
 }
@@ -526,7 +526,7 @@ gdm_factory_slave_run (GdmFactorySlave *slave)
                         exit (1);
                 }
 
-                g_debug ("Started X server");
+                g_debug ("GdmFactorySlave: Started X server");
         } else {
                 g_timeout_add (500, (GSourceFunc)idle_connect_to_display, slave);
         }
@@ -544,7 +544,7 @@ gdm_factory_slave_start (GdmSlave *slave)
 
         ret = FALSE;
 
-        g_debug ("Starting factory slave");
+        g_debug ("GdmFactorySlave: Starting factory slave");
 
         res = GDM_SLAVE_CLASS (gdm_factory_slave_parent_class)->start (slave);
 
@@ -605,7 +605,7 @@ gdm_factory_slave_stop (GdmSlave *slave)
 {
         gboolean res;
 
-        g_debug ("Stopping factory_slave");
+        g_debug ("GdmFactorySlave: Stopping factory_slave");
 
         res = GDM_SLAVE_CLASS (gdm_factory_slave_parent_class)->stop (slave);
 
@@ -740,7 +740,7 @@ gdm_factory_slave_finalize (GObject *object)
 
         factory_slave = GDM_FACTORY_SLAVE (object);
 
-        g_debug ("Finalizing slave");
+        g_debug ("GdmFactorySlave: Finalizing slave");
 
         g_return_if_fail (factory_slave->priv != NULL);
 
diff --git a/daemon/gdm-greeter-server.c b/daemon/gdm-greeter-server.c
index 35802548..68e9b349 100644
--- a/daemon/gdm-greeter-server.c
+++ b/daemon/gdm-greeter-server.c
@@ -103,13 +103,13 @@ send_dbus_message (DBusConnection *connection,
         g_return_val_if_fail (message != NULL, FALSE);
 
         if (connection == NULL) {
-                g_debug ("There is no valid connection");
+                g_debug ("GreeterServer: There is no valid connection");
                 return FALSE;
         }
 
         is_connected = dbus_connection_get_is_connected (connection);
         if (! is_connected) {
-                g_warning ("Not connected!");
+                g_warning ("GreeterServer: Not connected!");
                 return FALSE;
         }
 
@@ -143,9 +143,9 @@ send_dbus_string_signal (GdmGreeterServer *greeter_server,
         dbus_message_iter_init_append (message, &iter);
         dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &str);
 
-        g_debug ("Sending %s (%s)", name, str);
+        g_debug ("GreeterServer: Sending %s (%s)", name, str);
         if (! send_dbus_message (greeter_server->priv->greeter_connection, message)) {
-                g_debug ("Could not send %s signal", name);
+                g_debug ("GreeterServer: Could not send %s signal", name);
         }
 
         dbus_message_unref (message);
@@ -164,7 +164,7 @@ send_dbus_void_signal (GdmGreeterServer *greeter_server,
                                            name);
 
         if (! send_dbus_message (greeter_server->priv->greeter_connection, message)) {
-                g_debug ("Could not send %s signal", name);
+                g_debug ("GreeterServer: Could not send %s signal", name);
         }
 
         dbus_message_unref (message);
@@ -259,7 +259,7 @@ handle_begin_verification (GdmGreeterServer *greeter_server,
 {
         DBusMessage *reply;
 
-        g_debug ("BeginVerification");
+        g_debug ("GreeterServer: BeginVerification");
 
         reply = dbus_message_new_method_return (message);
         dbus_connection_send (connection, reply, NULL);
@@ -287,7 +287,7 @@ handle_begin_verification_for_user (GdmGreeterServer *greeter_server,
                 g_warning ("ERROR: %s", error.message);
         }
 
-        g_debug ("BeginVerificationForUser for '%s'", text);
+        g_debug ("GreeterServer: BeginVerificationForUser for '%s'", text);
 
         reply = dbus_message_new_method_return (message);
         dbus_connection_send (connection, reply, NULL);
@@ -314,7 +314,7 @@ handle_answer_query (GdmGreeterServer *greeter_server,
                 g_warning ("ERROR: %s", error.message);
         }
 
-        g_debug ("AnswerQuery");
+        g_debug ("GreeterServer: AnswerQuery");
 
         reply = dbus_message_new_method_return (message);
         dbus_connection_send (connection, reply, NULL);
@@ -341,7 +341,7 @@ handle_select_session (GdmGreeterServer *greeter_server,
                 g_warning ("ERROR: %s", error.message);
         }
 
-        g_debug ("SelectSession: %s", text);
+        g_debug ("GreeterServer: SelectSession: %s", text);
 
         reply = dbus_message_new_method_return (message);
         dbus_connection_send (connection, reply, NULL);
@@ -368,7 +368,7 @@ handle_select_hostname (GdmGreeterServer *greeter_server,
                 g_warning ("ERROR: %s", error.message);
         }
 
-        g_debug ("SelectHostname: %s", text);
+        g_debug ("GreeterServer: SelectHostname: %s", text);
 
         reply = dbus_message_new_method_return (message);
         dbus_connection_send (connection, reply, NULL);
@@ -395,7 +395,7 @@ handle_select_language (GdmGreeterServer *greeter_server,
                 g_warning ("ERROR: %s", error.message);
         }
 
-        g_debug ("SelectLanguage: %s", text);
+        g_debug ("GreeterServer: SelectLanguage: %s", text);
 
         reply = dbus_message_new_method_return (message);
         dbus_connection_send (connection, reply, NULL);
@@ -422,7 +422,7 @@ handle_select_user (GdmGreeterServer *greeter_server,
                 g_warning ("ERROR: %s", error.message);
         }
 
-        g_debug ("SelectUser: %s", text);
+        g_debug ("GreeterServer: SelectUser: %s", text);
 
         reply = dbus_message_new_method_return (message);
         dbus_connection_send (connection, reply, NULL);
@@ -522,7 +522,7 @@ do_introspect (DBusConnection *connection,
         GString     *xml;
         char        *xml_string;
 
-        g_debug ("Do introspect");
+        g_debug ("GreeterServer: Do introspect");
 
         /* standard header */
         xml = g_string_new ("<!DOCTYPE node PUBLIC \"-//freedesktop//DTD D-BUS Object Introspection 1.0//EN\"\n"
@@ -673,7 +673,7 @@ connection_filter_function (DBusConnection *connection,
         const char       *dbus_interface = dbus_message_get_interface (message);
         const char       *dbus_message   = dbus_message_get_member (message);
 
-        g_debug ("obj_path=%s interface=%s method=%s",
+        g_debug ("GreeterServer: obj_path=%s interface=%s method=%s",
                  dbus_path      ? dbus_path      : "(null)",
                  dbus_interface ? dbus_interface : "(null)",
                  dbus_message   ? dbus_message   : "(null)");
@@ -681,7 +681,7 @@ connection_filter_function (DBusConnection *connection,
         if (dbus_message_is_signal (message, DBUS_INTERFACE_LOCAL, "Disconnected")
             && strcmp (dbus_path, DBUS_PATH_LOCAL) == 0) {
 
-                g_debug ("Disconnected");
+                g_debug ("GreeterServer: Disconnected");
 
                 dbus_connection_unref (connection);
                 greeter_server->priv->greeter_connection = NULL;
@@ -723,7 +723,7 @@ handle_connection (DBusServer      *server,
 {
         GdmGreeterServer *greeter_server = GDM_GREETER_SERVER (user_data);
 
-        g_debug ("Handing new connection");
+        g_debug ("GreeterServer: Handing new connection");
 
         if (greeter_server->priv->greeter_connection == NULL) {
                 DBusObjectPathVTable vtable = { &greeter_server_unregister_handler,
@@ -735,7 +735,7 @@ handle_connection (DBusServer      *server,
                 dbus_connection_ref (new_connection);
                 dbus_connection_setup_with_g_main (new_connection, NULL);
 
-                g_debug ("greeter connection is %p", new_connection);
+                g_debug ("GreeterServer: greeter connection is %p", new_connection);
 
                 dbus_connection_add_filter (new_connection,
                                             connection_filter_function,
@@ -767,7 +767,7 @@ gdm_greeter_server_start (GdmGreeterServer *greeter_server)
 
         ret = FALSE;
 
-        g_debug ("Creating D-Bus server for greeter");
+        g_debug ("GreeterServer: Creating D-Bus server for greeter");
 
         address = generate_address ();
 
@@ -792,7 +792,7 @@ gdm_greeter_server_start (GdmGreeterServer *greeter_server)
         g_free (greeter_server->priv->server_address);
         greeter_server->priv->server_address = dbus_server_get_address (greeter_server->priv->server);
 
-        g_debug ("D-Bus server listening on %s", greeter_server->priv->server_address);
+        g_debug ("GreeterServer: D-Bus server listening on %s", greeter_server->priv->server_address);
 
  out:
 
@@ -806,7 +806,7 @@ gdm_greeter_server_stop (GdmGreeterServer *greeter_server)
 
         ret = FALSE;
 
-        g_debug ("Stopping greeter server...");
+        g_debug ("GreeterServer: Stopping greeter server...");
 
         return ret;
 }
diff --git a/daemon/gdm-greeter-session.c b/daemon/gdm-greeter-session.c
index 933b27f9..9664421e 100644
--- a/daemon/gdm-greeter-session.c
+++ b/daemon/gdm-greeter-session.c
@@ -116,7 +116,7 @@ listify_hash (const char *key,
 {
         char *str;
         str = g_strdup_printf ("%s=%s", key, value);
-        g_debug ("greeter environment: %s", str);
+        g_debug ("GdmGreeterSession: greeter environment: %s", str);
         g_ptr_array_add (env, str);
 }
 
@@ -161,7 +161,7 @@ open_greeter_session (GdmGreeterSession *greeter_session)
                 x11_display_device = "";
         }
 
-        g_debug ("Opening ConsoleKit session for user:%d x11-display:'%s' x11-display-device:'%s' remote-host-name:'%s' is-local:%d",
+        g_debug ("GdmGreeterSession: Opening ConsoleKit session for user:%d x11-display:'%s' x11-display-device:'%s' remote-host-name:'%s' is-local:%d",
                  pwent->pw_uid,
                  greeter_session->priv->x11_display_name,
                  x11_display_device,
@@ -296,7 +296,7 @@ greeter_session_child_watch (GPid               pid,
                              int                status,
                              GdmGreeterSession *greeter_session)
 {
-        g_debug ("child (pid:%d) done (%s:%d)",
+        g_debug ("GdmGreeterSession: child (pid:%d) done (%s:%d)",
                  (int) pid,
                  WIFEXITED (status) ? "status"
                  : WIFSIGNALED (status) ? "signal"
@@ -342,7 +342,7 @@ spawn_child_setup (SpawnChildData *data)
                 _exit (1);
         }
 
-        g_debug ("Changing (uid:gid) for child process to (%d:%d)",
+        g_debug ("GdmGreeterSession: Changing (uid:gid) for child process to (%d:%d)",
                  pwent->pw_uid,
                  grent->gr_gid);
 
@@ -378,7 +378,7 @@ spawn_child_setup (SpawnChildData *data)
         }
 
         if (setsid () < 0) {
-                g_debug ("could not set pid '%u' as leader of new session and process group - %s",
+                g_debug ("GdmGreeterSession: could not set pid '%u' as leader of new session and process group - %s",
                          (guint) getpid (), g_strerror (errno));
                 _exit (2);
         }
@@ -594,7 +594,7 @@ start_dbus_daemon (GdmGreeterSession *greeter_session)
         if (! res) {
                 g_warning ("Unable to parse D-Bus launch output");
         } else {
-                g_debug ("Started D-Bus daemon on pid %d", greeter_session->priv->dbus_pid);
+                g_debug ("GdmGreeterSession: Started D-Bus daemon on pid %d", greeter_session->priv->dbus_pid);
         }
  out:
         return res;
@@ -629,7 +629,7 @@ gdm_greeter_session_spawn (GdmGreeterSession *greeter_session)
         create_temp_auth_file (greeter_session);
 #endif
 
-        g_debug ("Running greeter_session process: %s", greeter_session->priv->command);
+        g_debug ("GdmGreeterSession: Running greeter_session process: %s", greeter_session->priv->command);
 
         open_greeter_session (greeter_session);
 
@@ -654,7 +654,7 @@ gdm_greeter_session_spawn (GdmGreeterSession *greeter_session)
                 g_error_free (error);
                 goto out;
         } else {
-                g_debug ("gdm_slave_greeter_session: GreeterSession on pid %d", (int)greeter_session->priv->pid);
+                g_debug ("GdmGreeterSession: GreeterSession on pid %d", (int)greeter_session->priv->pid);
         }
 
         greeter_session->priv->child_watch_id = g_child_watch_add (greeter_session->priv->pid,
@@ -677,7 +677,7 @@ gdm_greeter_session_start (GdmGreeterSession *greeter_session)
 {
         gboolean    res;
 
-        g_debug ("Starting greeter...");
+        g_debug ("GdmGreeterSession: Starting greeter...");
 
         res = gdm_greeter_session_spawn (greeter_session);
 
@@ -701,7 +701,7 @@ wait_on_child (int pid)
                 } else if (errno == ECHILD) {
                         ; /* do nothing, child already reaped */
                 } else {
-                        g_debug ("waitpid () should not fail");
+                        g_debug ("GdmGreeterSession: waitpid () should not fail");
                 }
         }
 
@@ -713,11 +713,11 @@ greeter_session_died (GdmGreeterSession *greeter_session)
 {
         int exit_status;
 
-        g_debug ("Waiting on process %d", greeter_session->priv->pid);
+        g_debug ("GdmGreeterSession: Waiting on process %d", greeter_session->priv->pid);
         exit_status = wait_on_child (greeter_session->priv->pid);
 
         if (WIFEXITED (exit_status) && (WEXITSTATUS (exit_status) != 0)) {
-                g_debug ("Wait on child process failed");
+                g_debug ("GdmGreeterSession: Wait on child process failed");
         } else {
                 /* exited normally */
         }
@@ -725,7 +725,7 @@ greeter_session_died (GdmGreeterSession *greeter_session)
         g_spawn_close_pid (greeter_session->priv->pid);
         greeter_session->priv->pid = -1;
 
-        g_debug ("GreeterSession died");
+        g_debug ("GdmGreeterSession: GreeterSession died");
 }
 
 gboolean
@@ -742,7 +742,7 @@ gdm_greeter_session_stop (GdmGreeterSession *greeter_session)
                 greeter_session->priv->child_watch_id = 0;
         }
 
-        g_debug ("Stopping greeter_session");
+        g_debug ("GdmGreeterSession: Stopping greeter_session");
 
         gdm_signal_pid (-1 * greeter_session->priv->pid, SIGTERM);
         greeter_session_died (greeter_session);
diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c
index a7923d43..51e43f1d 100644
--- a/daemon/gdm-local-display-factory.c
+++ b/daemon/gdm-local-display-factory.c
@@ -79,7 +79,7 @@ create_display_for_device (GdmLocalDisplayFactory *factory,
 
         store = gdm_display_factory_get_display_store (GDM_DISPLAY_FACTORY (factory));
 
-#if 0
+#if 1
         display = gdm_static_factory_display_new (0, store);
 #else
         display = gdm_static_display_new (0);
@@ -108,7 +108,7 @@ create_displays_for_pci_devices (GdmLocalDisplayFactory *factory)
         gboolean    res;
         int         i;
 
-        g_debug ("Getting PCI seat devices");
+        g_debug ("GdmLocalDisplayFactory: Getting PCI seat devices");
 
         key = "info.bus";
         value = "pci";
@@ -156,7 +156,7 @@ create_displays_for_pci_devices (GdmLocalDisplayFactory *factory)
                 }
 
                 if (class_val == SEAT_PCI_DEVICE_CLASS) {
-                        g_debug ("Found device: %s", devices [i]);
+                        g_debug ("GdmLocalDisplayFactory: Found device: %s", devices [i]);
                         create_display_for_device (factory, device_proxy);
                 }
 
diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c
index 7e1dee4a..02147e1b 100644
--- a/daemon/gdm-manager.c
+++ b/daemon/gdm-manager.c
@@ -172,7 +172,7 @@ make_global_cookie (GdmManager *manager)
 void
 gdm_manager_start (GdmManager *manager)
 {
-        g_debug ("GDM starting to manage");
+        g_debug ("GdmManager: GDM starting to manage");
 
         if (! manager->priv->wait_for_go) {
                 gdm_display_factory_start (GDM_DISPLAY_FACTORY (manager->priv->local_factory));
@@ -181,7 +181,7 @@ gdm_manager_start (GdmManager *manager)
         /* Accept remote connections */
         if (manager->priv->xdmcp_enabled && ! manager->priv->wait_for_go) {
                 if (manager->priv->xdmcp_factory != NULL) {
-                        g_debug ("Accepting XDMCP connections...");
+                        g_debug ("GdmManager: Accepting XDMCP connections...");
                         gdm_display_factory_start (GDM_DISPLAY_FACTORY (manager->priv->xdmcp_factory));
                 }
         }
@@ -200,7 +200,7 @@ gdm_manager_set_wait_for_go (GdmManager *manager,
                         gdm_display_factory_start (GDM_DISPLAY_FACTORY (manager->priv->local_factory));
 
                         if (manager->priv->xdmcp_enabled && manager->priv->xdmcp_factory != NULL) {
-                                g_debug ("Accepting XDMCP connections...");
+                                g_debug ("GdmManager: Accepting XDMCP connections...");
                                 gdm_display_factory_start (GDM_DISPLAY_FACTORY (manager->priv->xdmcp_factory));
                         }
                 }
@@ -240,7 +240,7 @@ remove_displays_for_connection (GdmManager *manager,
         data.service_name = service_name;
         data.manager = manager;
 
-        g_debug ("Removing display for service name: %s", service_name);
+        g_debug ("GdmManager: Removing display for service name: %s", service_name);
 
         gdm_display_store_foreach_remove (manager->priv->display_store,
                                           (GdmDisplayStoreFunc)remove_display_for_connection,
@@ -258,7 +258,7 @@ bus_name_owner_changed (DBusGProxy  *bus_proxy,
                 remove_displays_for_connection (manager, old_service_name);
         }
 
-        g_debug ("NameOwnerChanged: service_name='%s', old_service_name='%s' new_service_name='%s'",
+        g_debug ("GdmManager: NameOwnerChanged: service_name='%s', old_service_name='%s' new_service_name='%s'",
                    service_name, old_service_name, new_service_name);
 }
 
diff --git a/daemon/gdm-product-display.c b/daemon/gdm-product-display.c
index 850de658..1dbb7e01 100644
--- a/daemon/gdm-product-display.c
+++ b/daemon/gdm-product-display.c
@@ -127,7 +127,7 @@ gdm_product_display_get_relay_address (GdmProductDisplay *display,
 
         if (address != NULL) {
                 *address = g_strdup (display->priv->relay_address);
-                g_debug ("Returning address: %s", display->priv->relay_address);
+                g_debug ("GdmProductDisplay: Returning address: %s", display->priv->relay_address);
         }
 
         return TRUE;
diff --git a/daemon/gdm-product-slave.c b/daemon/gdm-product-slave.c
index 9360cfd6..cc26a441 100644
--- a/daemon/gdm-product-slave.c
+++ b/daemon/gdm-product-slave.c
@@ -139,7 +139,7 @@ static void
 on_session_opened (GdmSessionDirect      *session,
                    GdmProductSlave *slave)
 {
-        g_debug ("session opened");
+        g_debug ("GdmProductSlave: session opened");
 
         relay_session_opened (slave);
 }
@@ -159,7 +159,7 @@ on_session_started (GdmSessionDirect      *session,
                     GPid             pid,
                     GdmProductSlave *slave)
 {
-        g_debug ("session started on pid %d", (int) pid);
+        g_debug ("GdmProductSlave: session started on pid %d", (int) pid);
 
         relay_session_started (slave);
 
@@ -171,7 +171,7 @@ on_session_exited (GdmSessionDirect      *session,
                    int              exit_code,
                    GdmProductSlave *slave)
 {
-        g_debug ("session exited with code %d", exit_code);
+        g_debug ("GdmProductSlave: session exited with code %d", exit_code);
 
         gdm_slave_stopped (GDM_SLAVE (slave));
 }
@@ -181,7 +181,7 @@ on_session_died (GdmSessionDirect *session,
                  int         signal_number,
                  GdmProductSlave   *slave)
 {
-        g_debug ("session died with signal %d, (%s)",
+        g_debug ("GdmProductSlave: session died with signal %d, (%s)",
                  signal_number,
                  g_strsignal (signal_number));
 
@@ -304,7 +304,7 @@ gdm_product_slave_create_server (GdmProductSlave *slave)
                         exit (1);
                 }
 
-                g_debug ("Started X server");
+                g_debug ("GdmProductSlave: Started X server");
         } else {
                 g_timeout_add (500, (GSourceFunc)idle_connect_to_display, slave);
         }
@@ -321,7 +321,7 @@ on_session_user_verified (GdmSessionDirect      *session,
         GError  *error;
         gboolean res;
 
-        g_debug ("Session user verified");
+        g_debug ("GdmProductSlave: Session user verified");
 
         error = NULL;
         res = dbus_g_proxy_call (slave->priv->session_relay_proxy,
@@ -352,7 +352,7 @@ on_session_user_verification_error (GdmSessionDirect      *session,
 
         username = gdm_session_direct_get_username (session);
 
-        g_debug ("%s%scould not be successfully authenticated: %s\n",
+        g_debug ("GdmProductSlave: %s%scould not be successfully authenticated: %s\n",
                  username ? username : "",
                  username ? " " : "",
                  error->message);
@@ -380,7 +380,7 @@ on_session_info (GdmSessionDirect      *session,
         GError *error;
         gboolean res;
 
-        g_debug ("Info: %s", text);
+        g_debug ("GdmProductSlave: Info: %s", text);
 
         error = NULL;
         res = dbus_g_proxy_call (slave->priv->session_relay_proxy,
@@ -403,7 +403,7 @@ on_session_problem (GdmSessionDirect      *session,
         GError *error;
         gboolean res;
 
-        g_debug ("Problem: %s", text);
+        g_debug ("GdmProductSlave: Problem: %s", text);
 
         error = NULL;
         res = dbus_g_proxy_call (slave->priv->session_relay_proxy,
@@ -427,7 +427,7 @@ on_session_info_query (GdmSessionDirect      *session,
         GError  *error;
         gboolean res;
 
-        g_debug ("Info query: %s", text);
+        g_debug ("GdmProductSlave: Info query: %s", text);
 
         error = NULL;
         res = dbus_g_proxy_call (slave->priv->session_relay_proxy,
@@ -451,7 +451,7 @@ on_session_secret_info_query (GdmSessionDirect      *session,
         gboolean res;
 
 
-        g_debug ("Secret info query: %s", text);
+        g_debug ("GdmProductSlave: Secret info query: %s", text);
 
         error = NULL;
         res = dbus_g_proxy_call (slave->priv->session_relay_proxy,
@@ -472,7 +472,7 @@ on_relay_begin_verification (DBusGProxy *proxy,
 {
         GdmProductSlave *slave = GDM_PRODUCT_SLAVE (data);
 
-        g_debug ("Relay BeginVerification");
+        g_debug ("GdmProductSlave: Relay BeginVerification");
 
         gdm_session_begin_verification (GDM_SESSION (slave->priv->session));
 }
@@ -484,7 +484,7 @@ on_relay_begin_verification_for_user (DBusGProxy *proxy,
 {
         GdmProductSlave *slave = GDM_PRODUCT_SLAVE (data);
 
-        g_debug ("Relay BeginVerificationForUser");
+        g_debug ("GdmProductSlave: Relay BeginVerificationForUser");
 
         gdm_session_begin_verification_for_user (GDM_SESSION (slave->priv->session), username);
 }
@@ -496,7 +496,7 @@ on_relay_answer (DBusGProxy *proxy,
 {
         GdmProductSlave *slave = GDM_PRODUCT_SLAVE (data);
 
-        g_debug ("Relay Answer");
+        g_debug ("GdmProductSlave: Relay Answer");
 
         gdm_session_answer_query (GDM_SESSION (slave->priv->session), text);
 }
@@ -508,7 +508,7 @@ on_relay_session_selected (DBusGProxy *proxy,
 {
         GdmProductSlave *slave = GDM_PRODUCT_SLAVE (data);
 
-        g_debug ("Session: %s", text);
+        g_debug ("GdmProductSlave: Session: %s", text);
 
         g_free (slave->priv->selected_session);
         slave->priv->selected_session = g_strdup (text);
@@ -521,7 +521,7 @@ on_relay_language_selected (DBusGProxy *proxy,
 {
         GdmProductSlave *slave = GDM_PRODUCT_SLAVE (data);
 
-        g_debug ("Language: %s", text);
+        g_debug ("GdmProductSlave: Language: %s", text);
 
         g_free (slave->priv->selected_language);
         slave->priv->selected_language = g_strdup (text);
@@ -542,7 +542,7 @@ on_relay_user_selected (DBusGProxy *proxy,
 {
         GdmProductSlave *slave = GDM_PRODUCT_SLAVE (data);
 
-        g_debug ("User: %s", text);
+        g_debug ("GdmProductSlave: User: %s", text);
 
         g_free (slave->priv->selected_user);
         slave->priv->selected_user = g_strdup (text);
@@ -567,7 +567,7 @@ create_new_session (GdmProductSlave *slave)
         char          *display_hostname;
         char          *display_device;
 
-        g_debug ("Creating new session");
+        g_debug ("GdmProductSlave: Creating new session");
 
         g_object_get (slave,
                       "display-name", &display_name,
@@ -641,7 +641,7 @@ on_relay_cancelled (DBusGProxy *proxy,
 {
         GdmProductSlave *slave = GDM_PRODUCT_SLAVE (data);
 
-        g_debug ("Relay cancelled");
+        g_debug ("GdmProductSlave: Relay cancelled");
 
         if (slave->priv->session != NULL) {
                 gdm_session_close (GDM_SESSION (slave->priv->session));
@@ -655,7 +655,7 @@ static void
 session_relay_proxy_destroyed (GObject         *object,
                                GdmProductSlave *slave)
 {
-        g_debug ("Session server relay destroyed");
+        g_debug ("GdmProductSlave: Session server relay destroyed");
 
         slave->priv->session_relay_proxy = NULL;
 }
@@ -681,7 +681,7 @@ get_relay_address (GdmProductSlave *slave)
         } else {
                 g_free (slave->priv->relay_address);
                 slave->priv->relay_address = g_strdup (text);
-                g_debug ("Got relay address: %s", slave->priv->relay_address);
+                g_debug ("GdmProductSlave: Got relay address: %s", slave->priv->relay_address);
         }
 
         g_free (text);
@@ -695,7 +695,7 @@ connect_to_session_relay (GdmProductSlave *slave)
 
         get_relay_address (slave);
 
-        g_debug ("connecting to session relay address: %s", slave->priv->relay_address);
+        g_debug ("GdmProductSlave: connecting to session relay address: %s", slave->priv->relay_address);
 
         dbus_error_init (&error);
         connection = dbus_connection_open_private (slave->priv->relay_address, &error);
@@ -712,7 +712,7 @@ connect_to_session_relay (GdmProductSlave *slave)
                 exit (1);
         }
 
-        g_debug ("creating session server proxy for peer: %s", SERVER_DBUS_PATH);
+        g_debug ("GdmProductSlave: creating session server proxy for peer: %s", SERVER_DBUS_PATH);
         slave->priv->session_relay_proxy = dbus_g_proxy_new_for_peer (slave->priv->session_relay_connection,
                                                                       SERVER_DBUS_PATH,
                                                                       SERVER_DBUS_INTERFACE);
@@ -865,7 +865,7 @@ gdm_product_slave_stop (GdmSlave *slave)
 {
         gboolean res;
 
-        g_debug ("Stopping product_slave");
+        g_debug ("GdmProductSlave: Stopping product_slave");
 
         res = GDM_SLAVE_CLASS (gdm_product_slave_parent_class)->stop (slave);
 
diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c
index c2f84f01..e03b9ab0 100644
--- a/daemon/gdm-server.c
+++ b/daemon/gdm-server.c
@@ -125,7 +125,7 @@ _gdm_server_query_ck_for_display_device (GdmServer *server)
         command = g_strdup_printf (LIBEXECDIR "/ck-get-x11-display-device --display %s",
                                    server->priv->display_name);
 
-        g_debug ("Running helper %s", command);
+        g_debug ("GdmServer: Running helper %s", command);
         out = NULL;
         res = g_spawn_command_line_sync (command,
                                          &out,
@@ -137,7 +137,7 @@ _gdm_server_query_ck_for_display_device (GdmServer *server)
                 g_error_free (error);
         } else {
                 out = g_strstrip (out);
-                g_debug ("Got tty: '%s'", out);
+                g_debug ("GdmServer: Got tty: '%s'", out);
         }
 
         g_free (command);
@@ -161,7 +161,7 @@ gdm_server_get_display_device (GdmServer *server)
 static gboolean
 emit_ready_idle (GdmServer *server)
 {
-        g_debug ("Got USR1 from X server - emitting READY");
+        g_debug ("GdmServer: Got USR1 from X server - emitting READY");
 
         g_signal_emit (server, signals[READY], 0);
         return FALSE;
@@ -218,7 +218,7 @@ connect_to_parent (GdmServer *server)
         int maxtries;
         int openretries;
 
-        g_debug ("gdm_server_start: Connecting to parent display \'%s\'",
+        g_debug ("GdmServer: Connecting to parent display \'%s\'",
                    d->parent_disp);
 
         d->parent_dsp = NULL;
@@ -231,7 +231,7 @@ connect_to_parent (GdmServer *server)
                 d->parent_dsp = XOpenDisplay (d->parent_disp);
 
                 if G_UNLIKELY (d->parent_dsp == NULL) {
-                        g_debug ("gdm_server_start: Sleeping %d on a retry", 1+openretries*2);
+                        g_debug ("GdmServer: Sleeping %d on a retry", 1+openretries*2);
                         gdm_sleep_no_signal (1+openretries*2);
                         openretries++;
                 }
@@ -361,7 +361,7 @@ change_user (GdmServer *server)
                 _exit (1);
         }
 
-        g_debug ("Changing (uid:gid) for child process to (%d:%d)",
+        g_debug ("GdmServer: Changing (uid:gid) for child process to (%d:%d)",
                  pwent->pw_uid,
                  pwent->pw_gid);
 
@@ -412,7 +412,7 @@ server_child_setup (GdmServer *server)
         /* Log all output from spawned programs to a file */
         temp = g_strconcat (server->priv->display_name, ".log", NULL);
         logfile = g_build_filename (server->priv->log_dir, temp, NULL);
-        g_debug ("Opening logfile for server %s", logfile);
+        g_debug ("GdmServer: Opening logfile for server %s", logfile);
 
         VE_IGNORE_EINTR (g_unlink (logfile));
         VE_IGNORE_EINTR (logfd = open (logfile, O_CREAT|O_TRUNC|O_WRONLY|O_EXCL, 0644));
@@ -565,7 +565,7 @@ server_child_watch (GPid       pid,
                     int        status,
                     GdmServer *server)
 {
-        g_debug ("child (pid:%d) done (%s:%d)",
+        g_debug ("GdmServer: child (pid:%d) done (%s:%d)",
                  (int) pid,
                  WIFEXITED (status) ? "status"
                  : WIFSIGNALED (status) ? "signal"
@@ -613,7 +613,7 @@ gdm_server_spawn (GdmServer  *server,
         env = get_server_environment (server);
 
         freeme = g_strjoinv (" ", argv);
-        g_debug ("Starting X server process: %s", freeme);
+        g_debug ("GdmServer: Starting X server process: %s", freeme);
         g_free (freeme);
 
         error = NULL;
@@ -640,7 +640,7 @@ gdm_server_spawn (GdmServer  *server,
         g_ptr_array_foreach (env, (GFunc)g_free, NULL);
         g_ptr_array_free (env, TRUE);
 
-        g_debug ("Started X server process %d - waiting for READY", (int)server->priv->pid);
+        g_debug ("GdmServer: Started X server process %d - waiting for READY", (int)server->priv->pid);
 
         server->priv->child_watch_id = g_child_watch_add (server->priv->pid,
                                                           (GChildWatchFunc)server_child_watch,
@@ -679,7 +679,7 @@ wait_on_child (int pid)
                 } else if (errno == ECHILD) {
                         ; /* do nothing, child already reaped */
                 } else {
-                        g_debug ("waitpid () should not fail");
+                        g_debug ("GdmServer: waitpid () should not fail");
                 }
         }
 
@@ -691,11 +691,11 @@ server_died (GdmServer *server)
 {
         int exit_status;
 
-        g_debug ("Waiting on process %d", server->priv->pid);
+        g_debug ("GdmServer: Waiting on process %d", server->priv->pid);
         exit_status = wait_on_child (server->priv->pid);
 
         if (WIFEXITED (exit_status) && (WEXITSTATUS (exit_status) != 0)) {
-                g_debug ("Wait on child process failed");
+                g_debug ("GdmServer: Wait on child process failed");
         } else {
                 /* exited normally */
         }
@@ -709,7 +709,7 @@ server_died (GdmServer *server)
                 g_object_notify (G_OBJECT (server), "display-device");
         }
 
-        g_debug ("Server died");
+        g_debug ("GdmServer: Server died");
 }
 
 gboolean
@@ -725,7 +725,7 @@ gdm_server_stop (GdmServer *server)
                 server->priv->child_watch_id = 0;
         }
 
-        g_debug ("Stopping server");
+        g_debug ("GdmServer: Stopping server");
 
         gdm_signal_pid (server->priv->pid, SIGTERM);
         server_died (server);
diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
index 0bcc14ec..57a30afc 100644
--- a/daemon/gdm-session-direct.c
+++ b/daemon/gdm-session-direct.c
@@ -160,7 +160,7 @@ send_dbus_string_signal (GdmSessionDirect *session,
         dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &text);
 
         if (! send_dbus_message (session->priv->worker_connection, message)) {
-                g_debug ("Could not send %s signal", name);
+                g_debug ("GdmSessionDirect: Could not send %s signal", name);
         }
 
         dbus_message_unref (message);
@@ -220,7 +220,7 @@ gdm_session_direct_handle_verified (GdmSessionDirect *session,
 {
         DBusMessage *reply;
 
-        g_debug ("Emitting 'user-verified' signal");
+        g_debug ("GdmSessionDirect: Emitting 'user-verified' signal");
 
         reply = dbus_message_new_method_return (message);
         dbus_connection_send (connection, reply, NULL);
@@ -253,7 +253,7 @@ gdm_session_direct_handle_verification_failed (GdmSessionDirect *session,
         dbus_connection_send (connection, reply, NULL);
         dbus_message_unref (reply);
 
-        g_debug ("Emitting 'verification-failed' signal");
+        g_debug ("GdmSessionDirect: Emitting 'verification-failed' signal");
 
         _gdm_session_user_verification_error (GDM_SESSION (session), NULL);
 
@@ -280,7 +280,7 @@ gdm_session_direct_handle_username_changed (GdmSessionDirect *session,
         dbus_connection_send (connection, reply, NULL);
         dbus_message_unref (reply);
 
-        g_debug ("changing username from '%s' to '%s'",
+        g_debug ("GdmSessionDirect: changing username from '%s' to '%s'",
                  session->priv->selected_user != NULL ? session->priv->selected_user : "<unset>",
                  (strlen (text)) ? text : "<unset>");
 
@@ -301,7 +301,7 @@ cancel_pending_query (GdmSessionDirect *session)
                 return;
         }
 
-        g_debug ("Cancelling pending query");
+        g_debug ("GdmSessionDirect: Cancelling pending query");
 
         reply = dbus_message_new_error (session->priv->message_pending_reply,
                                         GDM_SESSION_DBUS_ERROR_CANCEL,
@@ -360,7 +360,7 @@ gdm_session_direct_handle_info_query (GdmSessionDirect *session,
 
         set_pending_query (session, message);
 
-        g_debug ("Emitting 'info-query' signal");
+        g_debug ("GdmSessionDirect: Emitting 'info-query' signal");
         _gdm_session_info_query (GDM_SESSION (session), text);
 
         return DBUS_HANDLER_RESULT_HANDLED;
@@ -383,7 +383,7 @@ gdm_session_direct_handle_secret_info_query (GdmSessionDirect *session,
 
         set_pending_query (session, message);
 
-        g_debug ("Emitting 'secret-info-query' signal");
+        g_debug ("GdmSessionDirect: Emitting 'secret-info-query' signal");
         _gdm_session_secret_info_query (GDM_SESSION (session), text);
 
         return DBUS_HANDLER_RESULT_HANDLED;
@@ -409,7 +409,7 @@ gdm_session_direct_handle_info (GdmSessionDirect *session,
         dbus_connection_send (connection, reply, NULL);
         dbus_message_unref (reply);
 
-        g_debug ("Emitting 'info' signal");
+        g_debug ("GdmSessionDirect: Emitting 'info' signal");
         _gdm_session_info (GDM_SESSION (session), text);
 
         return DBUS_HANDLER_RESULT_HANDLED;
@@ -435,7 +435,7 @@ gdm_session_direct_handle_problem (GdmSessionDirect *session,
         dbus_connection_send (connection, reply, NULL);
         dbus_message_unref (reply);
 
-        g_debug ("Emitting 'problem' signal");
+        g_debug ("GdmSessionDirect: Emitting 'problem' signal");
         _gdm_session_problem (GDM_SESSION (session), text);
 
         return DBUS_HANDLER_RESULT_HANDLED;
@@ -461,7 +461,7 @@ gdm_session_direct_handle_session_started (GdmSessionDirect *session,
         dbus_connection_send (connection, reply, NULL);
         dbus_message_unref (reply);
 
-        g_debug ("Emitting 'session-started' signal with pid '%d'",
+        g_debug ("GdmSessionDirect: Emitting 'session-started' signal with pid '%d'",
                  pid);
 
         session->priv->session_pid = pid;
@@ -492,7 +492,7 @@ gdm_session_direct_handle_startup_failed (GdmSessionDirect *session,
         dbus_connection_send (connection, reply, NULL);
         dbus_message_unref (reply);
 
-        g_debug ("Emitting 'session-startup-error' signal");
+        g_debug ("GdmSessionDirect: Emitting 'session-startup-error' signal");
         _gdm_session_session_startup_error (GDM_SESSION (session), text);
 
         return DBUS_HANDLER_RESULT_HANDLED;
@@ -518,7 +518,7 @@ gdm_session_direct_handle_session_exited (GdmSessionDirect *session,
         dbus_connection_send (connection, reply, NULL);
         dbus_message_unref (reply);
 
-        g_debug ("Emitting 'session-exited' signal with exit code '%d'",
+        g_debug ("GdmSessionDirect: Emitting 'session-exited' signal with exit code '%d'",
                  code);
 
         session->priv->is_running = FALSE;
@@ -547,7 +547,7 @@ gdm_session_direct_handle_session_died (GdmSessionDirect *session,
         dbus_connection_send (connection, reply, NULL);
         dbus_message_unref (reply);
 
-        g_debug ("Emitting 'session-died' signal with signal number '%d'",
+        g_debug ("GdmSessionDirect: Emitting 'session-died' signal with signal number '%d'",
                  code);
 
         session->priv->is_running = FALSE;
@@ -598,7 +598,7 @@ do_introspect (DBusConnection *connection,
         GString     *xml;
         char        *xml_string;
 
-        g_debug ("Do introspect");
+        g_debug ("GdmSessionDirect: Do introspect");
 
         /* standard header */
         xml = g_string_new ("<!DOCTYPE node PUBLIC \"-//freedesktop//DTD D-BUS Object Introspection 1.0//EN\"\n"
@@ -730,7 +730,7 @@ session_message_handler (DBusConnection  *connection,
         } else if (dbus_message_is_signal (message, DBUS_INTERFACE_LOCAL, "Disconnected") &&
                    strcmp (dbus_message_get_path (message), DBUS_PATH_LOCAL) == 0) {
 
-                g_debug ("Disconnected here");
+                g_debug ("GdmSessionDirect: Disconnected");
 
                 /*dbus_connection_unref (connection);*/
 
@@ -788,7 +788,7 @@ allow_user_function (DBusConnection *connection,
                 return TRUE;
         }
 
-        g_debug ("User not allowed");
+        g_debug ("GdmSessionDirect: User not allowed");
 
         return FALSE;
 }
@@ -800,7 +800,7 @@ handle_connection (DBusServer      *server,
 {
         GdmSessionDirect *session = GDM_SESSION_DIRECT (user_data);
 
-        g_debug ("Handing new connection");
+        g_debug ("GdmSessionDirect: Handing new connection");
 
         if (session->priv->worker_connection == NULL) {
                 DBusObjectPathVTable vtable = { &session_unregister_handler,
@@ -812,7 +812,7 @@ handle_connection (DBusServer      *server,
                 dbus_connection_ref (new_connection);
                 dbus_connection_setup_with_g_main (new_connection, NULL);
 
-                g_debug ("worker connection is %p", new_connection);
+                g_debug ("GdmSessionDirect: worker connection is %p", new_connection);
                 dbus_connection_set_exit_on_disconnect (new_connection, FALSE);
 
                 dbus_connection_set_unix_user_function (new_connection,
@@ -825,7 +825,7 @@ handle_connection (DBusServer      *server,
                                                       &vtable,
                                                       session);
 
-                g_debug ("Emitting opened signal");
+                g_debug ("GdmSessionDirect: Emitting opened signal");
                 _gdm_session_opened (GDM_SESSION (session));
         }
 }
@@ -840,7 +840,7 @@ setup_server (GdmSessionDirect *session)
 
         ret = FALSE;
 
-        g_debug ("Creating D-Bus server for session");
+        g_debug ("GdmSessionDirect: Creating D-Bus server for session");
 
         address = generate_address ();
 
@@ -865,7 +865,7 @@ setup_server (GdmSessionDirect *session)
         g_free (session->priv->server_address);
         session->priv->server_address = dbus_server_get_address (session->priv->server);
 
-        g_debug ("D-Bus server listening on %s", session->priv->server_address);
+        g_debug ("GdmSessionDirect: D-Bus server listening on %s", session->priv->server_address);
 
  out:
 
@@ -919,14 +919,14 @@ static void
 worker_stopped (GdmSessionWorkerJob *job,
                 GdmSessionDirect    *session)
 {
-        g_debug ("Worker job stopped");
+        g_debug ("GdmSessionDirect: Worker job stopped");
 }
 
 static void
 worker_started (GdmSessionWorkerJob *job,
                 GdmSessionDirect    *session)
 {
-        g_debug ("Worker job started");
+        g_debug ("GdmSessionDirect: Worker job started");
 }
 
 static void
@@ -934,7 +934,7 @@ worker_exited (GdmSessionWorkerJob *job,
                int                  code,
                GdmSessionDirect    *session)
 {
-        g_debug ("Worker job exited: %d", code);
+        g_debug ("GdmSessionDirect: Worker job exited: %d", code);
 
         if (!session->priv->is_verified) {
                 char *msg;
@@ -952,7 +952,7 @@ worker_died (GdmSessionWorkerJob *job,
              int                  signum,
              GdmSessionDirect    *session)
 {
-        g_debug ("Worker job died: %d", signum);
+        g_debug ("GdmSessionDirect: Worker job died: %d", signum);
 
         if (!session->priv->is_verified) {
                 char *msg;
@@ -1016,7 +1016,7 @@ gdm_session_direct_open (GdmSession *session)
 
         g_return_if_fail (session != NULL);
 
-        g_debug ("Openning session");
+        g_debug ("GdmSessionDirect: Openning session");
 
         res = start_worker (impl);
 }
@@ -1027,7 +1027,7 @@ send_begin_verification (GdmSessionDirect *session)
         DBusMessage    *message;
         DBusMessageIter iter;
 
-        g_debug ("Beginning verification");
+        g_debug ("GdmSessionDirect: Beginning verification");
 
         message = dbus_message_new_signal (GDM_SESSION_DBUS_PATH,
                                            GDM_SESSION_DBUS_INTERFACE,
@@ -1040,7 +1040,7 @@ send_begin_verification (GdmSessionDirect *session)
         dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &session->priv->display_hostname);
 
         if (! send_dbus_message (session->priv->worker_connection, message)) {
-                g_debug ("Could not send %s signal", "BeginVerification");
+                g_debug ("GdmSessionDirect: Could not send %s signal", "BeginVerification");
         }
 
         dbus_message_unref (message);
@@ -1052,7 +1052,7 @@ send_begin_verification_for_user (GdmSessionDirect *session)
         DBusMessage    *message;
         DBusMessageIter iter;
 
-        g_debug ("Beginning verification for user %s", session->priv->selected_user);
+        g_debug ("GdmSessionDirect: Beginning verification for user %s", session->priv->selected_user);
 
         message = dbus_message_new_signal (GDM_SESSION_DBUS_PATH,
                                            GDM_SESSION_DBUS_INTERFACE,
@@ -1066,7 +1066,7 @@ send_begin_verification_for_user (GdmSessionDirect *session)
         dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &session->priv->selected_user);
 
         if (! send_dbus_message (session->priv->worker_connection, message)) {
-                g_debug ("Could not send %s signal", "BeginVerificationForUser");
+                g_debug ("GdmSessionDirect: Could not send %s signal", "BeginVerificationForUser");
         }
 
         dbus_message_unref (message);
@@ -1115,7 +1115,7 @@ send_environment_variable (const char       *key,
         dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &value);
 
         if (! send_dbus_message (session->priv->worker_connection, message)) {
-                g_debug ("Could not send %s signal", "SetEnvironmentVariable");
+                g_debug ("GdmSessionDirect: Could not send %s signal", "SetEnvironmentVariable");
         }
 
         dbus_message_unref (message);
@@ -1177,7 +1177,7 @@ get_session_command_for_file (const char *file,
                                          G_KEY_FILE_NONE,
                                          &error);
         if (! res) {
-                g_debug ("File '%s' not found: %s", file, error->message);
+                g_debug ("GdmSessionDirect: File '%s' not found: %s", file, error->message);
                 g_error_free (error);
                 if (command != NULL) {
                         *command = NULL;
@@ -1191,7 +1191,7 @@ get_session_command_for_file (const char *file,
                                       G_KEY_FILE_DESKTOP_KEY_HIDDEN,
                                       &error);
         if (error == NULL && res) {
-                g_debug ("Session %s is marked as hidden", file);
+                g_debug ("GdmSessionDirect: Session %s is marked as hidden", file);
                 goto out;
         }
 
@@ -1201,7 +1201,7 @@ get_session_command_for_file (const char *file,
                                       G_KEY_FILE_DESKTOP_KEY_TRY_EXEC,
                                       &error);
         if (exec == NULL) {
-                g_debug ("%s key not found", G_KEY_FILE_DESKTOP_KEY_TRY_EXEC);
+                g_debug ("GdmSessionDirect: %s key not found", G_KEY_FILE_DESKTOP_KEY_TRY_EXEC);
                 goto out;
         }
 
@@ -1209,7 +1209,7 @@ get_session_command_for_file (const char *file,
         g_free (exec);
 
         if (! res) {
-                g_debug ("Command not found: %s", G_KEY_FILE_DESKTOP_KEY_TRY_EXEC);
+                g_debug ("GdmSessionDirect: Command not found: %s", G_KEY_FILE_DESKTOP_KEY_TRY_EXEC);
                 goto out;
         }
 
@@ -1219,7 +1219,7 @@ get_session_command_for_file (const char *file,
                                       G_KEY_FILE_DESKTOP_KEY_EXEC,
                                       &error);
         if (error != NULL) {
-                g_debug ("%s key not found: %s",
+                g_debug ("GdmSessionDirect: %s key not found: %s",
                          G_KEY_FILE_DESKTOP_KEY_EXEC,
                          error->message);
                 g_error_free (error);
@@ -1386,7 +1386,7 @@ gdm_session_direct_close (GdmSession *session)
 
         g_return_if_fail (session != NULL);
 
-        g_debug ("Closing session");
+        g_debug ("GdmSessionDirect: Closing session");
 
         if (impl->priv->ckc != NULL) {
                 ck_connector_close_session (impl->priv->ckc, NULL);
@@ -1509,7 +1509,7 @@ static void
 _gdm_session_direct_set_display_device (GdmSessionDirect *session,
                                         const char       *name)
 {
-        g_debug ("Setting display device: %s", name);
+        g_debug ("GdmSessionDirect: Setting display device: %s", name);
         g_free (session->priv->display_device);
         session->priv->display_device = g_strdup (name);
 }
@@ -1600,7 +1600,7 @@ gdm_session_direct_dispose (GObject *object)
 
         session = GDM_SESSION_DIRECT (object);
 
-        g_debug ("Disposing session");
+        g_debug ("GdmSessionDirect: Disposing session");
 
         gdm_session_direct_close (GDM_SESSION (session));
 
diff --git a/daemon/gdm-session-relay.c b/daemon/gdm-session-relay.c
index 59575361..59c84825 100644
--- a/daemon/gdm-session-relay.c
+++ b/daemon/gdm-session-relay.c
@@ -91,7 +91,7 @@ send_dbus_message (DBusConnection *connection,
         g_return_val_if_fail (message != NULL, FALSE);
 
         if (connection == NULL) {
-                g_debug ("There is no valid connection");
+                g_debug ("GdmSessionRelay: There is no valid connection");
                 return FALSE;
         }
 
@@ -124,7 +124,7 @@ send_dbus_string_signal (GdmSessionRelay *session_relay,
         dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &text);
 
         if (! send_dbus_message (session_relay->priv->session_connection, message)) {
-                g_debug ("Could not send %s signal", name);
+                g_debug ("GdmSessionRelay: Could not send %s signal", name);
         }
 
         dbus_message_unref (message);
@@ -143,7 +143,7 @@ send_dbus_void_signal (GdmSessionRelay *session_relay,
                                            name);
 
         if (! send_dbus_message (session_relay->priv->session_connection, message)) {
-                g_debug ("Could not send %s signal", name);
+                g_debug ("GdmSessionRelay: Could not send %s signal", name);
         }
 
         dbus_message_unref (message);
@@ -167,7 +167,7 @@ static void
 gdm_session_relay_begin_verification (GdmSession *session)
 {
         GdmSessionRelay *impl = GDM_SESSION_RELAY (session);
-        g_debug ("Sending signal BeginVerification");
+        g_debug ("GdmSessionRelay: Sending signal BeginVerification");
         send_dbus_void_signal (impl, "BeginVerification");
 }
 
@@ -176,7 +176,7 @@ gdm_session_relay_begin_verification_for_user (GdmSession *session,
                                                const char *username)
 {
         GdmSessionRelay *impl = GDM_SESSION_RELAY (session);
-        g_debug ("Sending signal BeginVerificationForUser");
+        g_debug ("GdmSessionRelay: Sending signal BeginVerificationForUser");
         send_dbus_string_signal (impl, "BeginVerificationForUser", username);
 }
 
@@ -185,7 +185,7 @@ gdm_session_relay_answer_query (GdmSession *session,
                                 const char *text)
 {
         GdmSessionRelay *impl = GDM_SESSION_RELAY (session);
-        g_debug ("Sending signal AnswerQuery");
+        g_debug ("GdmSessionRelay: Sending signal AnswerQuery");
         send_dbus_string_signal (impl, "AnswerQuery", text);
 }
 
@@ -273,7 +273,7 @@ handle_info_query (GdmSessionRelay *session_relay,
                 g_warning ("ERROR: %s", error.message);
         }
 
-        g_debug ("InfoQuery: %s", text);
+        g_debug ("GdmSessionRelay: InfoQuery: %s", text);
 
         reply = dbus_message_new_method_return (message);
         dbus_connection_send (connection, reply, NULL);
@@ -300,7 +300,7 @@ handle_secret_info_query (GdmSessionRelay *session_relay,
                 g_warning ("ERROR: %s", error.message);
         }
 
-        g_debug ("SecretInfoQuery: %s", text);
+        g_debug ("GdmSessionRelay: SecretInfoQuery: %s", text);
 
         reply = dbus_message_new_method_return (message);
         dbus_connection_send (connection, reply, NULL);
@@ -327,7 +327,7 @@ handle_info (GdmSessionRelay *session_relay,
                 g_warning ("ERROR: %s", error.message);
         }
 
-        g_debug ("Info: %s", text);
+        g_debug ("GdmSessionRelay: Info: %s", text);
 
         reply = dbus_message_new_method_return (message);
         dbus_connection_send (connection, reply, NULL);
@@ -354,7 +354,7 @@ handle_problem (GdmSessionRelay *session_relay,
                 g_warning ("ERROR: %s", error.message);
         }
 
-        g_debug ("Problem: %s", text);
+        g_debug ("GdmSessionRelay: Problem: %s", text);
 
         reply = dbus_message_new_method_return (message);
         dbus_connection_send (connection, reply, NULL);
@@ -375,7 +375,7 @@ handle_user_verified (GdmSessionRelay *session_relay,
 
         dbus_error_init (&error);
 
-        g_debug ("UserVerified");
+        g_debug ("GdmSessionRelay: UserVerified");
 
         reply = dbus_message_new_method_return (message);
         dbus_connection_send (connection, reply, NULL);
@@ -396,7 +396,7 @@ handle_user_verification_error (GdmSessionRelay *session_relay,
 
         dbus_error_init (&error);
 
-        g_debug ("UserVerificationError");
+        g_debug ("GdmSessionRelay: UserVerificationError");
 
         reply = dbus_message_new_method_return (message);
         dbus_connection_send (connection, reply, NULL);
@@ -417,7 +417,7 @@ handle_session_started (GdmSessionRelay *session_relay,
 
         dbus_error_init (&error);
 
-        g_debug ("SessionStarted");
+        g_debug ("GdmSessionRelay: SessionStarted");
 
         reply = dbus_message_new_method_return (message);
         dbus_connection_send (connection, reply, NULL);
@@ -438,7 +438,7 @@ handle_session_stopped (GdmSessionRelay *session_relay,
 
         dbus_error_init (&error);
 
-        g_debug ("SessionStopped");
+        g_debug ("GdmSessionRelay: SessionStopped");
 
         reply = dbus_message_new_method_return (message);
         dbus_connection_send (connection, reply, NULL);
@@ -461,7 +461,7 @@ handle_opened (GdmSessionRelay *session_relay,
 
         dbus_error_init (&error);
 
-        g_debug ("Opened");
+        g_debug ("GdmSessionRelay: Opened");
 
         reply = dbus_message_new_method_return (message);
         dbus_connection_send (connection, reply, NULL);
@@ -482,7 +482,7 @@ handle_reset (GdmSessionRelay *session_relay,
 
         dbus_error_init (&error);
 
-        g_debug ("Reset");
+        g_debug ("GdmSessionRelay: Reset");
 
         reply = dbus_message_new_method_return (message);
         dbus_connection_send (connection, reply, NULL);
@@ -535,7 +535,7 @@ do_introspect (DBusConnection *connection,
         GString     *xml;
         char        *xml_string;
 
-        g_debug ("Do introspect");
+        g_debug ("GdmSessionRelay: Do introspect");
 
         /* standard header */
         xml = g_string_new ("<!DOCTYPE node PUBLIC \"-//freedesktop//DTD D-BUS Object Introspection 1.0//EN\"\n"
@@ -635,7 +635,7 @@ session_relay_message_handler (DBusConnection  *connection,
         const char *dbus_interface   = dbus_message_get_interface (message);
         const char *dbus_member      = dbus_message_get_member (message);
 
-        g_debug ("session_relay_message_handler: destination=%s obj_path=%s interface=%s method=%s",
+        g_debug ("GdmSessionRelay: session_relay_message_handler: destination=%s obj_path=%s interface=%s method=%s",
                  dbus_destination ? dbus_destination : "(null)",
                  dbus_path        ? dbus_path        : "(null)",
                  dbus_interface   ? dbus_interface   : "(null)",
@@ -689,7 +689,7 @@ connection_filter_function (DBusConnection *connection,
         const char      *dbus_interface = dbus_message_get_interface (message);
         const char      *dbus_message   = dbus_message_get_member (message);
 
-        g_debug ("obj_path=%s interface=%s method=%s",
+        g_debug ("GdmSessionRelay: obj_path=%s interface=%s method=%s",
                  dbus_path      ? dbus_path      : "(null)",
                  dbus_interface ? dbus_interface : "(null)",
                  dbus_message   ? dbus_message   : "(null)");
@@ -697,7 +697,7 @@ connection_filter_function (DBusConnection *connection,
         if (dbus_message_is_signal (message, DBUS_INTERFACE_LOCAL, "Disconnected")
             && strcmp (dbus_path, DBUS_PATH_LOCAL) == 0) {
 
-                g_debug ("Disconnected");
+                g_debug ("GdmSessionRelay: Disconnected");
 
                 dbus_connection_unref (connection);
                 session_relay->priv->session_connection = NULL;
@@ -732,7 +732,7 @@ handle_connection (DBusServer      *server,
 {
         GdmSessionRelay *session_relay = GDM_SESSION_RELAY (user_data);
 
-        g_debug ("Handling new connection");
+        g_debug ("GdmSessionRelay: Handling new connection");
 
         g_assert (session_relay->priv->session_connection == NULL);
 
@@ -746,7 +746,7 @@ handle_connection (DBusServer      *server,
                 dbus_connection_ref (new_connection);
                 dbus_connection_setup_with_g_main (new_connection, NULL);
 
-                g_debug ("session connection is %p", new_connection);
+                g_debug ("GdmSessionRelay: session connection is %p", new_connection);
 
                 dbus_connection_add_filter (new_connection,
                                             connection_filter_function,
@@ -777,7 +777,7 @@ gdm_session_relay_start (GdmSessionRelay *session_relay)
 
         ret = FALSE;
 
-        g_debug ("Creating D-Bus relay for session");
+        g_debug ("GdmSessionRelay: Creating D-Bus relay for session");
 
         address = generate_address ();
 
@@ -802,7 +802,7 @@ gdm_session_relay_start (GdmSessionRelay *session_relay)
         g_free (session_relay->priv->server_address);
         session_relay->priv->server_address = dbus_server_get_address (session_relay->priv->server);
 
-        g_debug ("D-Bus relay listening on %s", session_relay->priv->server_address);
+        g_debug ("GdmSessionRelay: D-Bus relay listening on %s", session_relay->priv->server_address);
 
  out:
 
@@ -816,7 +816,7 @@ gdm_session_relay_stop (GdmSessionRelay *session_relay)
 
         ret = FALSE;
 
-        g_debug ("Stopping session relay...");
+        g_debug ("GdmSessionRelay: Stopping session relay...");
 
         return ret;
 }
diff --git a/daemon/gdm-session-worker-job.c b/daemon/gdm-session-worker-job.c
index 9e54bcac..ca74e93b 100644
--- a/daemon/gdm-session-worker-job.c
+++ b/daemon/gdm-session-worker-job.c
@@ -91,7 +91,7 @@ session_worker_job_child_watch (GPid                 pid,
                                 int                  status,
                                 GdmSessionWorkerJob *job)
 {
-        g_debug ("child (pid:%d) done (%s:%d)",
+        g_debug ("GdmSessionWorkerJob: child (pid:%d) done (%s:%d)",
                  (int) pid,
                  WIFEXITED (status) ? "status"
                  : WIFSIGNALED (status) ? "signal"
@@ -152,7 +152,7 @@ gdm_session_worker_job_spawn (GdmSessionWorkerJob *session_worker_job)
 
         ret = FALSE;
 
-        g_debug ("Running session_worker_job process: %s", session_worker_job->priv->command);
+        g_debug ("GdmSessionWorkerJob: Running session_worker_job process: %s", session_worker_job->priv->command);
 
         argv = NULL;
         if (! g_shell_parse_argv (session_worker_job->priv->command, NULL, &argv, &error)) {
@@ -185,7 +185,7 @@ gdm_session_worker_job_spawn (GdmSessionWorkerJob *session_worker_job)
                            error->message);
                 g_error_free (error);
         } else {
-                g_debug ("gdm_slave_session_worker_job: SessionWorkerJob on pid %d", (int)session_worker_job->priv->pid);
+                g_debug ("GdmSessionWorkerJob: : SessionWorkerJob on pid %d", (int)session_worker_job->priv->pid);
         }
 
         session_worker_job->priv->child_watch_id = g_child_watch_add (session_worker_job->priv->pid,
@@ -209,7 +209,7 @@ gdm_session_worker_job_start (GdmSessionWorkerJob *session_worker_job)
 {
         gboolean    res;
 
-        g_debug ("Starting worker...");
+        g_debug ("GdmSessionWorkerJob: Starting worker...");
 
         res = gdm_session_worker_job_spawn (session_worker_job);
 
@@ -233,7 +233,7 @@ wait_on_child (int pid)
                 } else if (errno == ECHILD) {
                         ; /* do nothing, child already reaped */
                 } else {
-                        g_debug ("waitpid () should not fail");
+                        g_debug ("GdmSessionWorkerJob: waitpid () should not fail");
                 }
         }
 
@@ -245,11 +245,11 @@ session_worker_job_died (GdmSessionWorkerJob *session_worker_job)
 {
         int exit_status;
 
-        g_debug ("Waiting on process %d", session_worker_job->priv->pid);
+        g_debug ("GdmSessionWorkerJob: Waiting on process %d", session_worker_job->priv->pid);
         exit_status = wait_on_child (session_worker_job->priv->pid);
 
         if (WIFEXITED (exit_status) && (WEXITSTATUS (exit_status) != 0)) {
-                g_debug ("Wait on child process failed");
+                g_debug ("GdmSessionWorkerJob: Wait on child process failed");
         } else {
                 /* exited normally */
         }
@@ -257,7 +257,7 @@ session_worker_job_died (GdmSessionWorkerJob *session_worker_job)
         g_spawn_close_pid (session_worker_job->priv->pid);
         session_worker_job->priv->pid = -1;
 
-        g_debug ("SessionWorkerJob died");
+        g_debug ("GdmSessionWorkerJob: SessionWorkerJob died");
 }
 
 gboolean
@@ -274,7 +274,7 @@ gdm_session_worker_job_stop (GdmSessionWorkerJob *session_worker_job)
                 session_worker_job->priv->child_watch_id = 0;
         }
 
-        g_debug ("Stopping session_worker_job pid:%d", session_worker_job->priv->pid);
+        g_debug ("GdmSessionWorkerJob: Stopping job pid:%d", session_worker_job->priv->pid);
 
         gdm_signal_pid (session_worker_job->priv->pid, SIGTERM);
         session_worker_job_died (session_worker_job);
diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c
index 4b94ecd1..4a41afd9 100644
--- a/daemon/gdm-session-worker.c
+++ b/daemon/gdm-session-worker.c
@@ -319,7 +319,7 @@ send_dbus_string_method (DBusConnection *connection,
                 str = "";
         }
 
-        g_debug ("Calling %s", method);
+        g_debug ("GdmSessionWorker: Calling %s", method);
         message = dbus_message_new_method_call (NULL,
                                                 GDM_SESSION_DBUS_PATH,
                                                 GDM_SESSION_DBUS_INTERFACE,
@@ -365,7 +365,7 @@ send_dbus_int_method (DBusConnection *connection,
         DBusMessage    *reply;
         DBusMessageIter iter;
 
-        g_debug ("Calling %s", method);
+        g_debug ("GdmSessionWorker: Calling %s", method);
         message = dbus_message_new_method_call (NULL,
                                                 GDM_SESSION_DBUS_PATH,
                                                 GDM_SESSION_DBUS_INTERFACE,
@@ -407,7 +407,7 @@ send_user_verified (GdmSessionWorker *worker)
         DBusMessage    *message;
         DBusMessage    *reply;
 
-        g_debug ("Calling Verified");
+        g_debug ("GdmSessionWorker: Calling Verified");
         message = dbus_message_new_method_call (NULL,
                                                 GDM_SESSION_DBUS_PATH,
                                                 GDM_SESSION_DBUS_INTERFACE,
@@ -497,7 +497,7 @@ gdm_session_worker_get_username (GdmSessionWorker  *worker,
         if (pam_get_item (worker->priv->pam_handle, PAM_USER, &item) == PAM_SUCCESS) {
                 if (username != NULL) {
                         *username = g_strdup ((char *) item);
-                        g_debug ("username is '%s'",
+                        g_debug ("GdmSessionWorker: username is '%s'",
                                  *username != NULL ? *username : "<unset>");
                 }
                 return TRUE;
@@ -520,7 +520,7 @@ gdm_session_worker_update_username (GdmSessionWorker *worker)
                      (strcmp (worker->priv->username, username) == 0)))
                         goto out;
 
-                g_debug ("setting username to '%s'", username);
+                g_debug ("GdmSessionWorker: setting username to '%s'", username);
 
                 g_free (worker->priv->username);
                 worker->priv->username = username;
@@ -548,7 +548,7 @@ send_question_method (GdmSessionWorker *worker,
 
         ret = FALSE;
 
-        g_debug ("Calling %s", method);
+        g_debug ("GdmSessionWorker: Calling %s", method);
         message = dbus_message_new_method_call (NULL,
                                                 GDM_SESSION_DBUS_PATH,
                                                 GDM_SESSION_DBUS_INTERFACE,
@@ -673,7 +673,7 @@ gdm_session_worker_process_pam_message (GdmSessionWorker          *worker,
 
         gdm_session_worker_update_username (worker);
 
-        g_debug ("received pam message of type %u with payload '%s'",
+        g_debug ("GdmSessionWorker: received pam message of type %u with payload '%s'",
                  query->msg_style, query->msg);
 
         utf8_msg = convert_to_utf8 (query->msg);
@@ -696,7 +696,7 @@ gdm_session_worker_process_pam_message (GdmSessionWorker          *worker,
                 res = gdm_session_worker_report_problem (worker, utf8_msg);
                 break;
         default:
-                g_debug ("unknown query of type %u\n", query->msg_style);
+                g_debug ("GdmSessionWorker: unknown query of type %u\n", query->msg_style);
                 break;
         }
 
@@ -710,7 +710,7 @@ gdm_session_worker_process_pam_message (GdmSessionWorker          *worker,
 
                 g_free (user_answer);
 
-                g_debug ("trying to get updated username");
+                g_debug ("GdmSessionWorker: trying to get updated username");
 
                 res = TRUE;
         }
@@ -730,7 +730,7 @@ gdm_session_worker_pam_new_messages_handler (int                        number_o
         int                  return_value;
         int                  i;
 
-        g_debug ("%d new messages received from PAM\n", number_of_messages);
+        g_debug ("GdmSessionWorker: %d new messages received from PAM\n", number_of_messages);
 
         return_value = PAM_CONV_ERR;
 
@@ -785,7 +785,7 @@ gdm_session_worker_pam_new_messages_handler (int                        number_o
                 *responses = replies;
         }
 
-        g_debug ("PAM conversation returning %d: %s",
+        g_debug ("GdmSessionWorker: PAM conversation returning %d: %s",
                  return_value,
                  pam_strerror (worker->priv->pam_handle, return_value));
 
@@ -796,7 +796,7 @@ static void
 gdm_session_worker_uninitialize_pam (GdmSessionWorker *worker,
                                      int               error_code)
 {
-        g_debug ("uninitializing PAM");
+        g_debug ("GdmSessionWorker: uninitializing PAM");
 
         if (worker->priv->pam_handle == NULL)
                 return;
@@ -840,7 +840,7 @@ gdm_session_worker_initialize_pam (GdmSessionWorker *worker,
 
         g_assert (worker->priv->pam_handle == NULL);
 
-        g_debug ("initializing PAM");
+        g_debug ("GdmSessionWorker: initializing PAM");
 
         pam_conversation.conv = (GdmSessionWorkerPamNewMessagesFunc) gdm_session_worker_pam_new_messages_handler;
         pam_conversation.appdata_ptr = worker;
@@ -851,7 +851,7 @@ gdm_session_worker_initialize_pam (GdmSessionWorker *worker,
                                 &worker->priv->pam_handle);
 
         if (error_code != PAM_SUCCESS) {
-                g_debug ("could not initialize pam");
+                g_debug ("GdmSessionWorker: could not initialize pam");
                 /* we don't use pam_strerror here because it requires a valid
                  * pam handle, and if pam_start fails pam_handle is undefined
                  */
@@ -924,7 +924,7 @@ gdm_session_worker_authenticate_user (GdmSessionWorker *worker,
         int error_code;
         int authentication_flags;
 
-        g_debug ("authenticating user");
+        g_debug ("GdmSessionWorker: authenticating user");
 
         authentication_flags = 0;
 
@@ -937,7 +937,7 @@ gdm_session_worker_authenticate_user (GdmSessionWorker *worker,
         error_code = pam_authenticate (worker->priv->pam_handle, authentication_flags);
 
         if (error_code != PAM_SUCCESS) {
-                g_debug ("authentication returned %d: %s", error_code, pam_strerror (worker->priv->pam_handle, error_code));
+                g_debug ("GdmSessionWorker: authentication returned %d: %s", error_code, pam_strerror (worker->priv->pam_handle, error_code));
 
                 g_set_error (error,
                              GDM_SESSION_WORKER_ERROR,
@@ -963,7 +963,7 @@ gdm_session_worker_authorize_user (GdmSessionWorker *worker,
         int error_code;
         int authentication_flags;
 
-        g_debug ("determining if authenticated user is authorized to session");
+        g_debug ("GdmSessionWorker: determining if authenticated user is authorized to session");
 
         authentication_flags = 0;
 
@@ -981,7 +981,7 @@ gdm_session_worker_authorize_user (GdmSessionWorker *worker,
                 error_code = pam_chauthtok (worker->priv->pam_handle, PAM_CHANGE_EXPIRED_AUTHTOK);
 
         if (error_code != PAM_SUCCESS) {
-                g_debug ("user is not authorized to log in: %s",
+                g_debug ("GdmSessionWorker: user is not authorized to log in: %s",
                          pam_strerror (worker->priv->pam_handle, error_code));
                 g_set_error (error,
                              GDM_SESSION_WORKER_ERROR,
@@ -1180,7 +1180,7 @@ gdm_session_worker_verify_user (GdmSessionWorker  *worker,
         GError   *pam_error;
         gboolean  res;
 
-        g_debug ("Verifying user: %s host: %s service: %s display: %s tty: %s",
+        g_debug ("GdmSessionWorker: Verifying user: %s host: %s service: %s display: %s tty: %s",
                  username != NULL ? username : "(null)",
                  hostname != NULL ? hostname : "(null)",
                  service_name != NULL ? service_name : "(null)",
@@ -1206,7 +1206,7 @@ gdm_session_worker_verify_user (GdmSessionWorker  *worker,
                                                     password_is_required,
                                                     &pam_error);
         if (! res) {
-                g_debug ("Unable to verify user");
+                g_debug ("GdmSessionWorker: Unable to verify user");
                 g_propagate_error (error, pam_error);
                 return FALSE;
         }
@@ -1214,7 +1214,7 @@ gdm_session_worker_verify_user (GdmSessionWorker  *worker,
         /* we're authenticated.  Let's make sure we've been given
          * a valid username for the system
          */
-        g_debug ("trying to get updated username");
+        g_debug ("GdmSessionWorker: trying to get updated username");
         gdm_session_worker_update_username (worker);
 
         /* make sure the user is allowed to log in to this system
@@ -1235,7 +1235,7 @@ gdm_session_worker_verify_user (GdmSessionWorker  *worker,
                 return FALSE;
         }
 
-        g_debug ("verification process completed, creating reply...");
+        g_debug ("GdmSessionWorker: verification process completed, creating reply...");
 
         send_user_verified (worker);
 
@@ -1301,7 +1301,7 @@ session_worker_child_watch (GPid              pid,
                             int               status,
                             GdmSessionWorker *worker)
 {
-        g_debug ("child (pid:%d) done (%s:%d)",
+        g_debug ("GdmSessionWorker: child (pid:%d) done (%s:%d)",
                  (int) pid,
                  WIFEXITED (status) ? "status"
                  : WIFSIGNALED (status) ? "signal"
@@ -1353,10 +1353,10 @@ gdm_session_worker_open_user_session (GdmSessionWorker  *worker,
         }
         worker->priv->is_running = TRUE;
 
-        g_debug ("querying pam for user environment");
+        g_debug ("GdmSessionWorker: querying pam for user environment");
         gdm_session_worker_update_environment_from_pam (worker);
 
-        g_debug ("opening user session with program '%s'",
+        g_debug ("GdmSessionWorker: opening user session with program '%s'",
                  worker->priv->arguments[0]);
 
         session_pid = fork ();
@@ -1375,12 +1375,12 @@ gdm_session_worker_open_user_session (GdmSessionWorker  *worker,
                 char  *home_dir;
 
                 if (setuid (getuid ()) < 0) {
-                        g_debug ("could not reset uid - %s", g_strerror (errno));
+                        g_debug ("GdmSessionWorker: could not reset uid - %s", g_strerror (errno));
                         _exit (1);
                 }
 
                 if (setsid () < 0) {
-                        g_debug ("could not set pid '%u' as leader of new session and process group - %s",
+                        g_debug ("GdmSessionWorker: could not set pid '%u' as leader of new session and process group - %s",
                                  (guint) getpid (), g_strerror (errno));
                         _exit (2);
                 }
@@ -1401,7 +1401,7 @@ gdm_session_worker_open_user_session (GdmSessionWorker  *worker,
                                      environment,
                                      TRUE);
 
-                g_debug ("child '%s' could not be started - %s",
+                g_debug ("GdmSessionWorker: child '%s' could not be started - %s",
                          worker->priv->arguments[0],
                          g_strerror (errno));
                 g_strfreev (environment);
@@ -1411,7 +1411,7 @@ gdm_session_worker_open_user_session (GdmSessionWorker  *worker,
 
         worker->priv->child_pid = session_pid;
 
-        g_debug ("session opened creating reply...");
+        g_debug ("GdmSessionWorker: session opened creating reply...");
         g_assert (sizeof (GPid) <= sizeof (int));
 
         send_session_started (worker, session_pid);
@@ -1456,7 +1456,7 @@ gdm_session_worker_open (GdmSessionWorker    *worker,
         if (! res) {
                 g_assert (verification_error != NULL);
 
-                g_debug ("%s", verification_error->message);
+                g_debug ("GdmSessionWorker: %s", verification_error->message);
 
                 g_propagate_error (error, verification_error);
 
@@ -1470,7 +1470,7 @@ gdm_session_worker_open (GdmSessionWorker    *worker,
             !gdm_session_worker_open_user_session (worker, &verification_error)) {
                 g_assert (verification_error != NULL);
 
-                g_debug ("%s", verification_error->message);
+                g_debug ("GdmSessionWorker: %s", verification_error->message);
 
                 g_propagate_error (error, verification_error);
 
@@ -1586,7 +1586,7 @@ on_set_environment_variable (GdmSessionWorker *worker,
                                      DBUS_TYPE_STRING, &value,
                                      DBUS_TYPE_INVALID);
         if (res) {
-                g_debug ("set env: %s = %s", key, value);
+                g_debug ("GdmSessionWorker: set env: %s = %s", key, value);
                 gdm_session_worker_set_environment_variable (worker, key, value);
         } else {
                 g_warning ("Unable to get arguments: %s", error.message);
@@ -1608,7 +1608,7 @@ on_start_program (GdmSessionWorker *worker,
                                      DBUS_TYPE_STRING, &text,
                                      DBUS_TYPE_INVALID);
         if (res) {
-                g_debug ("start program: %s", text);
+                g_debug ("GdmSessionWorker: start program: %s", text);
 
                 gdm_session_worker_start_program (worker, text);
         } else {
@@ -1632,7 +1632,7 @@ open_idle (OpenData *data)
         GError  *error;
         gboolean res;
 
-        g_debug ("begin verification: %s %s", data->service, data->console);
+        g_debug ("GdmSessionWorker: begin verification: %s %s", data->service, data->console);
 
         error = NULL;
         res = gdm_session_worker_open (data->worker,
@@ -1643,7 +1643,7 @@ open_idle (OpenData *data)
                                        data->username,
                                        &error);
         if (! res) {
-                g_debug ("Verification failed: %s", error->message);
+                g_debug ("GdmSessionWorker: Verification failed: %s", error->message);
                 g_error_free (error);
                 send_user_verification_error (data->worker, error->message);
         }
@@ -1709,7 +1709,7 @@ on_begin_verification (GdmSessionWorker *worker,
                                      DBUS_TYPE_STRING, &hostname,
                                      DBUS_TYPE_INVALID);
         if (res) {
-                g_debug ("begin verification: %s %s", service, console);
+                g_debug ("GdmSessionWorker: begin verification: %s %s", service, console);
                 queue_open (worker, service, x11_display_name, console, hostname, NULL);
         } else {
                 g_warning ("Unable to get arguments: %s", error.message);
@@ -1739,7 +1739,7 @@ on_begin_verification_for_user (GdmSessionWorker *worker,
                                      DBUS_TYPE_STRING, &username,
                                      DBUS_TYPE_INVALID);
         if (res) {
-                g_debug ("begin verification: %s %s", service, console);
+                g_debug ("GdmSessionWorker: begin verification: %s %s", service, console);
                 queue_open (worker, service, x11_display_name, console, hostname, username);
         } else {
                 g_warning ("Unable to get arguments: %s", error.message);
@@ -1789,7 +1789,7 @@ worker_dbus_filter_function (DBusConnection *connection,
 
         path = dbus_message_get_path (message);
 
-        g_debug ("obj_path=%s interface=%s method=%s",
+        g_debug ("GdmSessionWorker: obj_path=%s interface=%s method=%s",
                  dbus_message_get_path (message),
                  dbus_message_get_interface (message),
                  dbus_message_get_member (message));
@@ -1805,7 +1805,7 @@ worker_dbus_filter_function (DBusConnection *connection,
         } else if (dbus_message_is_signal (message,
                                            DBUS_INTERFACE_DBUS,
                                            "NameOwnerChanged")) {
-                g_debug ("Name owner changed?");
+                g_debug ("GdmSessionWorker: Name owner changed?");
         } else {
                 return worker_dbus_handle_message (connection, message, user_data, FALSE);
         }
@@ -1828,7 +1828,7 @@ gdm_session_worker_constructor (GType                  type,
                                                                                                     n_construct_properties,
                                                                                                     construct_properties));
 
-        g_debug ("connecting to address: %s", worker->priv->server_address);
+        g_debug ("GdmSessionWorker: connecting to address: %s", worker->priv->server_address);
 
         dbus_error_init (&error);
         worker->priv->connection = dbus_connection_open (worker->priv->server_address, &error);
diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
index 989a9150..c905636f 100644
--- a/daemon/gdm-simple-slave.c
+++ b/daemon/gdm-simple-slave.c
@@ -93,7 +93,7 @@ static void
 on_session_started (GdmSession       *session,
                     GdmSimpleSlave   *slave)
 {
-        g_debug ("session started");
+        g_debug ("GdmSimpleSlave: session started");
 
         /* FIXME: should we do something here? */
 }
@@ -103,7 +103,7 @@ on_session_exited (GdmSession     *session,
                    int             exit_code,
                    GdmSimpleSlave *slave)
 {
-        g_debug ("session exited with code %d\n", exit_code);
+        g_debug ("GdmSimpleSlave: session exited with code %d\n", exit_code);
 
         gdm_slave_stopped (GDM_SLAVE (slave));
 }
@@ -113,7 +113,7 @@ on_session_died (GdmSession     *session,
                  int             signal_number,
                  GdmSimpleSlave *slave)
 {
-        g_debug ("session died with signal %d, (%s)",
+        g_debug ("GdmSimpleSlave: session died with signal %d, (%s)",
                  signal_number,
                  g_strsignal (signal_number));
 
@@ -190,7 +190,7 @@ on_session_info (GdmSession     *session,
                  const char     *text,
                  GdmSimpleSlave *slave)
 {
-        g_debug ("Info: %s", text);
+        g_debug ("GdmSimpleSlave: Info: %s", text);
         gdm_greeter_server_info (slave->priv->greeter_server, text);
 }
 
@@ -199,7 +199,7 @@ on_session_problem (GdmSession     *session,
                     const char     *text,
                     GdmSimpleSlave *slave)
 {
-        g_debug ("Problem: %s", text);
+        g_debug ("GdmSimpleSlave: Problem: %s", text);
         gdm_greeter_server_problem (slave->priv->greeter_server, text);
 }
 
@@ -209,7 +209,7 @@ on_session_info_query (GdmSession     *session,
                        GdmSimpleSlave *slave)
 {
 
-        g_debug ("Info query: %s", text);
+        g_debug ("GdmSimpleSlave: Info query: %s", text);
         gdm_greeter_server_info_query (slave->priv->greeter_server, text);
 }
 
@@ -218,7 +218,7 @@ on_session_secret_info_query (GdmSession     *session,
                               const char     *text,
                               GdmSimpleSlave *slave)
 {
-        g_debug ("Secret info query: %s", text);
+        g_debug ("GdmSimpleSlave: Secret info query: %s", text);
         gdm_greeter_server_secret_info_query (slave->priv->greeter_server, text);
 }
 
@@ -228,7 +228,7 @@ on_session_opened (GdmSession     *session,
 {
         gboolean res;
 
-        g_debug ("session opened");
+        g_debug ("GdmSimpleSlave: session opened");
         res = gdm_greeter_server_ready (slave->priv->greeter_server);
         if (! res) {
                 g_warning ("Unable to send ready");
@@ -240,7 +240,7 @@ on_session_selected_user_changed (GdmSession     *session,
                                   const char     *text,
                                   GdmSimpleSlave *slave)
 {
-        g_debug ("Selected user changed: %s", text);
+        g_debug ("GdmSimpleSlave: Selected user changed: %s", text);
 
         gdm_greeter_server_selected_user_changed (slave->priv->greeter_server, text);
 }
@@ -254,7 +254,7 @@ create_new_session (GdmSimpleSlave *slave)
         char          *display_hostname;
         char          *display_device;
 
-        g_debug ("Creating new session");
+        g_debug ("GdmSimpleSlave: Creating new session");
 
         g_object_get (slave,
                       "display-name", &display_name,
@@ -338,21 +338,21 @@ static void
 on_greeter_start (GdmGreeterSession *greeter,
                   GdmSimpleSlave    *slave)
 {
-        g_debug ("Greeter started");
+        g_debug ("GdmSimpleSlave: Greeter started");
 }
 
 static void
 on_greeter_stop (GdmGreeterSession *greeter,
                  GdmSimpleSlave    *slave)
 {
-        g_debug ("Greeter stopped");
+        g_debug ("GdmSimpleSlave: Greeter stopped");
 }
 
 static void
 on_greeter_begin_verification (GdmGreeterServer *greeter_server,
                                GdmSimpleSlave   *slave)
 {
-        g_debug ("begin verification");
+        g_debug ("GdmSimpleSlave: begin verification");
         gdm_session_begin_verification (GDM_SESSION (slave->priv->session));
 }
 
@@ -361,7 +361,7 @@ on_greeter_begin_verification_for_user (GdmGreeterServer *greeter_server,
                                         const char       *username,
                                         GdmSimpleSlave   *slave)
 {
-        g_debug ("begin verification");
+        g_debug ("GdmSimpleSlave: begin verification");
         gdm_session_begin_verification_for_user (GDM_SESSION (slave->priv->session),
                                                  username);
 }
@@ -395,14 +395,14 @@ on_greeter_user_selected (GdmGreeterServer *greeter_server,
                           const char       *text,
                           GdmSimpleSlave   *slave)
 {
-        g_debug ("Greeter user selected");
+        g_debug ("GdmSimpleSlave: Greeter user selected");
 }
 
 static void
 on_greeter_cancel (GdmGreeterServer *greeter_server,
                    GdmSimpleSlave   *slave)
 {
-        g_debug ("Greeter cancelled");
+        g_debug ("GdmSimpleSlave: Greeter cancelled");
 
         if (slave->priv->session != NULL) {
                 gdm_session_close (GDM_SESSION (slave->priv->session));
@@ -420,7 +420,7 @@ on_greeter_connected (GdmGreeterServer *greeter_server,
 {
         gboolean display_is_local;
 
-        g_debug ("Greeter started");
+        g_debug ("GdmSimpleSlave: Greeter started");
 
         gdm_session_open (GDM_SESSION (slave->priv->session));
 
@@ -452,7 +452,7 @@ run_greeter (GdmSimpleSlave *slave)
         char          *auth_file;
         char          *address;
 
-        g_debug ("Running greeter");
+        g_debug ("GdmSimpleSlave: Running greeter");
 
         display_is_local = FALSE;
         display_id = NULL;
@@ -469,7 +469,7 @@ run_greeter (GdmSimpleSlave *slave)
                       "display-x11-authority-file", &auth_file,
                       NULL);
 
-        g_debug ("Creating greeter for %s %s", display_name, display_hostname);
+        g_debug ("GdmSimpleSlave: Creating greeter for %s %s", display_name, display_hostname);
 
         if (slave->priv->server != NULL) {
                 display_device = gdm_server_get_display_device (slave->priv->server);
@@ -524,7 +524,7 @@ run_greeter (GdmSimpleSlave *slave)
 
         address = gdm_greeter_server_get_address (slave->priv->greeter_server);
 
-        g_debug ("Creating greeter on %s %s %s", display_name, display_device, display_hostname);
+        g_debug ("GdmSimpleSlave: Creating greeter on %s %s %s", display_name, display_device, display_hostname);
         slave->priv->greeter = gdm_greeter_session_new (display_name,
                                                         display_device,
                                                         display_hostname,
@@ -616,7 +616,7 @@ gdm_simple_slave_run (GdmSimpleSlave *slave)
                         exit (1);
                 }
 
-                g_debug ("Started X server");
+                g_debug ("GdmSimpleSlave: Started X server");
         } else {
                 g_timeout_add (500, (GSourceFunc)idle_connect_to_display, slave);
         }
@@ -643,7 +643,7 @@ gdm_simple_slave_stop (GdmSlave *slave)
 {
         gboolean res;
 
-        g_debug ("Stopping simple_slave");
+        g_debug ("GdmSimpleSlave: Stopping simple_slave");
 
         res = GDM_SLAVE_CLASS (gdm_simple_slave_parent_class)->stop (slave);
 
diff --git a/daemon/gdm-slave-proxy.c b/daemon/gdm-slave-proxy.c
index 22cfaabc..e03f2f2a 100644
--- a/daemon/gdm-slave-proxy.c
+++ b/daemon/gdm-slave-proxy.c
@@ -70,7 +70,7 @@ child_watch (GPid           pid,
              int            status,
              GdmSlaveProxy *slave)
 {
-        g_debug ("slave (pid:%d) done (%s:%d)",
+        g_debug ("GdmSlaveProxy: slave (pid:%d) done (%s:%d)",
                  (int) pid,
                  WIFEXITED (status) ? "status"
                  : WIFSIGNALED (status) ? "signal"
@@ -106,7 +106,7 @@ spawn_slave (GdmSlaveProxy *slave)
                 goto out;
         }
 
-        g_debug ("Running command: %s", slave->priv->command);
+        g_debug ("GdmSlaveProxy: Running command: %s", slave->priv->command);
 
         error = NULL;
         result = g_spawn_async_with_pipes (NULL,
@@ -130,7 +130,7 @@ spawn_slave (GdmSlaveProxy *slave)
 
         g_strfreev (argv);
 
-        g_debug ("Started slave with pid %d", slave->priv->pid);
+        g_debug ("GdmSlaveProxy: Started slave with pid %d", slave->priv->pid);
 
         slave->priv->child_watch_id = g_child_watch_add (slave->priv->pid,
                                                          (GChildWatchFunc)child_watch,
@@ -164,7 +164,7 @@ gdm_slave_proxy_start (GdmSlaveProxy *slave)
 gboolean
 gdm_slave_proxy_stop (GdmSlaveProxy *slave)
 {
-        g_debug ("Killing slave");
+        g_debug ("GdmSlaveProxy: Killing slave");
 
         kill_slave (slave);
 
@@ -230,7 +230,7 @@ gdm_slave_proxy_dispose (GObject *object)
 
         slave = GDM_SLAVE_PROXY (object);
 
-        g_debug ("Disposing slave proxy");
+        g_debug ("GdmSlaveProxy: Disposing slave proxy");
         if (slave->priv->child_watch_id > 0) {
                 g_source_remove (slave->priv->child_watch_id);
                 slave->priv->child_watch_id = 0;
diff --git a/daemon/gdm-slave.c b/daemon/gdm-slave.c
index 063be872..0037e107 100644
--- a/daemon/gdm-slave.c
+++ b/daemon/gdm-slave.c
@@ -158,7 +158,7 @@ listify_hash (const char *key,
 {
         char *str;
         str = g_strdup_printf ("%s=%s", key, value);
-        g_debug ("script environment: %s", str);
+        g_debug ("GdmSlave: script environment: %s", str);
         g_ptr_array_add (env, str);
 }
 
@@ -300,7 +300,7 @@ gdm_slave_run_script (GdmSlave   *slave,
 
         create_temp_auth_file (slave);
 
-        g_debug ("Running process: %s", script);
+        g_debug ("GdmSlave: Running process: %s", script);
         error = NULL;
         if (! g_shell_parse_argv (script, NULL, &argv, &error)) {
                 g_warning ("Could not parse command: %s", error->message);
@@ -327,7 +327,7 @@ gdm_slave_run_script (GdmSlave   *slave,
         gdm_slave_whack_temp_auth_file (slave);
 
         if (WIFEXITED (status)) {
-                g_debug ("Process exit status: %d", WEXITSTATUS (status));
+                g_debug ("GdmSlave: Process exit status: %d", WEXITSTATUS (status));
                 ret = WEXITSTATUS (status) != 0;
         } else {
                 ret = TRUE;
@@ -360,7 +360,7 @@ set_local_auth (GdmSlave *slave)
         GString *binary_cookie;
         GString *cookie;
 
-        g_debug ("Setting authorization key for display %s", slave->priv->display_x11_cookie);
+        g_debug ("GdmSlave: Setting authorization key for display %s", slave->priv->display_x11_cookie);
 
         cookie = g_string_new (slave->priv->display_x11_cookie);
         binary_cookie = g_string_new (NULL);
@@ -373,7 +373,7 @@ set_local_auth (GdmSlave *slave)
                 goto out;
         }
 
-        g_debug ("Decoded cookie len %d", (int) binary_cookie->len);
+        g_debug ("GdmSlave: Decoded cookie len %d", (int) binary_cookie->len);
 
         XSetAuthorization ("MIT-MAGIC-COOKIE-1",
                            (int) strlen ("MIT-MAGIC-COOKIE-1"),
@@ -397,7 +397,7 @@ gdm_slave_connect_to_x11_display (GdmSlave *slave)
         /* We keep our own (windowless) connection (dsp) open to avoid the
          * X server resetting due to lack of active connections. */
 
-        g_debug ("Server is ready - opening display %s", slave->priv->display_name);
+        g_debug ("GdmSlave: Server is ready - opening display %s", slave->priv->display_name);
 
         g_setenv ("DISPLAY", slave->priv->display_name, TRUE);
         g_unsetenv ("XAUTHORITY"); /* just in case it's set */
@@ -424,7 +424,7 @@ gdm_slave_connect_to_x11_display (GdmSlave *slave)
                 g_warning ("Unable to connect to display %s", slave->priv->display_name);
                 ret = FALSE;
         } else {
-                g_debug ("Connected to display %s", slave->priv->display_name);
+                g_debug ("GdmSlave: Connected to display %s", slave->priv->display_name);
                 ret = TRUE;
         }
 
@@ -435,7 +435,7 @@ static void
 display_proxy_destroyed_cb (DBusGProxy *display_proxy,
                             GdmSlave   *slave)
 {
-        g_debug ("Disconnected from display");
+        g_debug ("GdmSlave: Disconnected from display");
 
         slave->priv->display_proxy = NULL;
 }
@@ -447,11 +447,11 @@ gdm_slave_real_start (GdmSlave *slave)
         char    *id;
         GError  *error;
 
-        g_debug ("Starting slave");
+        g_debug ("GdmSlave: Starting slave");
 
         g_assert (slave->priv->display_proxy == NULL);
 
-        g_debug ("Creating proxy for %s", slave->priv->display_id);
+        g_debug ("GdmSlave: Creating proxy for %s", slave->priv->display_id);
         error = NULL;
         slave->priv->display_proxy = dbus_g_proxy_new_for_name_owner (slave->priv->connection,
                                                                       GDM_DBUS_NAME,
@@ -492,7 +492,7 @@ gdm_slave_real_start (GdmSlave *slave)
                 return FALSE;
         }
 
-        g_debug ("Got display id: %s", id);
+        g_debug ("GdmSlave: Got display id: %s", id);
 
         if (strcmp (id, slave->priv->display_id) != 0) {
                 g_critical ("Display ID doesn't match");
@@ -614,7 +614,7 @@ gdm_slave_real_start (GdmSlave *slave)
 static gboolean
 gdm_slave_real_stop (GdmSlave *slave)
 {
-        g_debug ("Stopping slave");
+        g_debug ("GdmSlave: Stopping slave");
 
         if (slave->priv->display_proxy != NULL) {
                 g_object_unref (slave->priv->display_proxy);
@@ -630,7 +630,7 @@ gdm_slave_start (GdmSlave *slave)
 
         g_return_val_if_fail (GDM_IS_SLAVE (slave), FALSE);
 
-        g_debug ("starting slave");
+        g_debug ("GdmSlave: starting slave");
 
         g_object_ref (slave);
         ret = GDM_SLAVE_GET_CLASS (slave)->start (slave);
@@ -646,7 +646,7 @@ gdm_slave_stop (GdmSlave *slave)
 
         g_return_val_if_fail (GDM_IS_SLAVE (slave), FALSE);
 
-        g_debug ("stopping slave");
+        g_debug ("GdmSlave: stopping slave");
 
         g_object_ref (slave);
         ret = GDM_SLAVE_GET_CLASS (slave)->stop (slave);
@@ -875,7 +875,7 @@ gdm_slave_constructor (GType                  type,
         }
 
         slave->priv->id = g_strdup_printf ("/org/gnome/DisplayManager/Slave%s", id);
-        g_debug ("Registering %s", slave->priv->id);
+        g_debug ("GdmSlave: Registering %s", slave->priv->id);
 
         res = register_slave (slave);
         if (! res) {
diff --git a/daemon/gdm-static-factory-display.c b/daemon/gdm-static-factory-display.c
index d3350ab0..75c15b4c 100644
--- a/daemon/gdm-static-factory-display.c
+++ b/daemon/gdm-static-factory-display.c
@@ -93,7 +93,7 @@ gdm_static_factory_display_create_product_display (GdmStaticFactoryDisplay *disp
 
         num = get_next_display_number ();
 
-        g_debug ("Creating product display %d  address:%s", num, relay_address);
+        g_debug ("GdmStaticFactoryDisplay: Creating product display %d  address:%s", num, relay_address);
 
         product = gdm_product_display_new (num, relay_address);
 
diff --git a/daemon/gdm-xdmcp-display-factory.c b/daemon/gdm-xdmcp-display-factory.c
index 7f3765ef..6a79f670 100644
--- a/daemon/gdm-xdmcp-display-factory.c
+++ b/daemon/gdm-xdmcp-display-factory.c
@@ -379,7 +379,7 @@ debug_addrinfo (struct addrinfo *ai)
 {
         char *str;
         str = ai_flags_str (ai);
-        g_debug ("XDMCP: addrinfo family=%s type=%s proto=%s flags=%s",
+        g_debug ("GdmXdmcpDisplayFactory: addrinfo family=%s type=%s proto=%s flags=%s",
                  ai_family_str (ai),
                  ai_type_str (ai),
                  ai_protocol_str (ai),
@@ -452,7 +452,7 @@ do_bind (guint                     port,
                         host = NULL;
                         serv = NULL;
                         gdm_address_get_numeric_info (addr, &host, &serv);
-                        g_debug ("XDMCP: Attempting to bind to host %s port %s", host, serv);
+                        g_debug ("GdmXdmcpDisplayFactory: Attempting to bind to host %s port %s", host, serv);
                         g_free (host);
                         g_free (serv);
                         gdm_address_free (addr);
@@ -517,7 +517,7 @@ setup_multicast (GdmXdmcpDisplayFactory *factory)
                                 ifreq.ifr_name[sizeof (ifreq.ifr_name) - 1] = '\0';
 
                                 if (ioctl (socktemp, SIOCGIFFLAGS, &ifreq) < 0) {
-                                        g_debug ("XDMCP: Could not get SIOCGIFFLAGS for %s",
+                                        g_debug ("GdmXdmcpDisplayFactory: Could not get SIOCGIFFLAGS for %s",
                                                  ifr[i].ifr_name);
                                 }
 
@@ -568,7 +568,7 @@ open_port (GdmXdmcpDisplayFactory *factory)
 {
         struct sockaddr_storage serv_sa = { 0 };
 
-        g_debug ("XDMCP: Start up on host %s, port %d",
+        g_debug ("GdmXdmcpDisplayFactory: Start up on host %s, port %d",
                  factory->priv->hostname,
                  factory->priv->port);
 
@@ -777,7 +777,7 @@ gdm_xdmcp_send_willing (GdmXdmcpDisplayFactory *factory,
 
         host = NULL;
         gdm_address_get_numeric_info (address, &host, NULL);
-        g_debug ("XDMCP: Sending WILLING to %s", host);
+        g_debug ("GdmXdmcpDisplayFactory: Sending WILLING to %s", host);
         g_free (host);
 
         if (last_willing == 0 || time (NULL) - 3 > last_willing) {
@@ -845,7 +845,7 @@ gdm_xdmcp_send_unwilling (GdmXdmcpDisplayFactory *factory,
 
         host = NULL;
         gdm_address_get_numeric_info (address, &host, NULL);
-        g_debug ("XDMCP: Sending UNWILLING to %s", host);
+        g_debug ("GdmXdmcpDisplayFactory: Sending UNWILLING to %s", host);
         g_warning (_("Denied XDMCP query from host %s"), host);
         g_free (host);
 
@@ -947,14 +947,14 @@ gdm_xdmcp_send_forward_query (GdmXdmcpDisplayFactory  *factory,
 
         host = NULL;
         gdm_address_get_numeric_info (id->chosen_host, &host, NULL);
-        g_debug ("XDMCP: Sending forward query to %s",
+        g_debug ("GdmXdmcpDisplayFactory: Sending forward query to %s",
                    host);
         g_free (host);
 
         host = NULL;
         serv = NULL;
         gdm_address_get_numeric_info (display_address, &host, &serv);
-        g_debug ("gdm_xdmcp_send_forward_query: Query contains %s:%s",
+        g_debug ("GdmXdmcpDisplayFactory: Query contains %s:%s",
                  host, serv);
         g_free (host);
         g_free (serv);
@@ -1166,7 +1166,7 @@ gdm_forward_query_dispose (GdmXdmcpDisplayFactory *factory,
 
                 host = NULL;
                 gdm_address_get_numeric_info (q->dsp_address, &host, NULL);
-                g_debug ("gdm_forward_query_dispose: Disposing %s", host);
+                g_debug ("GdmXdmcpDisplayFactory: Disposing %s", host);
                 g_free (host);
         }
 
@@ -1252,7 +1252,7 @@ gdm_forward_query_lookup (GdmXdmcpDisplayFactory *factory,
                 serv = NULL;
                 gdm_address_get_numeric_info (q->dsp_address, &host, &serv);
 
-                g_debug ("gdm_forward_query_lookup: comparing %s:%s", host, serv);
+                g_debug ("GdmXdmcpDisplayFactory: comparing %s:%s", host, serv);
                 if (gdm_address_equal (q->dsp_address, address)) {
                         ret = q;
                         g_free (host);
@@ -1261,7 +1261,7 @@ gdm_forward_query_lookup (GdmXdmcpDisplayFactory *factory,
                 }
 
                 if (q->acctime > 0 &&  curtime > q->acctime + GDM_FORWARD_QUERY_TIMEOUT) {
-                        g_debug ("gdm_forward_query_lookup: Disposing stale forward query from %s:%s",
+                        g_debug ("GdmXdmcpDisplayFactory: Disposing stale forward query from %s:%s",
                                  host, serv);
 
                         gdm_forward_query_dispose (factory, q);
@@ -1278,7 +1278,7 @@ gdm_forward_query_lookup (GdmXdmcpDisplayFactory *factory,
 
                 host = NULL;
                 gdm_address_get_numeric_info (address, &host, NULL);
-                g_debug ("gdm_forward_query_lookup: Host %s not found",
+                g_debug ("GdmXdmcpDisplayFactory: Host %s not found",
                          host);
                 g_free (host);
         }
@@ -1452,7 +1452,7 @@ gdm_xdmcp_handle_forward_query (GdmXdmcpDisplayFactory *factory,
         for (i = 0 ; i < clnt_authlist.length ; i++) {
                 char *s = g_strndup ((char *) clnt_authlist.data[i].data,
                                      clnt_authlist.length);
-                g_debug ("gdm_xdmcp_handle_forward_query: authlist: %s", s);
+                g_debug ("GdmXdmcpDisplayFactory: authlist: %s", s);
                 g_free (s);
 
                 explen += 2 + clnt_authlist.data[i].length;
@@ -1476,7 +1476,7 @@ gdm_xdmcp_handle_forward_query (GdmXdmcpDisplayFactory *factory,
         host = NULL;
         serv = NULL;
         gdm_address_get_numeric_info (disp_address, &host, &serv);
-        g_debug ("gdm_xdmcp_handle_forward_query: Got FORWARD_QUERY for display: %s, port %s",
+        g_debug ("GdmXdmcpDisplayFactory: Got FORWARD_QUERY for display: %s, port %s",
                  host, serv);
         g_free (host);
         g_free (serv);
@@ -1515,7 +1515,7 @@ gdm_xdmcp_really_send_managed_forward (GdmXdmcpDisplayFactory *factory,
 
         host = NULL;
         gdm_address_get_numeric_info (address, &host, NULL);
-        g_debug ("XDMCP: Sending MANAGED_FORWARD to %s", host);
+        g_debug ("GdmXdmcpDisplayFactory: Sending MANAGED_FORWARD to %s", host);
         g_free (host);
 
         set_address_for_request (origin, &addr);
@@ -1596,7 +1596,7 @@ gdm_xdmcp_send_got_managed_forward (GdmXdmcpDisplayFactory *factory,
 
         host = NULL;
         gdm_address_get_numeric_info (address, &host, NULL);
-        g_debug ("XDMCP: Sending GOT_MANAGED_FORWARD to %s", host);
+        g_debug ("GdmXdmcpDisplayFactory: Sending GOT_MANAGED_FORWARD to %s", host);
         g_free (host);
 
         set_address_for_request (origin, &addr);
@@ -1730,7 +1730,7 @@ display_dispose_check (GdmXdmcpDisplayFactory *factory,
 
         store = gdm_display_factory_get_display_store (GDM_DISPLAY_FACTORY (factory));
 
-        g_debug ("display_dispose_check (%s:%d)", hostname, display_num);
+        g_debug ("GdmXdmcpDisplayFactory: display_dispose_check (%s:%d)", hostname, display_num);
 
         data = g_new0 (RemoveHostData, 1);
         data->hostname = hostname;
@@ -1757,7 +1757,7 @@ gdm_xdmcp_send_decline (GdmXdmcpDisplayFactory *factory,
 
         host = NULL;
         gdm_address_get_numeric_info (address, &host, NULL);
-        g_debug ("XMDCP: Sending DECLINE to %s", host);
+        g_debug ("GdmXdmcpDisplayFactory: Sending DECLINE to %s", host);
         g_free (host);
 
         authentype.data   = (CARD8 *) 0;
@@ -1803,7 +1803,7 @@ gdm_xdmcp_display_alloc (GdmXdmcpDisplayFactory *factory,
         GdmDisplay      *display;
         GdmDisplayStore *store;
 
-        g_debug ("Creating xdmcp display for %s:%d", hostname, displaynum);
+        g_debug ("GdmXdmcpDisplayFactory: Creating xdmcp display for %s:%d", hostname, displaynum);
 
         display = gdm_xdmcp_display_new (hostname,
                                          displaynum,
@@ -1862,7 +1862,7 @@ gdm_xdmcp_send_accept (GdmXdmcpDisplayFactory *factory,
 
         host = NULL;
         gdm_address_get_numeric_info (address, &host, NULL);
-        g_debug ("XDMCP: Sending ACCEPT to %s with SessionID=%ld",
+        g_debug ("GdmXdmcpDisplayFactory: Sending ACCEPT to %s with SessionID=%ld",
                  host,
                  (long)session_id);
         g_free (host);
@@ -1891,7 +1891,7 @@ gdm_xdmcp_handle_request (GdmXdmcpDisplayFactory *factory,
 
         hostname = NULL;
         gdm_address_get_numeric_info (address, &hostname, NULL);
-        g_debug ("gdm_xdmcp_handle_request: Got REQUEST from %s", hostname);
+        g_debug ("GdmXdmcpDisplayFactory: Got REQUEST from %s", hostname);
 
         /* Check with tcp_wrappers if client is allowed to access */
         if (! gdm_xdmcp_host_allow (address)) {
@@ -2007,7 +2007,7 @@ gdm_xdmcp_handle_request (GdmXdmcpDisplayFactory *factory,
 
         {
                 char *s = g_strndup ((char *) clnt_manufacturer.data, clnt_manufacturer.length);
-                g_debug ("gdm_xdmcp_handle_request: xdmcp_pending=%d, MaxPending=%d, xdmcp_sessions=%d, MaxSessions=%d, ManufacturerID=%s",
+                g_debug ("GdmXdmcpDisplayFactory: xdmcp_pending=%d, MaxPending=%d, xdmcp_sessions=%d, MaxSessions=%d, ManufacturerID=%s",
                          factory->priv->num_pending_sessions,
                          factory->priv->max_pending_displays,
                          factory->priv->num_sessions,
@@ -2030,7 +2030,7 @@ gdm_xdmcp_handle_request (GdmXdmcpDisplayFactory *factory,
                 display_dispose_check (factory, hostname, clnt_dspnum);
 
                 if (factory->priv->num_pending_sessions >= factory->priv->max_pending_displays) {
-                        g_debug ("gdm_xdmcp_handle_request: maximum pending");
+                        g_debug ("GdmXdmcpDisplayFactory: maximum pending");
                         /* Don't translate, this goes over the wire to servers where we
                          * don't know the charset or language, so it must be ascii */
                         gdm_xdmcp_send_decline (factory, address, "Maximum pending servers");
@@ -2078,7 +2078,7 @@ gdm_xdmcp_handle_request (GdmXdmcpDisplayFactory *factory,
                                 }
 
                                 /* sanity check cookie */
-                                g_debug ("Original cookie len:%d '%s'; Reencoded cookie len:%d '%s'",
+                                g_debug ("GdmXdmcpDisplayFactory: Original cookie len:%d '%s'; Reencoded cookie len:%d '%s'",
                                          (int) cookie->len,
                                          cookie->str,
                                          (int) test_cookie->len,
@@ -2087,8 +2087,8 @@ gdm_xdmcp_handle_request (GdmXdmcpDisplayFactory *factory,
                                 g_assert (strcmp (test_cookie->str, cookie->str) == 0);
                                 g_string_free (test_cookie, TRUE);
 
-                                g_debug ("Sending authorization key for display %s", cookie->str);
-                                g_debug ("Decoded cookie len %d", (int) binary_cookie->len);
+                                g_debug ("GdmXdmcpDisplayFactory: Sending authorization key for display %s", cookie->str);
+                                g_debug ("GdmXdmcpDisplayFactory: Decoded cookie len %d", (int) binary_cookie->len);
 
                                 session_number = gdm_xdmcp_display_get_session_number (GDM_XDMCP_DISPLAY (display));
 
@@ -2132,7 +2132,7 @@ gdm_xdmcp_handle_request (GdmXdmcpDisplayFactory *factory,
                                                 address,
                                                 "Maximum number of open sessions reached");
                 } else {
-                        g_debug ("Maximum number of open XDMCP sessions from host %s reached",
+                        g_debug ("GdmXdmcpDisplayFactory: Maximum number of open XDMCP sessions from host %s reached",
                                  hostname);
                         gdm_xdmcp_send_decline (factory,
                                                 address,
@@ -2200,7 +2200,7 @@ gdm_xdmcp_send_failed (GdmXdmcpDisplayFactory *factory,
         XdmcpHeader header;
         ARRAY8      status;
 
-        g_debug ("XDMCP: Sending FAILED to %ld", (long)sessid);
+        g_debug ("GdmXdmcpDisplayFactory: Sending FAILED to %ld", (long)sessid);
 
         /*
          * Don't translate, this goes over the wire to servers where we
@@ -2231,7 +2231,7 @@ gdm_xdmcp_send_refuse (GdmXdmcpDisplayFactory *factory,
         XdmcpHeader      header;
         GdmForwardQuery *fq;
 
-        g_debug ("XDMCP: Sending REFUSE to %ld",
+        g_debug ("GdmXdmcpDisplayFactory: Sending REFUSE to %ld",
                  (long)sessid);
 
         header.version = XDM_PROTOCOL_VERSION;
@@ -2271,7 +2271,7 @@ gdm_xdmcp_handle_manage (GdmXdmcpDisplayFactory *factory,
 
         host = NULL;
         gdm_address_get_numeric_info (address, &host, NULL);
-        g_debug ("gdm_xdmcp_handle_manage: Got MANAGE from %s", host);
+        g_debug ("GdmXdmcpDisplayFactory: Got MANAGE from %s", host);
 
         /* Check with tcp_wrappers if client is allowed to access */
         if (! gdm_xdmcp_host_allow (address)) {
@@ -2305,7 +2305,7 @@ gdm_xdmcp_handle_manage (GdmXdmcpDisplayFactory *factory,
 
         {
                 char *s = g_strndup ((char *) clnt_dspclass.data, clnt_dspclass.length);
-                g_debug ("gdm_xdmcp-handle_manage: Got display=%d, SessionID=%ld Class=%s from %s",
+                g_debug ("GdmXdmcpDisplayFactory: Got display=%d, SessionID=%ld Class=%s from %s",
                          (int)clnt_dspnum,
                          (long)clnt_sessid,
                          s != NULL ? s : "",
@@ -2321,7 +2321,7 @@ gdm_xdmcp_handle_manage (GdmXdmcpDisplayFactory *factory,
 
                 name = NULL;
                 gdm_display_get_x11_display_name (display, &name, NULL);
-                g_debug ("gdm_xdmcp_handle_manage: Looked up %s", name);
+                g_debug ("GdmXdmcpDisplayFactory: Looked up %s", name);
                 g_free (name);
 
 #if 0
@@ -2362,14 +2362,14 @@ gdm_xdmcp_handle_manage (GdmXdmcpDisplayFactory *factory,
                 /* Start greeter/session */
                 if (! gdm_display_manage (display)) {
                         gdm_xdmcp_send_failed (factory, address, clnt_sessid);
-                        g_debug ("Failed to manage display");
+                        g_debug ("GdmXdmcpDisplayFactory: Failed to manage display");
                 }
         } else if (display != NULL &&
                    gdm_display_get_status (display) == GDM_DISPLAY_MANAGED) {
-                g_debug ("gdm_xdmcp_handle_manage: Session id %ld already managed",
+                g_debug ("GdmXdmcpDisplayFactory: Session id %ld already managed",
                          (long)clnt_sessid);
         } else {
-                g_warning ("gdm_xdmcp_handle_manage: Failed to look up session id %ld",
+                g_warning ("GdmXdmcpDisplayFactory: Failed to look up session id %ld",
                            (long)clnt_sessid);
                 gdm_xdmcp_send_refuse (factory, address, clnt_sessid);
         }
@@ -2390,7 +2390,7 @@ gdm_xdmcp_handle_managed_forward (GdmXdmcpDisplayFactory *factory,
 
         host = NULL;
         gdm_address_get_numeric_info (address, &host, NULL);
-        g_debug ("gdm_xdmcp_handle_managed_forward: Got MANAGED_FORWARD from %s",
+        g_debug ("GdmXdmcpDisplayFactory: Got MANAGED_FORWARD from %s",
                    host);
 
         /* Check with tcp_wrappers if client is allowed to access */
@@ -2445,7 +2445,7 @@ gdm_xdmcp_handle_got_managed_forward (GdmXdmcpDisplayFactory *factory,
 
         host = NULL;
         gdm_address_get_numeric_info (address, &host, NULL);
-        g_debug ("gdm_xdmcp_handle_got_managed_forward: Got MANAGED_FORWARD from %s",
+        g_debug ("GdmXdmcpDisplayFactory: Got MANAGED_FORWARD from %s",
                    host);
 
         if (! gdm_xdmcp_host_allow (address)) {
@@ -2504,7 +2504,7 @@ gdm_xdmcp_send_alive (GdmXdmcpDisplayFactory *factory,
                 }
         }
 
-        g_debug ("XDMCP: Sending ALIVE to %ld (running %d, sessid %ld)",
+        g_debug ("GdmXdmcpDisplayFactory: Sending ALIVE to %ld (running %d, sessid %ld)",
                  (long)sessid,
                  send_running,
                  (long)send_sessid);
@@ -2534,7 +2534,7 @@ gdm_xdmcp_handle_keepalive (GdmXdmcpDisplayFactory *factory,
 
         host = NULL;
         gdm_address_get_numeric_info (address, &host, NULL);
-        g_debug ("XDMCP: Got KEEPALIVE from %s", host);
+        g_debug ("GdmXdmcpDisplayFactory: Got KEEPALIVE from %s", host);
 
         /* Check with tcp_wrappers if client is allowed to access */
         if (! gdm_xdmcp_host_allow (address)) {
@@ -2612,7 +2612,7 @@ decode_packet (GIOChannel             *source,
         char                   *port;
         int                     res;
 
-        g_debug ("decode_packet: GIOCondition %d", (int)cond);
+        g_debug ("GdmXdmcpDisplayFactory: decode_packet: GIOCondition %d", (int)cond);
 
         if ( ! (cond & G_IO_IN)) {
                 return TRUE;
@@ -2621,13 +2621,13 @@ decode_packet (GIOChannel             *source,
         ss_len = sizeof (clnt_ss);
         res = XdmcpFill (factory->priv->socket_fd, &factory->priv->buf, (XdmcpNetaddr)&clnt_ss, &ss_len);
         if G_UNLIKELY (! res) {
-                g_debug (_("XMCP: Could not create XDMCP buffer!"));
+                g_debug ("GdmXdmcpDisplayFactory: Could not create XDMCP buffer!");
                 return TRUE;
         }
 
         res = XdmcpReadHeader (&factory->priv->buf, &header);
         if G_UNLIKELY (! res) {
-                g_warning (_("XDMCP: Could not read XDMCP header!"));
+                g_warning (_("GdmXdmcpDisplayFactory: Could not read XDMCP header!"));
                 return TRUE;
         }
 
@@ -2649,7 +2649,7 @@ decode_packet (GIOChannel             *source,
         port = NULL;
         gdm_address_get_numeric_info (address, &host, &port);
 
-        g_debug ("XDMCP: Received opcode %s from client %s : %s",
+        g_debug ("GdmXdmcpDisplayFactory: Received opcode %s from client %s : %s",
                  opcode_string (header.opcode),
                  host,
                  port);
@@ -2692,7 +2692,7 @@ decode_packet (GIOChannel             *source,
                 break;
 
         default:
-                g_debug ("XDMCP: Unknown opcode from client %s : %s",
+                g_debug ("GdmXdmcpDisplayFactory: Unknown opcode from client %s : %s",
                          host,
                          port);
 
@@ -2722,7 +2722,7 @@ gdm_xdmcp_display_factory_start (GdmDisplayFactory *base_factory)
                 return ret;
         }
 
-        g_debug ("XDMCP: Starting to listen on XDMCP port");
+        g_debug ("GdmXdmcpDisplayFactory: Starting to listen on XDMCP port");
 
         ioc = g_io_channel_unix_new (factory->priv->socket_fd);
 
diff --git a/daemon/gdm-xdmcp-display.c b/daemon/gdm-xdmcp-display.c
index 178caba9..f4b003f4 100644
--- a/daemon/gdm-xdmcp-display.c
+++ b/daemon/gdm-xdmcp-display.c
@@ -105,7 +105,7 @@ gdm_xdmcp_display_create_authority (GdmDisplay *display)
         cookie = g_string_new (NULL);
         gdm_generate_cookie (cookie);
 
-        g_debug ("Setting up access for %s", x11_display);
+        g_debug ("GdmXdmcpDisplay: Setting up access for %s", x11_display);
 
         /* gdm and xserver authfile can be the same, server will run as root */
         basename = g_strconcat (x11_display, ".Xauth", NULL);
@@ -119,13 +119,13 @@ gdm_xdmcp_display_create_authority (GdmDisplay *display)
                 goto out;
         }
 
-        g_debug ("Adding auth entry for xdmcp display:%d cookie:%s", display_num, cookie->str);
+        g_debug ("GdmXdmcpDisplay: Adding auth entry for xdmcp display:%d cookie:%s", display_num, cookie->str);
         authlist = NULL;
         if (! gdm_auth_add_entry_for_display (display_num, NULL, cookie, af, &authlist)) {
                 goto out;
         }
 
-        g_debug ("gdm_auth_secure_display: Setting up access");
+        g_debug ("GdmXdmcpDisplay: Setting up access");
 
         VE_IGNORE_EINTR (closeret = fclose (af));
         if (closeret < 0) {
@@ -134,7 +134,7 @@ gdm_xdmcp_display_create_authority (GdmDisplay *display)
                 goto out;
         }
 
-        g_debug ("Set up access for %s - %d entries",
+        g_debug ("GdmXdmcpDisplay: Set up access for %s - %d entries",
                  x11_display,
                  g_slist_length (authlist));
 
@@ -170,7 +170,7 @@ gdm_xdmcp_display_add_user_authorization (GdmDisplay *display,
 
         hostname = NULL;
         res = gdm_address_get_hostname (GDM_XDMCP_DISPLAY (display)->priv->remote_address, &hostname);
-        g_debug ("add user auth for xdmcp display: %s host:%s", username, hostname);
+        g_debug ("GdmXdmcpDisplay: add user auth for xdmcp display: %s host:%s", username, hostname);
         gdm_address_debug (GDM_XDMCP_DISPLAY (display)->priv->remote_address);
         g_free (hostname);