summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Ancell <robert.ancell@canonical.com>2011-07-18 12:20:37 +1000
committerRobert Ancell <robert.ancell@canonical.com>2011-07-18 12:20:37 +1000
commit7b1761c44e4a20b83c0cda0b2ae9b24d49a46af5 (patch)
treefb1887ff256685a216e5643c5f65ad80f175b51b
parentdec71c45f1d48368b612c53997acadd6899428f6 (diff)
downloadlightdm-7b1761c44e4a20b83c0cda0b2ae9b24d49a46af5.tar.gz
Add more debugging in sending messages to/from greeter
-rw-r--r--greeters/gtk/lightdm-gtk-greeter.c2
-rw-r--r--liblightdm-gobject/greeter.c4
-rw-r--r--src/greeter.c5
3 files changed, 8 insertions, 3 deletions
diff --git a/greeters/gtk/lightdm-gtk-greeter.c b/greeters/gtk/lightdm-gtk-greeter.c
index 29d04372..d47eeffb 100644
--- a/greeters/gtk/lightdm-gtk-greeter.c
+++ b/greeters/gtk/lightdm-gtk-greeter.c
@@ -20,7 +20,7 @@
static LdmGreeter *greeter;
static GtkWidget *window, *message_label, *user_view;
-static GdkPixbuf *background_pixbuf;
+static GdkPixbuf *background_pixbuf = NULL;
static GtkWidget *prompt_box, *prompt_label, *prompt_entry, *session_combo;
static gchar *theme_name;
diff --git a/liblightdm-gobject/greeter.c b/liblightdm-gobject/greeter.c
index 38b7b66a..67432d33 100644
--- a/liblightdm-gobject/greeter.c
+++ b/liblightdm-gobject/greeter.c
@@ -149,6 +149,8 @@ write_message (LdmGreeter *greeter, guint8 *message, gint message_length)
GError *error = NULL;
if (g_io_channel_write_chars (greeter->priv->to_server_channel, (gchar *) message, message_length, NULL, NULL) != G_IO_STATUS_NORMAL)
g_warning ("Error writing to daemon: %s", error->message);
+ else
+ g_debug ("Wrote %zi bytes to daemon", message_length);
g_clear_error (&error);
g_io_channel_flush (greeter->priv->to_server_channel, NULL);
}
@@ -370,6 +372,8 @@ read_packet (LdmGreeter *greeter, gboolean block)
if (status != G_IO_STATUS_NORMAL)
break;
+ g_debug ("Read %zi bytes from daemon", n_read);
+
greeter->priv->n_read += n_read;
} while (greeter->priv->n_read < n_to_read && block);
diff --git a/src/greeter.c b/src/greeter.c
index d069a02a..d046b7d1 100644
--- a/src/greeter.c
+++ b/src/greeter.c
@@ -121,12 +121,13 @@ int_length ()
#define MAX_MESSAGE_LENGTH 1024
static void
-write_message (Greeter *greeter, guint8 *message, gint message_length)
+write_message (Greeter *greeter, guint8 *message, gsize message_length)
{
GError *error = NULL;
- g_debug ("Wrote %d bytes to greeter", message_length);
if (g_io_channel_write_chars (greeter->priv->to_greeter_channel, (gchar *) message, message_length, NULL, &error) != G_IO_STATUS_NORMAL)
g_warning ("Error writing to greeter: %s", error->message);
+ else
+ g_debug ("Wrote %zi bytes to greeter", message_length);
g_clear_error (&error);
g_io_channel_flush (greeter->priv->to_greeter_channel, NULL);
}