Merge lp:~robert-ancell/lightdm/g-hash-keys into lp:lightdm

[Robert Ancell]

Don't use g_hash_table_get_keys_as_array, it's a glib 2.40 feature

[Robert Ancell (robert-ancell)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1923
http://jenkins.qa.ubuntu.com/job/lightdm-ci/254/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/lightdm-trusty-amd64-ci/48
    SUCCESS: http://jenkins.qa.ubuntu.com/job/lightdm-trusty-armhf-ci/48

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/lightdm-ci/254/rebuild

review: Approve (continuous-integration)

=== modified file 'src/process.c'
--- src/process.c	2014-03-06 22:34:35 +0000
+++ src/process.c	2014-03-11 20:31:01 +0000
@@ -177,6 +177,7 @@
     gchar **argv;
     gchar **env_keys, **env_values;
     guint i, env_length;
+    GList *link;
     pid_t pid;
     int log_fd = -1;
     GError *error = NULL;
@@ -207,10 +208,14 @@
     }
 
     /* Work out variables to set */
-    env_keys = (gchar **) g_hash_table_get_keys_as_array (process->priv->env, &env_length);
+    env_length = g_hash_table_size (process->priv->env);
+    env_keys = g_malloc (sizeof (gchar *) * env_length);
     env_values = g_malloc (sizeof (gchar *) * env_length);
-    for (i = 0; i < env_length; i++)
+    for (i = 0, link = g_hash_table_get_keys (process->priv->env); i < env_length; i++, link = link->next)
+    {
+        env_keys[i] = link->data;
         env_values[i] = g_hash_table_lookup (process->priv->env, env_keys[i]);
+    }
 
     pid = fork ();
     if (pid == 0)