diff options
author | William Jon McCann <mccann@jhu.edu> | 2007-10-30 16:40:20 +0000 |
---|---|---|
committer | William Jon McCann <mccann@src.gnome.org> | 2007-10-30 16:40:20 +0000 |
commit | 2e9d04c290d3473e1cf7e368d7ddfc8210f7fb3f (patch) | |
tree | bdc9c9550cdaa13ea13ea756c7af46fd82ad80b7 | |
parent | 3cb3f7191e093c8ddf44ab4731f87fae9453fca1 (diff) | |
download | gdm-2e9d04c290d3473e1cf7e368d7ddfc8210f7fb3f.tar.gz |
Prefix debug messages with class name to make output easier to read.
2007-10-30 William Jon McCann <mccann@jhu.edu>
* gui/simple-greeter/gdm-greeter-background.c:
(cairo_surface_get_height), (update_surface), (load_image),
(update_background), (update_geometry),
(gdm_greeter_background_real_expose),
(gdm_greeter_background_real_configure):
* gui/simple-greeter/gdm-greeter-client.c:
(emit_string_signal_for_message), (on_ready), (on_reset),
(send_dbus_string_method), (send_dbus_void_method),
(send_get_display_id), (cache_display_values),
(client_dbus_filter_function), (gdm_greeter_client_start),
(gdm_greeter_client_dispose):
* gui/simple-greeter/gdm-greeter-login-window.c: (reset_dialog),
(gdm_greeter_login_window_info),
(gdm_greeter_login_window_problem),
(gdm_greeter_login_window_info_query):
* gui/simple-greeter/gdm-greeter-session.c: (on_info),
(on_problem), (on_ready), (on_reset), (on_selected_user_changed),
(on_info_query), (on_secret_info_query), (toggle_login_window),
(launch_compiz), (launch_metacity), (start_settings_daemon),
(gdm_greeter_session_dispose):
* gui/simple-greeter/gdm-session-client.c:
(gdm_session_client_start), (gdm_session_client_stop):
* gui/simple-greeter/gdm-session-manager.c:
(gdm_session_manager_load_autostart_dir), (_change_level):
Prefix debug messages with class name to make output easier to read.
svn path=/trunk/; revision=5458
-rw-r--r-- | ChangeLog | 28 | ||||
-rw-r--r-- | gui/simple-greeter/gdm-greeter-background.c | 30 | ||||
-rw-r--r-- | gui/simple-greeter/gdm-greeter-client.c | 22 | ||||
-rw-r--r-- | gui/simple-greeter/gdm-greeter-login-window.c | 8 | ||||
-rw-r--r-- | gui/simple-greeter/gdm-greeter-session.c | 24 | ||||
-rw-r--r-- | gui/simple-greeter/gdm-session-client.c | 4 | ||||
-rw-r--r-- | gui/simple-greeter/gdm-session-manager.c | 10 |
7 files changed, 77 insertions, 49 deletions
@@ -1,5 +1,33 @@ 2007-10-30 William Jon McCann <mccann@jhu.edu> + * gui/simple-greeter/gdm-greeter-background.c: + (cairo_surface_get_height), (update_surface), (load_image), + (update_background), (update_geometry), + (gdm_greeter_background_real_expose), + (gdm_greeter_background_real_configure): + * gui/simple-greeter/gdm-greeter-client.c: + (emit_string_signal_for_message), (on_ready), (on_reset), + (send_dbus_string_method), (send_dbus_void_method), + (send_get_display_id), (cache_display_values), + (client_dbus_filter_function), (gdm_greeter_client_start), + (gdm_greeter_client_dispose): + * gui/simple-greeter/gdm-greeter-login-window.c: (reset_dialog), + (gdm_greeter_login_window_info), + (gdm_greeter_login_window_problem), + (gdm_greeter_login_window_info_query): + * gui/simple-greeter/gdm-greeter-session.c: (on_info), + (on_problem), (on_ready), (on_reset), (on_selected_user_changed), + (on_info_query), (on_secret_info_query), (toggle_login_window), + (launch_compiz), (launch_metacity), (start_settings_daemon), + (gdm_greeter_session_dispose): + * gui/simple-greeter/gdm-session-client.c: + (gdm_session_client_start), (gdm_session_client_stop): + * gui/simple-greeter/gdm-session-manager.c: + (gdm_session_manager_load_autostart_dir), (_change_level): + Prefix debug messages with class name to make output easier to read. + +2007-10-30 William Jon McCann <mccann@jhu.edu> + * daemon/gdm-local-display-factory.c: (create_display_for_device): oops that sneaked in. diff --git a/gui/simple-greeter/gdm-greeter-background.c b/gui/simple-greeter/gdm-greeter-background.c index 37823fcf..a1a78cbc 100644 --- a/gui/simple-greeter/gdm-greeter-background.c +++ b/gui/simple-greeter/gdm-greeter-background.c @@ -351,7 +351,7 @@ cairo_surface_get_height (cairo_surface_t *surface) w = 0; - g_debug ("Surface type %d", surf_type); + g_debug ("GdmGreeterBackground: Surface type %d", surf_type); switch (surf_type) { #if CAIRO_HAS_XLIB_SURFACE case CAIRO_SURFACE_TYPE_XLIB: @@ -381,13 +381,13 @@ update_surface (GdmGreeterBackground *background) cairo_t *cr; if (background->priv->surf != NULL) { - g_debug ("Destroying existing surface w:%d h:%d", + g_debug ("GdmGreeterBackground: Destroying existing surface w:%d h:%d", cairo_image_surface_get_width (background->priv->surf), cairo_image_surface_get_height (background->priv->surf)); cairo_surface_destroy (background->priv->surf); } - g_debug ("Creating a new surface for the background w:%d h:%d", + g_debug ("GdmGreeterBackground: Creating a new surface for the background w:%d h:%d", background->priv->geometry.width, background->priv->geometry.height); @@ -396,7 +396,7 @@ update_surface (GdmGreeterBackground *background) CAIRO_CONTENT_COLOR, background->priv->geometry.width, background->priv->geometry.height); - g_debug ("Created surface w:%d h:%d", + g_debug ("GdmGreeterBackground: Created surface w:%d h:%d", cairo_surface_get_width (background->priv->surf), cairo_surface_get_height (background->priv->surf)); cairo_destroy (cr); @@ -413,7 +413,7 @@ load_image (GdmGreeterBackground *background) int pw, ph; GError *error; - g_debug ("Loading background from %s", background->priv->image_filename); + g_debug ("GdmGreeterBackground: Loading background from %s", background->priv->image_filename); error = NULL; pixbuf = gdk_pixbuf_new_from_file (background->priv->image_filename, &error); if (pixbuf == NULL) { @@ -468,7 +468,7 @@ update_background (GdmGreeterBackground *background) cr = gdk_cairo_create (GTK_WIDGET (background)->window); - g_debug ("Clearing background"); + g_debug ("GdmGreeterBackground: Clearing background"); /* always clear to black */ cairo_set_source_rgb (cr, 0, 0, 0); @@ -497,7 +497,7 @@ update_background (GdmGreeterBackground *background) g_warning ("couldn't scale background: %s", cairo_status_to_string (cairo_status (cr))); } - g_debug ("scaling w:%d sx:%f sy:%f", background->priv->geometry.width, sx, sy); + g_debug ("GdmGreeterBackground: scaling w:%d sx:%f sy:%f", background->priv->geometry.width, sx, sy); cairo_pattern_set_extend (background->priv->pat, CAIRO_EXTEND_NONE); @@ -520,7 +520,7 @@ update_background (GdmGreeterBackground *background) dx = (double)background->priv->geometry.width - background->priv->pat_width * s; } cairo_translate (cr, dx / 2, dy / 2); - g_debug ("aspect scaling w:%d scale:%f dx:%f dy:%f", background->priv->geometry.width, s, dx, dy); + g_debug ("GdmGreeterBackground: aspect scaling w:%d scale:%f dx:%f dy:%f", background->priv->geometry.width, s, dx, dy); cairo_pattern_set_extend (background->priv->pat, CAIRO_EXTEND_NONE); } else if (background->priv->image_placement == BACKGROUND_TILED) { @@ -532,12 +532,12 @@ update_background (GdmGreeterBackground *background) dx = (double)background->priv->geometry.width - background->priv->pat_width; dy = (double)background->priv->geometry.height - background->priv->pat_height; cairo_translate (cr, dx / 2, dy / 2); - g_debug ("centering dx:%f dy:%f", dx, dy); + g_debug ("GdmGreeterBackground: centering dx:%f dy:%f", dx, dy); cairo_pattern_set_extend (background->priv->pat, CAIRO_EXTEND_NONE); } - g_debug ("Painting background with alpha %f", background->priv->image_alpha); + g_debug ("GdmGreeterBackground: Painting background with alpha %f", background->priv->image_alpha); cairo_set_source (cr, background->priv->pat); if (cairo_status (cr) != CAIRO_STATUS_SUCCESS) { g_warning ("couldn't set pattern source: %s", cairo_status_to_string (cairo_status (cr))); @@ -549,7 +549,7 @@ update_background (GdmGreeterBackground *background) } else if (background->priv->color_shading != COLOR_SHADING_SOLID) { cairo_pattern_t *pat; - g_debug ("color gradient"); + g_debug ("GdmGreeterBackground: color gradient"); if (background->priv->color_shading == COLOR_SHADING_VERTICAL) { pat = cairo_pattern_create_linear (0.0, 0.0, 0.0, background->priv->geometry.height); @@ -576,7 +576,7 @@ update_background (GdmGreeterBackground *background) cairo_fill (cr); cairo_pattern_destroy (pat); } else { - g_debug ("solid color"); + g_debug ("GdmGreeterBackground: solid color"); cairo_set_source_rgba (cr, background->priv->color1.red / 65535.0, background->priv->color1.green / 65535.0, @@ -744,7 +744,7 @@ update_geometry (GdmGreeterBackground *background, background->priv->geometry.x = geometry.x; background->priv->geometry.y = geometry.y; - g_debug ("Setting background geometry x:%d y:%d w:%d h:%d", + g_debug ("GdmGreeterBackground: Setting background geometry x:%d y:%d w:%d h:%d", background->priv->geometry.x, background->priv->geometry.y, background->priv->geometry.width, @@ -798,7 +798,7 @@ gdm_greeter_background_real_expose (GtkWidget *widget, { gboolean handled = FALSE; - g_debug ("Exposing the background"); + g_debug ("GdmGreeterBackground: Exposing the background"); if (GTK_WIDGET_CLASS (gdm_greeter_background_parent_class)->expose_event) { handled = GTK_WIDGET_CLASS (gdm_greeter_background_parent_class)->expose_event (widget, event); @@ -817,7 +817,7 @@ gdm_greeter_background_real_configure (GtkWidget *widget, handled = FALSE; - g_debug ("Background configure w: %d h: %d", event->width, event->height); + g_debug ("GdmGreeterBackground: Background configure w: %d h: %d", event->width, event->height); if (GTK_WIDGET_CLASS (gdm_greeter_background_parent_class)->configure_event) { handled = GTK_WIDGET_CLASS (gdm_greeter_background_parent_class)->configure_event (widget, event); } diff --git a/gui/simple-greeter/gdm-greeter-client.c b/gui/simple-greeter/gdm-greeter-client.c index a6af9ea2..c4da1bb5 100644 --- a/gui/simple-greeter/gdm-greeter-client.c +++ b/gui/simple-greeter/gdm-greeter-client.c @@ -113,7 +113,7 @@ emit_string_signal_for_message (GdmGreeterClient *client, DBUS_TYPE_INVALID); if (res) { - g_debug ("Recieved %s (%s)", name, text); + g_debug ("GdmGreeterClient: Recieved %s (%s)", name, text); g_signal_emit (client, gdm_greeter_client_signals[signal], @@ -163,7 +163,7 @@ static void on_ready (GdmGreeterClient *client, DBusMessage *message) { - g_debug ("GREETER SERVER READY"); + g_debug ("GdmGreeterClient: Ready"); g_signal_emit (client, gdm_greeter_client_signals[READY], @@ -174,7 +174,7 @@ static void on_reset (GdmGreeterClient *client, DBusMessage *message) { - g_debug ("GREETER RESET"); + g_debug ("GdmGreeterClient: Reset"); g_signal_emit (client, gdm_greeter_client_signals[RESET], @@ -198,7 +198,7 @@ send_dbus_string_method (DBusConnection *connection, str = ""; } - g_debug ("Calling %s", method); + g_debug ("GdmGreeterClient: Calling %s", method); message = dbus_message_new_method_call (NULL, GREETER_SERVER_DBUS_PATH, GREETER_SERVER_DBUS_INTERFACE, @@ -243,7 +243,7 @@ send_dbus_void_method (DBusConnection *connection, DBusMessage *message; DBusMessage *reply; - g_debug ("Calling %s", method); + g_debug ("GdmGreeterClient: Calling %s", method); message = dbus_message_new_method_call (NULL, GREETER_SERVER_DBUS_PATH, GREETER_SERVER_DBUS_INTERFACE, @@ -364,7 +364,7 @@ send_get_display_id (GdmGreeterClient *client, ret = FALSE; - g_debug ("Calling %s", method); + g_debug ("GdmGreeterClient: Calling %s", method); message = dbus_message_new_method_call (NULL, GREETER_SERVER_DBUS_PATH, GREETER_SERVER_DBUS_INTERFACE, @@ -441,7 +441,7 @@ cache_display_values (GdmGreeterClient *client) return; } - g_debug ("Creating proxy for %s", client->priv->display_id); + g_debug ("GdmGreeterClient: Creating proxy for %s", client->priv->display_id); display_proxy = dbus_g_proxy_new_for_name (connection, GDM_DBUS_NAME, client->priv->display_id, @@ -512,7 +512,7 @@ client_dbus_filter_function (DBusConnection *connection, path = dbus_message_get_path (message); - g_debug ("obj_path=%s interface=%s method=%s", + g_debug ("GdmGreeterClient: obj_path=%s interface=%s method=%s", dbus_message_get_path (message), dbus_message_get_interface (message), dbus_message_get_member (message)); @@ -528,7 +528,7 @@ client_dbus_filter_function (DBusConnection *connection, } else if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS, "NameOwnerChanged")) { - g_debug ("Name owner changed?"); + g_debug ("GdmGreeterClient: Name owner changed?"); } else { return client_dbus_handle_message (connection, message, user_data, FALSE); } @@ -556,7 +556,7 @@ gdm_greeter_client_start (GdmGreeterClient *client, goto out; } - g_debug ("GREETER connecting to address: %s", client->priv->address); + g_debug ("GdmGreeterClient: connecting to address: %s", client->priv->address); dbus_error_init (&local_error); client->priv->connection = dbus_connection_open (client->priv->address, &local_error); @@ -655,7 +655,7 @@ gdm_greeter_client_dispose (GObject *object) greeter_client = GDM_GREETER_CLIENT (object); - g_debug ("Disposing greeter_client"); + g_debug ("GdmGreeterClient: Disposing greeter_client"); G_OBJECT_CLASS (gdm_greeter_client_parent_class)->dispose (object); } diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c index 749f64a8..efc341e5 100644 --- a/gui/simple-greeter/gdm-greeter-login-window.c +++ b/gui/simple-greeter/gdm-greeter-login-window.c @@ -247,7 +247,7 @@ reset_dialog (GdmGreeterLoginWindow *login_window) GtkWidget *entry; GtkWidget *label; - g_debug ("Resetting dialog"); + g_debug ("GdmGreeterLoginWindow: Resetting dialog"); entry = glade_xml_get_widget (GDM_GREETER_LOGIN_WINDOW (login_window)->priv->xml, "auth-prompt-entry"); gtk_entry_set_text (GTK_ENTRY (entry), ""); @@ -295,7 +295,7 @@ gdm_greeter_login_window_info (GdmGreeterLoginWindow *login_window, { g_return_val_if_fail (GDM_IS_GREETER_LOGIN_WINDOW (login_window), FALSE); - g_debug ("SIMPLE GREETER: info: %s", text); + g_debug ("GdmGreeterLoginWindow: info: %s", text); set_message (GDM_GREETER_LOGIN_WINDOW (login_window), text); @@ -308,7 +308,7 @@ gdm_greeter_login_window_problem (GdmGreeterLoginWindow *login_window, { g_return_val_if_fail (GDM_IS_GREETER_LOGIN_WINDOW (login_window), FALSE); - g_debug ("SIMPLE GREETER: problem: %s", text); + g_debug ("GdmGreeterLoginWindow: problem: %s", text); set_message (GDM_GREETER_LOGIN_WINDOW (login_window), text); @@ -324,7 +324,7 @@ gdm_greeter_login_window_info_query (GdmGreeterLoginWindow *login_window, g_return_val_if_fail (GDM_IS_GREETER_LOGIN_WINDOW (login_window), FALSE); - g_debug ("SIMPLE GREETER: info query: %s", text); + g_debug ("GdmGreeterLoginWindow: info query: %s", text); entry = glade_xml_get_widget (GDM_GREETER_LOGIN_WINDOW (login_window)->priv->xml, "auth-prompt-entry"); gtk_entry_set_text (GTK_ENTRY (entry), ""); diff --git a/gui/simple-greeter/gdm-greeter-session.c b/gui/simple-greeter/gdm-greeter-session.c index 2cae4c55..c036797e 100644 --- a/gui/simple-greeter/gdm-greeter-session.c +++ b/gui/simple-greeter/gdm-greeter-session.c @@ -67,7 +67,7 @@ on_info (GdmGreeterClient *client, const char *text, GdmGreeterSession *session) { - g_debug ("GreeterClient Info: %s", text); + g_debug ("GdmGreeterSession: Info: %s", text); gdm_greeter_login_window_info (GDM_GREETER_LOGIN_WINDOW (session->priv->login_window), text); } @@ -77,7 +77,7 @@ on_problem (GdmGreeterClient *client, const char *text, GdmGreeterSession *session) { - g_debug ("GreeterClient Problem: %s", text); + g_debug ("GdmGreeterSession: Problem: %s", text); gdm_greeter_login_window_problem (GDM_GREETER_LOGIN_WINDOW (session->priv->login_window), text); } @@ -86,7 +86,7 @@ static void on_ready (GdmGreeterClient *client, GdmGreeterSession *session) { - g_debug ("GreeterClient Ready"); + g_debug ("GdmGreeterSession: Ready"); gdm_greeter_login_window_ready (GDM_GREETER_LOGIN_WINDOW (session->priv->login_window)); } @@ -95,7 +95,7 @@ static void on_reset (GdmGreeterClient *client, GdmGreeterSession *session) { - g_debug ("GreeterClient Reset"); + g_debug ("GdmGreeterSession: Reset"); gdm_greeter_login_window_reset (GDM_GREETER_LOGIN_WINDOW (session->priv->login_window)); } @@ -105,7 +105,7 @@ on_selected_user_changed (GdmGreeterClient *client, const char *text, GdmGreeterSession *session) { - g_debug ("GreeterClient selected user changed: %s", text); + g_debug ("GdmGreeterSession: selected user changed: %s", text); } static void @@ -113,7 +113,7 @@ on_info_query (GdmGreeterClient *client, const char *text, GdmGreeterSession *session) { - g_debug ("GreeterClient Info query: %s", text); + g_debug ("GdmGreeterSession: Info query: %s", text); gdm_greeter_login_window_info_query (GDM_GREETER_LOGIN_WINDOW (session->priv->login_window), text); } @@ -123,7 +123,7 @@ on_secret_info_query (GdmGreeterClient *client, const char *text, GdmGreeterSession *session) { - g_debug ("GreeterClient Secret info query: %s", text); + g_debug ("GdmGreeterSession: Secret info query: %s", text); gdm_greeter_login_window_secret_info_query (GDM_GREETER_LOGIN_WINDOW (session->priv->login_window), text); } @@ -228,7 +228,7 @@ toggle_login_window (GdmSessionManager *manager, gboolean is_local; is_local = gdm_greeter_client_get_display_is_local (session->priv->client); - g_debug ("Starting a login window local:%d", is_local); + g_debug ("GdmGreeterSession: Starting a login window local:%d", is_local); session->priv->login_window = gdm_greeter_login_window_new (is_local); g_signal_connect (session->priv->login_window, @@ -280,7 +280,7 @@ launch_compiz (GdmGreeterSession *session) GError *error; gboolean ret; - g_debug ("Launching compiz"); + g_debug ("GdmGreeterSession: Launching compiz"); ret = FALSE; @@ -314,7 +314,7 @@ launch_metacity (GdmGreeterSession *session) GError *error; gboolean ret; - g_debug ("Launching metacity"); + g_debug ("GdmGreeterSession: Launching metacity"); ret = FALSE; @@ -346,7 +346,7 @@ start_settings_daemon (GdmGreeterSession *session) GError *error; gboolean ret; - g_debug ("Launching settings daemon"); + g_debug ("GdmGreeterSession: Launching settings daemon"); ret = FALSE; @@ -461,7 +461,7 @@ gdm_greeter_session_dispose (GObject *object) greeter_session = GDM_GREETER_SESSION (object); - g_debug ("Disposing greeter_session"); + g_debug ("GdmGreeterSession: Disposing greeter_session"); G_OBJECT_CLASS (gdm_greeter_session_parent_class)->dispose (object); } diff --git a/gui/simple-greeter/gdm-session-client.c b/gui/simple-greeter/gdm-session-client.c index bbae811f..533276bb 100644 --- a/gui/simple-greeter/gdm-session-client.c +++ b/gui/simple-greeter/gdm-session-client.c @@ -68,7 +68,7 @@ gdm_session_client_start (GdmSessionClient *client, g_return_val_if_fail (GDM_IS_SESSION_CLIENT (client), FALSE); - g_debug ("Starting client: %s", client->priv->name); + g_debug ("GdmSessionClient: Starting client: %s", client->priv->name); ret = FALSE; @@ -113,7 +113,7 @@ gdm_session_client_stop (GdmSessionClient *client) { g_return_if_fail (GDM_IS_SESSION_CLIENT (client)); - g_debug ("Stopping client: %s", client->priv->name); + g_debug ("GdmSessionClient: Stopping client: %s", client->priv->name); if (client->priv->pid > 0) { gdm_signal_pid (client->priv->pid, SIGTERM); client->priv->pid = 0; diff --git a/gui/simple-greeter/gdm-session-manager.c b/gui/simple-greeter/gdm-session-manager.c index 4b63fb27..d99e6373 100644 --- a/gui/simple-greeter/gdm-session-manager.c +++ b/gui/simple-greeter/gdm-session-manager.c @@ -172,7 +172,7 @@ gdm_session_manager_load_autostart_dir (GdmSessionManager *manager, g_return_if_fail (GDM_IS_SESSION_MANAGER (manager)); - g_debug ("Looking for autostart files in: %s", path); + g_debug ("GdmSessionManager: Looking for autostart files in: %s", path); dir = g_dir_open (path, 0, NULL); if (dir == NULL) { @@ -241,7 +241,7 @@ _change_level (GdmSessionManager *manager, GList *list; guint old_level; - g_debug ("Changing level to %u", (guint)new_level); + g_debug ("GdmSessionManager: Changing level to %u", (guint)new_level); /* unlike some other run level systems * we do not run intermediate levels @@ -259,7 +259,7 @@ _change_level (GdmSessionManager *manager, /* shutdown all running services that won't * be run in the new level */ - g_debug ("Stopping old clients"); + g_debug ("GdmSessionManager: Stopping old clients"); for (list = old_clients; list; list = list->next) { if (! g_list_find (new_clients, list->data)) { GdmSessionClient *client; @@ -269,7 +269,7 @@ _change_level (GdmSessionManager *manager, } /* run the off notifications for the new level */ - g_debug ("Calling off notifications"); + g_debug ("GdmSessionManager: Calling off notifications"); for (list = old_notify; list; list = list->next) { if (! g_list_find (new_notify, list->data)) { NotifyData *ndata; @@ -284,7 +284,7 @@ _change_level (GdmSessionManager *manager, g_signal_emit (manager, signals [LEVEL_CHANGED], 0, old_level, new_level); /* start up the new services for new level */ - g_debug ("Starting new clients"); + g_debug ("GdmSessionManager: Starting new clients"); for (list = new_clients; list; list = list->next) { if (! g_list_find (old_clients, list->data)) { GdmSessionClient *client; |