diff options
author | Robert Ancell <robert.ancell@canonical.com> | 2014-09-15 16:48:28 +1200 |
---|---|---|
committer | Robert Ancell <robert.ancell@canonical.com> | 2014-09-15 16:48:28 +1200 |
commit | a1598ecec5b60a9d6f99dbde8e213070f143896e (patch) | |
tree | 68ffca6aae45e11770230714ae8940246ce127ba | |
parent | a211c6654a533a8b5334052153591ef28faa9ed4 (diff) | |
download | lightdm-git-a1598ecec5b60a9d6f99dbde8e213070f143896e.tar.gz |
Print error messages if fail to set channel encodings
-rw-r--r-- | liblightdm-gobject/greeter.c | 14 | ||||
-rw-r--r-- | src/greeter.c | 11 |
2 files changed, 21 insertions, 4 deletions
diff --git a/liblightdm-gobject/greeter.c b/liblightdm-gobject/greeter.c index c2d2c693..e444dbf8 100644 --- a/liblightdm-gobject/greeter.c +++ b/liblightdm-gobject/greeter.c @@ -1558,8 +1558,13 @@ lightdm_greeter_init (LightDMGreeter *greeter) fd = g_getenv ("LIGHTDM_TO_SERVER_FD"); if (fd) { + GError *error = NULL; + priv->to_server_channel = g_io_channel_unix_new (atoi (fd)); - g_io_channel_set_encoding (priv->to_server_channel, NULL, NULL); + g_io_channel_set_encoding (priv->to_server_channel, NULL, &error); + if (error) + g_warning ("Failed to set encoding on to server channel to binary: %s\n", error->message); + g_clear_error (&error); } else g_warning ("No LIGHTDM_TO_SERVER_FD environment variable"); @@ -1567,8 +1572,13 @@ lightdm_greeter_init (LightDMGreeter *greeter) fd = g_getenv ("LIGHTDM_FROM_SERVER_FD"); if (fd) { + GError *error = NULL; + priv->from_server_channel = g_io_channel_unix_new (atoi (fd)); - g_io_channel_set_encoding (priv->from_server_channel, NULL, NULL); + g_io_channel_set_encoding (priv->from_server_channel, NULL, &error); + if (error) + g_warning ("Failed to set encoding on from server channel to binary: %s\n", error->message); + g_clear_error (&error); g_io_add_watch (priv->from_server_channel, G_IO_IN, from_server_cb, greeter); } else diff --git a/src/greeter.c b/src/greeter.c index bfc77094..ba69febe 100644 --- a/src/greeter.c +++ b/src/greeter.c @@ -956,6 +956,7 @@ greeter_start (Session *session) int to_greeter_pipe[2], from_greeter_pipe[2]; gboolean result = FALSE; gchar *value; + GError *error = NULL; /* Create a pipe to talk with the greeter */ if (pipe (to_greeter_pipe) != 0 || pipe (from_greeter_pipe) != 0) @@ -964,9 +965,15 @@ greeter_start (Session *session) return FALSE; } greeter->priv->to_greeter_channel = g_io_channel_unix_new (to_greeter_pipe[1]); - g_io_channel_set_encoding (greeter->priv->to_greeter_channel, NULL, NULL); + g_io_channel_set_encoding (greeter->priv->to_greeter_channel, NULL, &error); + if (error) + g_warning ("Failed to set encoding on to greeter channel to binary: %s\n", error->message); + g_clear_error (&error); greeter->priv->from_greeter_channel = g_io_channel_unix_new (from_greeter_pipe[0]); - g_io_channel_set_encoding (greeter->priv->from_greeter_channel, NULL, NULL); + g_io_channel_set_encoding (greeter->priv->from_greeter_channel, NULL, &error); + if (error) + g_warning ("Failed to set encoding on from greeter channel to binary: %s\n", error->message); + g_clear_error (&error); g_io_channel_set_buffered (greeter->priv->from_greeter_channel, FALSE); greeter->priv->from_greeter_watch = g_io_add_watch (greeter->priv->from_greeter_channel, G_IO_IN | G_IO_HUP, read_cb, greeter); |