From: Andrea Zagli <azagli@libero.it>
Date: Wed, 4 May 2016 14:14:45 +0000 (+0200)
Subject: Conflict on merge from develop.
X-Git-Tag: v0.1.0~3^2~7
X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=b113554543987e988c4245eed9a5b1ea154ae1be;p=libzakcgi

Conflict on merge from develop.
---

b113554543987e988c4245eed9a5b1ea154ae1be
diff --cc src/session.c
index 0b74687,ee0d63a..1439ce3
--- a/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;