Conflict on merge from develop.

diff --cc src/session.c
index 0b74687a423adb260c086a5a6c09d19d6c392b87,ee0d63a6b7cfe74187f53ca3c8d86d9c23b62a15..1439ce37415ee1caec864095605d52c2f0376198
--- 1/src/session.c
--- 2/src/session.c
+++ b/src/session.c
@@@ -366,15 -325,7 +366,15 @@@ gcha
        ret = NULL;
        if (priv->kfile != NULL)
                {
 -                      ret = g_key_file_get_string (priv->kfile, "SESSION", name, NULL);
 +                      error = NULL;
-                       ret = g_key_file_get_value (priv->kfile, group, name, &error);
++                      ret = g_key_file_get_string (priv->kfile, group, name, &error);
 +                      if (error != NULL)
 +                              {
 +                                      g_warning ("Unable to get session value «%s» in group «%s»: %s",
 +                                                         name,
 +                                                         group,
 +                                                         error->message != NULL ? error->message : "no details.");
 +                              }
                }
  
        return ret;