diff --git a/configure.ac b/configure.ac
index db3d3d1..e8b118c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -483,7 +483,6 @@ dnl ---------------------------------------------------------------------------
 
 AC_CONFIG_FILES(src/pw3270/Makefile)
 AC_CONFIG_FILES(src/pw3270/uiparser/Makefile)
-AC_CONFIG_FILES(src/pw3270/common/Makefile)
 
 AC_CONFIG_FILES(src/libpw3270cpp/Makefile)
 
diff --git a/pw3270.cbp b/pw3270.cbp
index da82a1e..f745cb2 100644
--- a/pw3270.cbp
+++ b/pw3270.cbp
@@ -134,6 +134,7 @@
 		<Unit filename="src/pw3270/colors.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="src/pw3270/common.h" />
 		<Unit filename="src/pw3270/common/common.h" />
 		<Unit filename="src/pw3270/common/config.c">
 			<Option compilerVar="CC" />
@@ -153,6 +154,9 @@
 		</Unit>
 		<Unit filename="src/pw3270/include/v3270.h" />
 		<Unit filename="src/pw3270/include/v3270ft.h" />
+		<Unit filename="src/pw3270/linux/config.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="src/pw3270/linux/print.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -235,6 +239,9 @@
 		<Unit filename="src/pw3270/window.c">
 			<Option compilerVar="CC" />
 		</Unit>
+		<Unit filename="src/pw3270/windows/config.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="src/pw3270/windows/print.c">
 			<Option compilerVar="CC" />
 		</Unit>
diff --git a/src/pw3270/Makefile.in b/src/pw3270/Makefile.in
index 250f963..d25e60f 100644
--- a/src/pw3270/Makefile.in
+++ b/src/pw3270/Makefile.in
@@ -45,8 +45,7 @@ APP_SOURCES=\
 	$(wildcard @OSNAME@/*.rc)
 
 MODULES=\
-	uiparser \
-	common
+	uiparser
 
 #---[ Configuration values ]-------------------------------------------------------------
 
diff --git a/src/pw3270/common.h b/src/pw3270/common.h
new file mode 100644
index 0000000..6d90af4
--- /dev/null
+++ b/src/pw3270/common.h
@@ -0,0 +1,89 @@
+/*
+ * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270  e X3270
+ * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
+ * aplicativos mainframe. Registro no INPI sob o nome G3270.
+ *
+ * Copyright (C) <2008> <Banco do Brasil S.A.>
+ *
+ * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
+ * os termos da GPL v.2 - Licença Pública Geral  GNU,  conforme  publicado  pela
+ * Free Software Foundation.
+ *
+ * Este programa é distribuído na expectativa de  ser  útil,  mas  SEM  QUALQUER
+ * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou  de  ADEQUAÇÃO
+ * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
+ * obter mais detalhes.
+ *
+ * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
+ * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
+ * St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Este programa está nomeado como common.h e possui - linhas de código.
+ *
+ * Contatos:
+ *
+ * perry.werneck@gmail.com	(Alexandre Perry de Souza Werneck)
+ * erico.mendonca@gmail.com	(Erico Mascarenhas Mendonça)
+ *
+ */
+
+#ifndef COMMON_H_INCLUDED
+
+	#include <config.h>
+
+#ifdef _WIN32
+	#include <windows.h>
+#endif // _WIN32
+
+
+	#define COMMON_H_INCLUDED 1
+
+	#include <gtk/gtk.h>
+	#include <errno.h>
+
+	#ifndef GETTEXT_PACKAGE
+		#define GETTEXT_PACKAGE PACKAGE_NAME
+	#endif
+
+	#include <libintl.h>
+	#include <lib3270.h>
+	#include <glib/gi18n.h>
+	#include <gtk/gtk.h>
+
+	#if defined( DEBUG )
+		#define trace(x, ...)	fprintf(stderr,"%s(%d):\t" x "\n",__FILE__,__LINE__, __VA_ARGS__); fflush(stderr);
+	#else
+		#define trace(x, ...)	/* */
+	#endif
+
+	// Configuration
+	LIB3270_EXPORT void		  pw3270_session_config_load(const gchar *filename);
+	LIB3270_EXPORT void		  pw3270_session_config_free(void);
+	LIB3270_EXPORT GKeyFile * pw3270_session_config_get(void);
+
+	gchar		* get_string_from_config(const gchar *group, const gchar *key, const gchar *def);
+	gboolean	  get_boolean_from_config(const gchar *group, const gchar *key, gboolean def);
+	gint 		  get_integer_from_config(const gchar *group, const gchar *key, gint def);
+
+	void		  set_string_to_config(const gchar *group, const gchar *key, const gchar *fmt, ...);
+	void		  set_boolean_to_config(const gchar *group, const gchar *key, gboolean val);
+	void		  set_integer_to_config(const gchar *group, const gchar *key, gint val);
+
+	gchar 		* build_data_filename(const gchar *first_element, ...);
+	gchar		* filename_from_va(const gchar *first_element, va_list args);
+
+	void 		  save_window_state_to_config(const gchar *group, const gchar *key, GdkWindowState CurrentState);
+	void		  save_window_size_to_config(const gchar *group, const gchar *key, GtkWidget *hwnd);
+
+	void		  restore_window_from_config(const gchar *group, const gchar *key, GtkWidget *hwnd);
+
+	#ifdef ENABLE_WINDOWS_REGISTRY
+		gboolean	  get_registry_handle(const gchar *group, HKEY *hKey, REGSAM samDesired);
+		HKEY		  get_application_registry(REGSAM samDesired);
+		void		  registry_foreach(HKEY parent, const gchar *name,void (*cbk)(const gchar *key, const gchar *val, gpointer *user_data), gpointer *user_data);
+		void 		  registry_set_double(HKEY hKey, const gchar *key, gdouble value);
+		gboolean	  registry_get_double(HKEY hKey, const gchar *key, gdouble *value);
+	#endif // ENABLE_WINDOWS_REGISTRY
+
+
+#endif
diff --git a/src/pw3270/common/Makefile.in b/src/pw3270/common/Makefile.in
deleted file mode 100644
index dd87ddf..0000000
--- a/src/pw3270/common/Makefile.in
+++ /dev/null
@@ -1,174 +0,0 @@
-#
-# "Software pw3270, desenvolvido com base nos códigos fontes do WC3270  e X3270
-# (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
-# aplicativos mainframe. Registro no INPI sob o nome G3270.
-#
-# Copyright (C) <2008> <Banco do Brasil S.A.>
-#
-# Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
-# os termos da GPL v.2 - Licença Pública Geral  GNU,  conforme  publicado  pela
-# Free Software Foundation.
-#
-# Este programa é distribuído na expectativa de  ser  útil,  mas  SEM  QUALQUER
-# GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou  de  ADEQUAÇÃO
-# A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
-# obter mais detalhes.
-#
-# Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
-# programa;  se  não, escreva para a Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA, 02111-1307, USA
-#
-# Contatos:
-#
-# perry.werneck@gmail.com	(Alexandre Perry de Souza Werneck)
-# erico.mendonca@gmail.com	(Erico Mascarenhas de Mendonça)
-#
-
-MODULE_NAME=common
-
-SOURCES=config.c
-
-#---[ Configuration values ]-------------------------------------------------------------
-
-PACKAGE_NAME=@PACKAGE_NAME@
-PACKAGE_VERSION=@PACKAGE_VERSION@
-PACKAGE_TARNAME=@PACKAGE_TARNAME@
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-bindir=@bindir@
-sbindir=@sbindir@
-libdir=@libdir@
-datarootdir=@datarootdir@
-
-BASEDIR=@BASEDIR@
-SRCDIR=$(BASEDIR)/.src/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/src/pw3270/$(MODULE_NAME)
-POTDIR=$(BASEDIR)/.pot/$(PACKAGE_TARNAME)/$(MODULE_NAME)
-
-OBJDIR=$(BASEDIR)/.obj/application/common
-OBJDBG=$(OBJDIR)/Debug
-OBJRLS=$(OBJDIR)/Release
-
-MKDIR=@MKDIR_P@
-CC=@CC@
-LD=@CC@
-AR=@AR@
-XGETTEXT=@XGETTEXT@
-MSGCAT=@MSGCAT@
-INSTALL=@INSTALL@
-INSTALL_DATA=@INSTALL_DATA@
-
-CFLAGS= \
-	@CFLAGS@ \
-	@LIB3270_CFLAGS@ \
-	@LIBV3270_CFLAGS@ \
-	@PW3270_CFLAGS@ \
-	-Wno-deprecated-declarations \
-	-DDATAROOTDIR=\"$(datarootdir)\" \
-	@GTK_CFLAGS@ 
-
-LIBS= \
-	@LIBS@ \
-	@GTK_LIBS@ \
-	@LIB3270_LIBS@ \
-	@LIBV3270_LIBS@
-
-#---[ Rules ]----------------------------------------------------------------------------
-
-DEPENDS= \
-	../../include/*.h
-
-$(OBJDBG)/%.o: \
-	%.c \
-	$(DEPENDS)
-
-	@echo $< ...
-	@$(MKDIR) `dirname $@`
-	@$(CC) $(CFLAGS) \
-				@DBG_CFLAGS@ \
-				-DBUILD_DATE=`date +"0x%Y%m%d"`\
-				-o $@ -c $<
-
-$(OBJRLS)/%.o: \
-	%.c \
-	$(DEPENDS)
-
-	@echo $< ...
-	@$(MKDIR) `dirname $@`
-	@$(CC) $(CFLAGS) \
-				@RLS_CFLAGS@ \
-				-DBUILD_DATE=`date +"0x%Y%m%d"` \
-				-o $@ -c $<
-
-$(POTDIR)/%.pot: %.c
-
-	@echo $(notdir $@) ...
-	@$(MKDIR) `dirname $@`
-	@$(XGETTEXT) \
-		--default-domain=$(PACKAGE) \
-		--language=C \
-		--keyword=_ \
-		--keyword=N_ \
-		--keyword=MSG_:2 \
-		--output=$@ \
-		$<
-
-	@touch $@
-
-#---[ Release Targets ]------------------------------------------------------------------
-
-Release: \
-	$(BASEDIR)/.obj/Release/$(MODULE_NAME).a
-
-$(BASEDIR)/.obj/Release/$(MODULE_NAME).a: \
-	$(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o)
-
-	@echo $@ ...
-	@$(MKDIR) `dirname $@`
-	@$(AR) rcs $@ $^
-
-pot: \
-	$(BASEDIR)/.pot/$(PACKAGE_TARNAME)/$(MODULE_NAME).pot
-
-$(BASEDIR)/.pot/$(PACKAGE_TARNAME)/$(MODULE_NAME).pot: \
-	$(foreach SRC, $(basename $(SOURCES)), $(POTDIR)/$(SRC).pot)
-
-	@rm -f $@
-	@mkdir -p `dirname $@`
-	@$(MSGCAT) --sort-output $^ > $@
-
-$(SRCDIR): \
-	clean
-
-	@$(MKDIR) $@
-	@$(INSTALL_DATA) *.c *.h *.in $@
-
-#---[ Debug Targets ]--------------------------------------------------------------------
-
-Debug: \
-	$(BASEDIR)/.obj/Debug/$(MODULE_NAME).a
-
-$(BASEDIR)/.obj/Debug/$(MODULE_NAME).a: \
-	$(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o)
-
-	@echo $@ ...
-	@$(MKDIR) `dirname $@`
-	@$(AR) rcs $@ $^
-
-#---[ Clean Targets]---------------------------------------------------------------------
-
-cleanDebug:
-
-	@rm -fr	$(BASEDIR)/.obj/Debug/$(MODULE_NAME).a \
-			$(OBJDBG)
-
-cleanRelease:
-
-	@rm -fr	$(BASEDIR)/.obj/Release/$(MODULE_NAME).a \
-			$(OBJRLS)
-
-clean: \
-	cleanDebug \
-	cleanRelease
-
-
diff --git a/src/pw3270/common/common.h b/src/pw3270/common/common.h
deleted file mode 100644
index 74ba23c..0000000
--- a/src/pw3270/common/common.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270  e X3270
- * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
- * aplicativos mainframe. Registro no INPI sob o nome G3270.
- *
- * Copyright (C) <2008> <Banco do Brasil S.A.>
- *
- * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
- * os termos da GPL v.2 - Licença Pública Geral  GNU,  conforme  publicado  pela
- * Free Software Foundation.
- *
- * Este programa é distribuído na expectativa de  ser  útil,  mas  SEM  QUALQUER
- * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou  de  ADEQUAÇÃO
- * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
- * obter mais detalhes.
- *
- * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
- * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
- * St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Este programa está nomeado como common.h e possui - linhas de código.
- *
- * Contatos:
- *
- * perry.werneck@gmail.com	(Alexandre Perry de Souza Werneck)
- * erico.mendonca@gmail.com	(Erico Mascarenhas Mendonça)
- *
- */
-
-#ifndef COMMON_H_INCLUDED
-
-	#include <config.h>
-
-#ifdef _WIN32
-	#include <windows.h>
-#endif // _WIN32
-
-
-	#define COMMON_H_INCLUDED 1
-
-	#include <gtk/gtk.h>
-	#include <errno.h>
-
-	#ifndef GETTEXT_PACKAGE
-		#define GETTEXT_PACKAGE PACKAGE_NAME
-	#endif
-
-	#include <libintl.h>
-	#include <glib/gi18n.h>
-	#include <gtk/gtk.h>
-
-	#if defined( DEBUG )
-		#define trace(x, ...)	fprintf(stderr,"%s(%d):\t" x "\n",__FILE__,__LINE__, __VA_ARGS__); fflush(stderr);
-	#else
-		#define trace(x, ...)	/* */
-	#endif
-
-	// Configuration
-	void		  configuration_init(void);
-	void		  configuration_deinit(void);
-
-	gchar		* get_string_from_config(const gchar *group, const gchar *key, const gchar *def);
-	gboolean	  get_boolean_from_config(const gchar *group, const gchar *key, gboolean def);
-	gint 		  get_integer_from_config(const gchar *group, const gchar *key, gint def);
-
-	void		  set_string_to_config(const gchar *group, const gchar *key, const gchar *fmt, ...);
-	void		  set_boolean_to_config(const gchar *group, const gchar *key, gboolean val);
-	void		  set_integer_to_config(const gchar *group, const gchar *key, gint val);
-
-	gchar 		* build_data_filename(const gchar *first_element, ...);
-	gchar		* filename_from_va(const gchar *first_element, va_list args);
-
-	void 		  save_window_state_to_config(const gchar *group, const gchar *key, GdkWindowState CurrentState);
-	void		  save_window_size_to_config(const gchar *group, const gchar *key, GtkWidget *hwnd);
-
-	void		  restore_window_from_config(const gchar *group, const gchar *key, GtkWidget *hwnd);
-
-	#ifdef ENABLE_WINDOWS_REGISTRY
-		gboolean	  get_registry_handle(const gchar *group, HKEY *hKey, REGSAM samDesired);
-		HKEY		  get_application_registry(REGSAM samDesired);
-		void		  registry_foreach(HKEY parent, const gchar *name,void (*cbk)(const gchar *key, const gchar *val, gpointer *user_data), gpointer *user_data);
-		void 		  registry_set_double(HKEY hKey, const gchar *key, gdouble value);
-		gboolean	  registry_get_double(HKEY hKey, const gchar *key, gdouble *value);
-	#else
-		GKeyFile	* get_application_keyfile(void);
-	#endif // ENABLE_WINDOWS_REGISTRY
-
-
-#endif
diff --git a/src/pw3270/common/config.c b/src/pw3270/common/config.c
deleted file mode 100644
index 749397d..0000000
--- a/src/pw3270/common/config.c
+++ /dev/null
@@ -1,938 +0,0 @@
-/*
- * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270  e X3270
- * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
- * aplicativos mainframe. Registro no INPI sob o nome G3270.
- *
- * Copyright (C) <2008> <Banco do Brasil S.A.>
- *
- * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
- * os termos da GPL v.2 - Licença Pública Geral  GNU,  conforme  publicado  pela
- * Free Software Foundation.
- *
- * Este programa é distribuído na expectativa de  ser  útil,  mas  SEM  QUALQUER
- * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou  de  ADEQUAÇÃO
- * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
- * obter mais detalhes.
- *
- * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
- * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
- * St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Este programa está nomeado como config.c e possui - linhas de código.
- *
- * Contatos:
- *
- * perry.werneck@gmail.com	(Alexandre Perry de Souza Werneck)
- * erico.mendonca@gmail.com	(Erico Mascarenhas Mendonça)
- * licinio@bb.com.br		(Licínio Luis Branco)
- * kraucer@bb.com.br		(Kraucer Fernandes Mazuco)
- *
- */
-
-#ifdef _WIN32
-	#include <windows.h>
-#endif // _WIN32
-
- #include "../pw3270/private.h"
-
- #include "common.h"
- #include <stdarg.h>
- #include <glib/gstdio.h>
-
-#ifdef _WIN32
-
-	#include <windows.h>
-
-	#ifndef KEY_WOW64_64KEY
-		#define KEY_WOW64_64KEY 0x0100
-	#endif // KEY_WOW64_64KEY
-
-	#ifndef KEY_WOW64_32KEY
-		#define KEY_WOW64_32KEY	0x0200
-	#endif // KEY_WOW64_64KEY
-
-#endif // _WIN32
-
-/*--[ Globals ]--------------------------------------------------------------------------------------*/
-
-#ifdef ENABLE_WINDOWS_REGISTRY
-
- 	static const gchar	* registry_path = "SOFTWARE";
-
-#else
-
-	static GKeyFile		* program_config = NULL;
-
-#endif // ENABLE_WINDOWS_REGISTRY
-
-/*--[ Implement ]------------------------------------------------------------------------------------*/
-
-#ifdef ENABLE_WINDOWS_REGISTRY
-
- enum REG_KEY
- {
-	REG_KEY_USER,
-	REG_KEY_SYSTEM,
-	REG_KEY_INEXISTENT
- };
-
- static enum REG_KEY registry_query(const gchar *group, const gchar *key, HKEY *hKey)
- {
- 	static HKEY	  predefined[] = { HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE };
-	gchar		* path = g_strdup_printf("%s\\%s\\%s",registry_path,g_get_application_name(),group);
-	int			  f;
-
-	for(f=0;f<G_N_ELEMENTS(predefined);f++)
-	{
-		if(RegOpenKeyEx(predefined[f],path,0,KEY_READ,hKey) == ERROR_SUCCESS)
-		{
-			if(RegQueryValueExA(*hKey,key,NULL,NULL,NULL,NULL) == ERROR_SUCCESS)
-			{
-				trace("Key\"%s\\%s\" found at id %d",path,key,f);
-				g_free(path);
-				return f;
-			}
-			RegCloseKey(*hKey);
-		}
-	}
-
-	trace("Key \"%s\\%s\""" not found",path,key,f);
-	g_free(path);
-
-	return -1;
- }
-
- static BOOL registry_open_key(const gchar *group, const gchar *key, REGSAM samDesired, HKEY *hKey)
- {
- 	static HKEY	  predefined[] = { HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE };
- 	int			  f;
-	gchar		* path = g_strdup_printf("%s\\%s\\%s",registry_path,g_get_application_name(),group);
-
-	for(f=0;f<G_N_ELEMENTS(predefined);f++)
-	{
-		if(RegOpenKeyEx(predefined[f],path,0,samDesired,hKey) == ERROR_SUCCESS)
-		{
-			g_free(path);
-			return TRUE;
-		}
-	}
-
-	g_free(path);
-
-	return FALSE;
- }
-
- void registry_foreach(HKEY parent, const gchar *name,void (*cbk)(const gchar *key, const gchar *val, gpointer *user_data), gpointer *user_data)
- {
-	HKEY hKey = 0;
-
-	if(RegOpenKeyEx(parent,name,0,KEY_READ,&hKey) == ERROR_SUCCESS)
-	{
-		#define MAX_KEY_LENGTH 255
-		#define MAX_VALUE_NAME 16383
-
-		TCHAR    	pName[MAX_KEY_LENGTH];
-		DWORD 		cName	= MAX_KEY_LENGTH;
-		int			ix		= 0;
-
-		while(RegEnumValue(hKey,ix++,pName,&cName,NULL,NULL,NULL,NULL) == ERROR_SUCCESS)
-		{
-			BYTE data[4097];
-			unsigned long datatype;
-			unsigned long datalen 	= 4096;
-
-			if(RegQueryValueExA(hKey,pName,NULL,&datatype,data,&datalen) == ERROR_SUCCESS)
-			{
-				data[datalen+1] = 0;
-				cbk(pName,(const gchar *) data, user_data);
-			}
-			cName = MAX_KEY_LENGTH;
-		}
-		RegCloseKey(hKey);
-	}
- }
-
- void registry_set_double(HKEY hKey, const gchar *key, gdouble value)
- {
-	// Reference: http://git.gnome.org/browse/glib/tree/glib/gkeyfile.c
-	gchar result[G_ASCII_DTOSTR_BUF_SIZE];
-	g_ascii_dtostr (result, sizeof (result), value);
-
-	RegSetValueEx(hKey,key,0,REG_SZ,(const BYTE *) result,strlen(result)+1);
- }
-
- gboolean registry_get_double(HKEY hKey, const gchar *key, gdouble *value)
- {
-//	GError			* error = NULL;
-	BYTE			  data[4096];
-	unsigned long	  datatype;
-	unsigned long	  datalen 	= sizeof(data);
-	gchar 			* end_of_valid_d;
-
-	if(RegQueryValueExA(hKey,key,NULL,&datatype,data,&datalen) != ERROR_SUCCESS)
-		return FALSE;
-
-	data[datalen] = 0;
-
-	* value = g_ascii_strtod((const gchar *) data, &end_of_valid_d);
-
-	if(*end_of_valid_d != '\0' || end_of_valid_d == ((gchar *) data))
-	{
-		g_warning("Key %s on registry isnt a valid double value",key);
-		return FALSE;
-	}
-
- 	return TRUE;
- }
-
-
-
-#else
-
- static gchar * search_for_ini(void)
- {
- 	static const gchar * (*dir[])(void) =
- 	{
- 		g_get_user_config_dir,
- 		g_get_user_data_dir,
- 		g_get_home_dir,
-	};
-
-	size_t f;
-	g_autofree gchar * name = g_strconcat(g_get_application_name(),".conf",NULL);
-
-	//
-	// First search the user data
-	//
-
- 	for(f=0;f<G_N_ELEMENTS(dir);f++)
-	{
-		gchar *filename = g_build_filename(dir[f](),name,NULL);
-
-		trace("Checking for %s",filename);
-
-		if(g_file_test(filename,G_FILE_TEST_IS_REGULAR))
-			return filename;
-		g_free(filename);
-
-	}
-
-#ifdef DATADIR
-	//
-	// Search the application DATADIR
-	//
-	{
-		gchar *filename = g_build_filename(DATAROOTDIR,G_STRINGIFY(PRODUCT_NAME),name,NULL);
-
-		trace("Checking for default config \"%s\"",filename);
-
-		if(g_file_test(filename,G_FILE_TEST_IS_REGULAR))
-			return filename;
-
-		g_message("Can't find default config (%s)",filename);
-
-		g_free(filename);
-
-	}
-#endif // DATADIR
-
-	//
-	// Search the system config folders
-	//
-	const gchar * const * sysconfig = g_get_system_config_dirs();
- 	for(f=0;sysconfig[f];f++)
-	{
-		gchar *filename = g_build_filename(sysconfig[f],name,NULL);
-		trace("Checking for %s",filename);
-		if(g_file_test(filename,G_FILE_TEST_IS_REGULAR))
-			return filename;
-		g_free(filename);
-	}
-
-	//
-	// Search the system data folders
-	//
-	const gchar * const * sysdata = g_get_system_data_dirs();
- 	for(f=0;sysdata[f];f++)
-	{
-		gchar *filename;
-
-		// Check for product dir
-		filename = g_build_filename(sysdata[f],G_STRINGIFY(PRODUCT_NAME),name,NULL);
-		trace("Checking for system data \"%s\"",filename);
-		if(g_file_test(filename,G_FILE_TEST_IS_REGULAR))
-			return filename;
-		g_free(filename);
-
-		// Check for file
-		filename = g_build_filename(sysdata[f],name,NULL);
-		trace("Checking for system data \"%s\"",filename);
-		if(g_file_test(filename,G_FILE_TEST_IS_REGULAR))
-			return filename;
-		g_free(filename);
-
-
-
-	}
-
-	//
-	// Can't find, use user config dir
-	//
-	g_message("No config, defaulting to %s/%s",g_get_user_config_dir(),name);
- 	return g_build_filename(g_get_user_config_dir(),name,NULL);
-
- }
-#endif  //  #ifdef ENABLE_WINDOWS_REGISTRY
-
- gboolean get_boolean_from_config(const gchar *group, const gchar *key, gboolean def)
- {
-#ifdef ENABLE_WINDOWS_REGISTRY
-	gboolean	ret 		= def;
-	HKEY 		hKey;
-
-	if(registry_query(group,key,&hKey) != REG_KEY_INEXISTENT)
-	{
-		DWORD			  data;
-		unsigned long	  datalen	= sizeof(data);
-		unsigned long	  datatype;
-
-		if(RegQueryValueExA(hKey,key,NULL,&datatype,(BYTE *) &data,&datalen) == ERROR_SUCCESS)
-		{
-			if(datatype == REG_DWORD)
-				ret = data ? TRUE : FALSE;
-			else
-				g_warning("Unexpected registry data type in %s\\%s\\%s\\%s",registry_path,g_get_application_name(),group,key);
-		}
-
-		RegCloseKey(hKey);
-	}
-
-	return ret;
-
-#else
-
-	if(program_config)
-	{
-		GError		* err = NULL;
-		gboolean	  val = g_key_file_get_boolean(program_config,group,key,&err);
-		if(err)
-			g_error_free(err);
-		else
-			return val;
-	}
-#endif // ENABLE_WINDOWS_REGISTRY
-
-	return def;
- }
-
- gint get_integer_from_config(const gchar *group, const gchar *key, gint def)
- {
-#ifdef ENABLE_WINDOWS_REGISTRY
-
-	HKEY key_handle;
-
-	if(registry_open_key(group,key,KEY_READ,&key_handle))
-	{
-		DWORD			data;
-		gint			ret = def;
-		unsigned long	datalen	= sizeof(data);
-		unsigned long	datatype;
-
-		if(RegQueryValueExA(key_handle,key,NULL,&datatype,(BYTE *) &data,&datalen) == ERROR_SUCCESS)
-		{
-			if(datatype == REG_DWORD)
-				ret = (gint) data;
-			else
-				g_warning("Unexpected registry data type in %s\\%s\\%s\\%s",registry_path,g_get_application_name(),group,key);
-		}
-
-		RegCloseKey(key_handle);
-
-		return ret;
-
-	}
-
-#else
-
-	if(program_config)
-	{
-		GError	* err = NULL;
-		gint	  val = g_key_file_get_integer(program_config,group,key,&err);
-		if(err)
-			g_error_free(err);
-		else
-			return val;
-	}
-#endif // ENABLE_WINDOWS_REGISTRY
-
-	return def;
- }
-
-
- gchar * get_string_from_config(const gchar *group, const gchar *key, const gchar *def)
- {
-#ifdef ENABLE_WINDOWS_REGISTRY
-
-	HKEY key_handle;
-	unsigned long	  datalen 	= 4096;
-	unsigned long	  datatype;
-	gchar 			* ret		= NULL;
-	BYTE			* data;
-
-	if(!registry_open_key(group,key,KEY_READ,&key_handle))
-	{
-		if(def)
-			return g_strdup(def);
-		return NULL;
-	}
-
-	data = (BYTE *) g_malloc0(datalen+2);
-
-	if(RegQueryValueExA(key_handle,key,NULL,&datatype,data,&datalen) == ERROR_SUCCESS)
-	{
-		data[datalen+1] = 0;
-		ret = g_strdup((const gchar *) data);
-	}
-	else if(def)
-	{
-		ret = g_strdup(def);
-	}
-
-	g_free(data);
-
-	RegCloseKey(key_handle);
-
-	return ret;
-
-#else
-
-	if(program_config)
-	{
-		gchar *ret = g_key_file_get_string(program_config,group,key,NULL);
-		if(ret)
-			return ret;
-	}
-
-	if(def)
-		return g_strdup(def);
-
-	return NULL;
-
-#endif // ENABLE_WINDOWS_REGISTRY
- }
-
-void configuration_init(void)
-{
-#ifndef ENABLE_WINDOWS_REGISTRY
-	gchar *filename = search_for_ini();
-
-	if(program_config)
-		g_key_file_free(program_config);
-
-	program_config = g_key_file_new();
-
-	if(filename)
-	{
-		g_message(_("Loading %s"),filename);
-		g_key_file_load_from_file(program_config,filename,G_KEY_FILE_NONE,NULL);
-		g_free(filename);
-	}
-
-#endif // ENABLE_WINDOWS_REGISTRY
-}
-
-static void set_string(const gchar *group, const gchar *key, const gchar *fmt, va_list args)
-{
-	gchar * value = g_strdup_vprintf(fmt,args);
-
-#ifdef ENABLE_WINDOWS_REGISTRY
-
-	gchar * path = g_strdup_printf("%s\\%s\\%s",registry_path,g_get_application_name(),group);
- 	HKEY	hKey;
- 	DWORD	disp;
-
-	if(RegCreateKeyEx(HKEY_CURRENT_USER,path,0,NULL,REG_OPTION_NON_VOLATILE,KEY_SET_VALUE,NULL,&hKey,&disp) == ERROR_SUCCESS)
-	{
-		RegSetValueEx(hKey,key,0,REG_SZ,(const BYTE *) value,strlen(value)+1);
-		RegCloseKey(hKey);
-	}
-
-	g_free(path);
-
-#else
-
-	g_key_file_set_string(program_config,group,key,value);
-
-#endif
-
-	g_free(value);
-}
-
-void set_string_to_config(const gchar *group, const gchar *key, const gchar *fmt, ...)
-{
-	if(fmt)
-	{
-		va_list args;
-		va_start(args, fmt);
-		set_string(group,key,fmt,args);
-		va_end(args);
-	}
-#ifdef ENABLE_WINDOWS_REGISTRY
-	else
-	{
-
-		gchar * path = g_strdup_printf("%s\\%s\\%s",registry_path,g_get_application_name(),group);
-		HKEY	hKey;
-		DWORD	disp;
-
-		if(RegOpenKeyEx(HKEY_CURRENT_USER, path, 0, KEY_ALL_ACCESS, &hKey) == ERROR_SUCCESS)
-		{
-			RegDeleteKey(hKey,key);
-			RegCloseKey(hKey);
-		}
-
-		g_free(path);
-
-	}
-#else
-	else if(g_key_file_has_key(program_config,group,key,NULL))
-	{
-		g_key_file_remove_key(program_config,group,key,NULL);
-	}
-#endif
-}
-
-void set_boolean_to_config(const gchar *group, const gchar *key, gboolean val)
-{
-#ifdef ENABLE_WINDOWS_REGISTRY
-
- 	HKEY	hKey;
- 	DWORD	disp;
-	gchar * path = g_strdup_printf("%s\\%s\\%s",registry_path,g_get_application_name(),group);
-
-//	trace("Creating key %s",path);
-	if(RegCreateKeyEx(HKEY_CURRENT_USER,path,0,NULL,REG_OPTION_NON_VOLATILE,KEY_SET_VALUE,NULL,&hKey,&disp) == ERROR_SUCCESS)
-	{
-		DWORD	value = val ? 1 : 0;
-		LONG	rc = RegSetValueEx(hKey, key, 0, REG_DWORD,(const BYTE *) &value,sizeof(value));
-
-		SetLastError(rc);
-
-		if(rc != ERROR_SUCCESS)
-		{
-			gchar *msg = g_win32_error_message(GetLastError());
-			g_warning("Error \"%s\" when setting key HKCU\\%s\\%s",msg,path,key);
-			g_free(msg);
-		}
-		RegCloseKey(hKey);
-	}
-	else
-	{
-		gchar *msg = g_win32_error_message(GetLastError());
-		g_warning("Error \"%s\" when creating key HKCU\\%s",msg,path);
-		g_free(msg);
-	}
-
-	g_free(path);
-
-#else
-
-	if(program_config)
-		g_key_file_set_boolean(program_config,group,key,val);
-
-#endif // ENABLE_WINDOWS_REGISTRY
-
-}
-
-void set_integer_to_config(const gchar *group, const gchar *key, gint val)
-{
-#ifdef ENABLE_WINDOWS_REGISTRY
-
- 	HKEY	hKey;
- 	DWORD	disp;
-	gchar * path = g_strdup_printf("%s\\%s\\%s",registry_path,g_get_application_name(),group);
-
-	trace("Creating key %s",path);
-	if(RegCreateKeyEx(HKEY_CURRENT_USER,path,0,NULL,REG_OPTION_NON_VOLATILE,KEY_SET_VALUE,NULL,&hKey,&disp) == ERROR_SUCCESS)
-	{
-		DWORD	value = (DWORD) val;
-		LONG	rc = RegSetValueEx(hKey, key, 0, REG_DWORD,(const BYTE *) &value,sizeof(value));
-
-		SetLastError(rc);
-
-		if(rc != ERROR_SUCCESS)
-		{
-			gchar *msg = g_win32_error_message(GetLastError());
-			g_warning("Error \"%s\" when setting key HKCU\\%s\\%s",msg,path,key);
-			g_free(msg);
-		}
-		RegCloseKey(hKey);
-	}
-	else
-	{
-		gchar *msg = g_win32_error_message(GetLastError());
-		g_warning("Error \"%s\" when creating key HKCU\\%s",msg,path);
-		g_free(msg);
-	}
-
-	g_free(path);
-
-#else
-
-	if(program_config)
-		g_key_file_set_integer(program_config,group,key,val);
-
-#endif // ENABLE_WINDOWS_REGISTRY
-
-}
-
-void configuration_deinit(void)
-{
-#if !defined(ENABLE_WINDOWS_REGISTRY)
-
-	if(!program_config)
-		return;
-
-	g_autofree gchar * text = g_key_file_to_data(program_config,NULL,NULL);
-
-	if(text)
-	{
-		GError * error = NULL;
-
-		g_autofree gchar * name = g_strconcat(g_get_application_name(),".conf",NULL);
-		g_autofree gchar * filename = g_build_filename(g_get_user_config_dir(),name,NULL);
-
-		g_mkdir_with_parents(g_get_user_config_dir(),S_IRUSR|S_IWUSR);
-
-		g_message( _("Saving %s"), filename);
-
-		g_file_set_contents(filename,text,-1,&error);
-
-		if(error) {
-			g_message( _( "Can't save \"%s\": %s" ), filename, error->message);
-			g_error_free(error);
-		}
-
-	}
-
-	g_key_file_free(program_config);
-	program_config = NULL;
-
-#endif // ENABLE_WINDOWS_REGISTRY
-}
-
-gchar * build_data_filename(const gchar *first_element, ...)
-{
-	va_list args;
-	gchar	*path;
-
-	va_start(args, first_element);
-	path = filename_from_va(first_element,args);
-	va_end(args);
-	return path;
-}
-
-gchar * filename_from_va(const gchar *first_element, va_list args)
-{
-	const gchar * appname[]	= { g_get_application_name(), PACKAGE_NAME };
-	size_t p,f;
-
-	// Make base path
-	const gchar *element;
-	GString	* result = g_string_new("");
-	for(element = first_element;element;element = va_arg(args, gchar *))
-    {
-    	g_string_append_c(result,G_DIR_SEPARATOR);
-    	g_string_append(result,element);
-    }
-
-	g_autofree gchar * suffix = g_string_free(result, FALSE);
-
-#if defined( ENABLE_WINDOWS_REGISTRY )
-	for(p=0;p<G_N_ELEMENTS(appname) && !result;p++)
-	{
-		g_autofree gchar * path	= g_strconcat("Software\\",appname[p],NULL);
-
-		HKEY	  hKey	= 0;
-		LONG	  rc 	= 0;
-
-		// Note: This could be needed: http://support.microsoft.com/kb/556009
-		// http://msdn.microsoft.com/en-us/library/windows/desktop/aa384129(v=vs.85).aspx
-
-		rc = RegOpenKeyEx(HKEY_LOCAL_MACHINE,path,0,KEY_QUERY_VALUE,&hKey);
-		SetLastError(rc);
-
-		if(rc == ERROR_SUCCESS)
-		{
-			char			data[4096];
-			unsigned long	datalen	= sizeof(data);		// data field length(in), data returned length(out)
-			unsigned long	datatype;					// #defined in winnt.h (predefined types 0-11)
-
-			rc = RegQueryValueExA(hKey,"datadir",NULL,&datatype,(LPBYTE) data,&datalen);
-			if(rc == ERROR_SUCCESS)
-			{
-				gchar * path = g_build_filename(data,appname[p],suffix,NULL);
-				trace("searching \"%s\"",path);
-				if(g_file_test(path,G_FILE_TEST_EXISTS))
-					return path;
-				g_free(path);
-			}
-			RegCloseKey(hKey);
-		}
-
-	}
-#endif // ENABLE_WINDOWS_REGISTRY
-
-#ifdef _WIN32
-	for(p=0;p<G_N_ELEMENTS(appname) && !result;p++)
-	{
-		gchar * path = g_build_filename(g_win32_get_package_installation_directory_of_module(NULL),appname[p],suffix,NULL);
-		trace("searching \"%s\"",path);
-		if(g_file_test(path,G_FILE_TEST_EXISTS))
-			return path;
-		g_free(path);
-	}
-#endif // _WIN32
-
-	// Check system data dirs
-	const gchar * const * system_data_dirs = g_get_system_data_dirs();
-	for(p=0;p<G_N_ELEMENTS(appname);p++)
-	{
-		for(f=0;system_data_dirs[f];f++)
-		{
-			gchar * path = g_build_filename(system_data_dirs[f],appname[p],suffix,NULL);
-			trace("searching \"%s\"",path);
-			if(g_file_test(path,G_FILE_TEST_EXISTS))
-				return path;
-			g_free(path);
-		}
-
-	}
-
-	// Check current dir
-	g_autofree gchar *dir = g_get_current_dir();
-	gchar * path = g_build_filename(dir,suffix,NULL);
-	trace("searching \"%s\"",path);
-	if(g_file_test(path,G_FILE_TEST_EXISTS))
-		return path;
-	g_free(path);
-
-	trace("Can't find \"%s\"",suffix);
-
-	return g_build_filename(".",suffix,NULL);
-}
-
-#ifdef ENABLE_WINDOWS_REGISTRY
-gboolean get_registry_handle(const gchar *group, HKEY *hKey, REGSAM samDesired)
-{
-	gboolean	  ret;
-	gchar		* path;
- 	DWORD		  disp;
-
- 	if(group)
-		path = g_strdup_printf("%s\\%s\\%s",registry_path,g_get_application_name(),group);
-	else
-		path = g_strdup_printf("%s\\%s",registry_path,g_get_application_name());
-
-	if(RegCreateKeyEx(HKEY_CURRENT_USER,path,0,NULL,REG_OPTION_NON_VOLATILE,samDesired,NULL,hKey,&disp) == ERROR_SUCCESS)
-		ret = TRUE;
-	else
-		ret = FALSE;
-
-	g_free(path);
-
-	return ret;
-}
-#else
-GKeyFile * get_application_keyfile(void)
-{
-	if(!program_config)
-		configuration_init();
-	return program_config;
-}
-#endif // ENABLE_WINDOWS_REGISTRY
-
- static const struct _WindowState
- {
-        const char *name;
-        GdkWindowState flag;
-        void (*activate)(GtkWindow *);
- } WindowState[] =
- {
-        { "Maximized",	GDK_WINDOW_STATE_MAXIMIZED,	gtk_window_maximize             },
-        { "Iconified",	GDK_WINDOW_STATE_ICONIFIED,	gtk_window_iconify              },
-        { "Sticky",		GDK_WINDOW_STATE_STICKY,	gtk_window_stick                }
- };
-
-void save_window_state_to_config(const gchar *group, const gchar *key, GdkWindowState CurrentState)
-{
-#if defined( ENABLE_WINDOWS_REGISTRY )
-
-        gchar * path = g_strdup_printf("%s\\%s\\%s\\%s",registry_path,g_get_application_name(),group,key);
-
-        HKEY    hKey;
-        DWORD   disp;
-
-		if(RegCreateKeyEx(HKEY_CURRENT_USER,path,0,NULL,REG_OPTION_NON_VOLATILE,KEY_SET_VALUE,NULL,&hKey,&disp) == ERROR_SUCCESS)
-		{
-			int f;
-			for(f=0;f<G_N_ELEMENTS(WindowState);f++)
-			{
-				DWORD value = (CurrentState & WindowState[f].flag) ? 1 : 0;
-//				trace("%s=%s",WindowState[f].name,value ? "Yes" : "No");
-				RegSetValueEx(hKey, WindowState[f].name, 0, REG_DWORD,(const BYTE *) &value,sizeof(value));
-			}
-
-			RegCloseKey(hKey);
-		}
-
-		g_free(path);
-
-#else
-		int			  f;
-		GKeyFile	* conf 	= get_application_keyfile();
-		gchar		* id	= g_strconcat(group,".",key,NULL);
-
-		for(f=0;f<G_N_ELEMENTS(WindowState);f++)
-			g_key_file_set_boolean(conf,id,WindowState[f].name,CurrentState & WindowState[f].flag);
-
-		g_free(id);
-
-#endif // ENABLE_WINDOWS_REGISTRY
-}
-
-void save_window_size_to_config(const gchar *group, const gchar *key, GtkWidget *hwnd)
-{
-#if defined( ENABLE_WINDOWS_REGISTRY )
-
-        gchar * path = g_strdup_printf("%s\\%s\\%s\\%s",registry_path,g_get_application_name(),group,key);
-
-        HKEY    hKey;
-        DWORD   disp;
-
-		if(RegCreateKeyEx(HKEY_CURRENT_USER,path,0,NULL,REG_OPTION_NON_VOLATILE,KEY_SET_VALUE,NULL,&hKey,&disp) == ERROR_SUCCESS)
-		{
-			int pos[2];
-
-			gtk_window_get_size(GTK_WINDOW(hwnd),&pos[0],&pos[1]);
-
-			RegSetValueEx(hKey, "Size", 0, REG_BINARY,(const BYTE *) pos,sizeof(pos));
-
-			RegCloseKey(hKey);
-		}
-
-		g_free(path);
-
-#else
-		int 		  pos[2];
-		GKeyFile	* conf 	= get_application_keyfile();
-		gchar		* id	= g_strconcat(group,".",key,NULL);
-
-        gtk_window_get_size(GTK_WINDOW(hwnd),&pos[0],&pos[1]);
-        g_key_file_set_integer_list(conf,id,"size",pos,2);
-
-		g_free(id);
-
-#endif // ENABLE_WINDOWS_REGISTRY
-}
-
-#if defined( ENABLE_WINDOWS_REGISTRY )
-static void restore_window_from_regkey(GtkWidget *hwnd, HKEY hKey, const gchar *path)
-{
-	int 			f;
-	int 			pos[2];
-	unsigned long	datalen;
-	unsigned long	datatype;
-
-
-	datalen = sizeof(pos);
-	if(RegQueryValueExA(hKey,"Size",NULL,&datatype,(BYTE *) pos,&datalen) == ERROR_SUCCESS)
-	{
-		if(datatype == REG_BINARY && datalen == sizeof(pos))
-		{
-			gtk_window_resize(GTK_WINDOW(hwnd),pos[0],pos[1]);
-		}
-		else
-		{
-			g_warning("Unexpected registry data in %s\\Size",path);
-		}
-	}
-
-
-	for(f=0;f<G_N_ELEMENTS(WindowState);f++)
-	{
-		DWORD			data;
-
-		datalen       = sizeof(data);
-
-		if(RegQueryValueExA(hKey,WindowState[f].name,NULL,&datatype,(BYTE *) &data,&datalen) == ERROR_SUCCESS)
-		{
-			if(datatype == REG_DWORD)
-			{
-				if(data)
-					WindowState[f].activate(GTK_WINDOW(hwnd));
-
-			}
-			else
-			{
-				g_warning("Unexpected registry data type in %s\\%s",path,WindowState[f].name);
-			}
-		}
-	}
-
-
-}
-#endif // ENABLE_WINDOWS_REGISTRY
-
-void restore_window_from_config(const gchar *group, const gchar *key, GtkWidget *hwnd)
-{
-#if defined( ENABLE_WINDOWS_REGISTRY )
-
-	gchar * path = g_strdup_printf("%s\\%s\\%s\\%s",registry_path,g_get_application_name(),group,key);
-	HKEY    hKey;
-
-	if(RegOpenKeyEx(HKEY_CURRENT_USER,path,0,KEY_READ,&hKey) == ERROR_SUCCESS)
-	{
-		// Load user settings
-		restore_window_from_regkey(hwnd,hKey,path);
-		RegCloseKey(hKey);
-	}
-	else if(RegOpenKeyEx(HKEY_LOCAL_MACHINE,path,0,KEY_READ,&hKey) == ERROR_SUCCESS)
-	{
-		// Load system defaults
-		restore_window_from_regkey(hwnd,hKey,path);
-		RegCloseKey(hKey);
-	}
-
-	g_free(path);
-
-#else
-	gchar		* id	= g_strconcat(group,".",key,NULL);
-	GKeyFile	* conf 	= get_application_keyfile();
-
-	if(g_key_file_has_key(conf,id,"size",NULL))
-	{
-		gsize	  sz	= 2;
-		gint	* vlr	=  g_key_file_get_integer_list(conf,id,"size",&sz,NULL);
-		int		  f;
-
-		if(vlr)
-		{
-			gtk_window_resize(GTK_WINDOW(hwnd),vlr[0],vlr[1]);
-			g_free(vlr);
-		}
-
-		for(f=0;f<G_N_ELEMENTS(WindowState);f++)
-		{
-			if(g_key_file_get_boolean(conf,id,WindowState[f].name,NULL))
-				WindowState[f].activate(GTK_WINDOW(hwnd));
-		}
-
-	}
-
-	g_free(id);
-
-#endif // ENABLE_WINDOWS_REGISTRY
-
-}
-
diff --git a/src/pw3270/linux/config.c b/src/pw3270/linux/config.c
new file mode 100644
index 0000000..64d5c71
--- /dev/null
+++ b/src/pw3270/linux/config.c
@@ -0,0 +1,437 @@
+/*
+ * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270  e X3270
+ * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
+ * aplicativos mainframe. Registro no INPI sob o nome G3270.
+ *
+ * Copyright (C) <2008> <Banco do Brasil S.A.>
+ *
+ * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
+ * os termos da GPL v.2 - Licença Pública Geral  GNU,  conforme  publicado  pela
+ * Free Software Foundation.
+ *
+ * Este programa é distribuído na expectativa de  ser  útil,  mas  SEM  QUALQUER
+ * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou  de  ADEQUAÇÃO
+ * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
+ * obter mais detalhes.
+ *
+ * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
+ * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
+ * St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Este programa está nomeado como config.c e possui - linhas de código.
+ *
+ * Contatos:
+ *
+ * perry.werneck@gmail.com	(Alexandre Perry de Souza Werneck)
+ * erico.mendonca@gmail.com	(Erico Mascarenhas Mendonça)
+ * licinio@bb.com.br		(Licínio Luis Branco)
+ * kraucer@bb.com.br		(Kraucer Fernandes Mazuco)
+ *
+ */
+
+#ifdef _WIN32
+	#include <windows.h>
+#endif // _WIN32
+
+ #include "../pw3270/private.h"
+
+ #include "../common.h"
+ #include <stdarg.h>
+ #include <glib/gstdio.h>
+
+/*--[ Globals ]--------------------------------------------------------------------------------------*/
+
+ static GKeyFile	* keyfile 		= NULL;
+ static gchar		* keyfilename	= NULL;
+
+/*--[ Implement ]------------------------------------------------------------------------------------*/
+
+ static gchar * search_for_ini(void)
+ {
+ 	static const gchar * (*dir[])(void) =
+ 	{
+ 		g_get_user_config_dir,
+ 		g_get_user_data_dir,
+ 		g_get_home_dir,
+	};
+
+	size_t f;
+	g_autofree gchar * name = g_strconcat(g_get_application_name(),".conf",NULL);
+
+	//
+	// First search the user data
+	//
+
+ 	for(f=0;f<G_N_ELEMENTS(dir);f++)
+	{
+		gchar *filename = g_build_filename(dir[f](),name,NULL);
+
+		trace("Checking for %s",filename);
+
+		if(g_file_test(filename,G_FILE_TEST_IS_REGULAR))
+			return filename;
+		g_free(filename);
+
+	}
+
+#ifdef DATADIR
+	//
+	// Search the application DATADIR
+	//
+	{
+		gchar *filename = g_build_filename(DATAROOTDIR,G_STRINGIFY(PRODUCT_NAME),name,NULL);
+
+		trace("Checking for default config \"%s\"",filename);
+
+		if(g_file_test(filename,G_FILE_TEST_IS_REGULAR))
+			return filename;
+
+		g_message("Can't find default config (%s)",filename);
+
+		g_free(filename);
+
+	}
+#endif // DATADIR
+
+	//
+	// Search the system config folders
+	//
+	const gchar * const * sysconfig = g_get_system_config_dirs();
+ 	for(f=0;sysconfig[f];f++)
+	{
+		gchar *filename = g_build_filename(sysconfig[f],name,NULL);
+		trace("Checking for %s",filename);
+		if(g_file_test(filename,G_FILE_TEST_IS_REGULAR))
+			return filename;
+		g_free(filename);
+	}
+
+	//
+	// Search the system data folders
+	//
+	const gchar * const * sysdata = g_get_system_data_dirs();
+ 	for(f=0;sysdata[f];f++)
+	{
+		gchar *filename;
+
+		// Check for product dir
+		filename = g_build_filename(sysdata[f],G_STRINGIFY(PRODUCT_NAME),name,NULL);
+		trace("Checking for system data \"%s\"",filename);
+		if(g_file_test(filename,G_FILE_TEST_IS_REGULAR))
+			return filename;
+		g_free(filename);
+
+		// Check for file
+		filename = g_build_filename(sysdata[f],name,NULL);
+		trace("Checking for system data \"%s\"",filename);
+		if(g_file_test(filename,G_FILE_TEST_IS_REGULAR))
+			return filename;
+		g_free(filename);
+
+
+
+	}
+
+	//
+	// Can't find, use user config dir
+	//
+	g_message("No config, defaulting to %s/%s",g_get_user_config_dir(),name);
+ 	return g_build_filename(g_get_user_config_dir(),name,NULL);
+
+ }
+
+ gboolean get_boolean_from_config(const gchar *group, const gchar *key, gboolean def)
+ {
+
+	if(keyfile)
+	{
+		GError		* err = NULL;
+		gboolean	  val = g_key_file_get_boolean(keyfile,group,key,&err);
+		if(err)
+			g_error_free(err);
+		else
+			return val;
+	}
+
+	return def;
+ }
+
+ gint get_integer_from_config(const gchar *group, const gchar *key, gint def)
+ {
+
+	if(keyfile)
+	{
+		GError	* err = NULL;
+		gint	  val = g_key_file_get_integer(keyfile,group,key,&err);
+		if(err)
+			g_error_free(err);
+		else
+			return val;
+	}
+
+	return def;
+ }
+
+
+ gchar * get_string_from_config(const gchar *group, const gchar *key, const gchar *def)
+ {
+
+	if(keyfile)
+	{
+		gchar *ret = g_key_file_get_string(keyfile,group,key,NULL);
+		if(ret)
+			return ret;
+	}
+
+	if(def)
+		return g_strdup(def);
+
+	return NULL;
+
+ }
+
+void pw3270_session_config_load(const gchar *filename)
+{
+	if(keyfilename)
+	{
+		g_free(keyfilename);
+		keyfilename = NULL;
+	}
+
+	if(keyfile)
+	{
+		g_key_file_free(keyfile);
+		keyfile = NULL;
+	}
+
+	keyfile = g_key_file_new();
+
+	if(filename)
+	{
+		g_message(_("Loading %s"),filename);
+		g_key_file_load_from_file(keyfile,filename,G_KEY_FILE_NONE,NULL);
+		keyfilename = g_strdup(filename);
+	}
+	else
+	{
+		// Using default file.
+		g_autofree gchar *name = search_for_ini();
+		if(name)
+		{
+			g_message(_("Loading %s"),name);
+			g_key_file_load_from_file(keyfile,name,G_KEY_FILE_NONE,NULL);
+		}
+	}
+
+}
+
+static void set_string(const gchar *group, const gchar *key, const gchar *fmt, va_list args)
+{
+	gchar * value = g_strdup_vprintf(fmt,args);
+
+	g_key_file_set_string(keyfile,group,key,value);
+
+	g_free(value);
+}
+
+void set_string_to_config(const gchar *group, const gchar *key, const gchar *fmt, ...)
+{
+	if(fmt)
+	{
+		va_list args;
+		va_start(args, fmt);
+		set_string(group,key,fmt,args);
+		va_end(args);
+	}
+	else if(g_key_file_has_key(keyfile,group,key,NULL))
+	{
+		g_key_file_remove_key(keyfile,group,key,NULL);
+	}
+
+}
+
+void set_boolean_to_config(const gchar *group, const gchar *key, gboolean val)
+{
+	if(keyfile)
+		g_key_file_set_boolean(keyfile,group,key,val);
+
+}
+
+void set_integer_to_config(const gchar *group, const gchar *key, gint val)
+{
+
+	if(keyfile)
+		g_key_file_set_integer(keyfile,group,key,val);
+
+}
+
+void pw3270_session_config_free(void)
+{
+
+	if(!keyfile)
+		return;
+
+	g_autofree gchar * text = g_key_file_to_data(keyfile,NULL,NULL);
+
+	if(text)
+	{
+		GError * error = NULL;
+
+		if(keyfilename)
+		{
+			g_message( _("Saving %s"), keyfilename);
+
+			g_file_set_contents(keyfilename,text,-1,&error);
+			g_free(keyfilename);
+			keyfilename = 0;
+		}
+		else
+		{
+			g_autofree gchar * name = g_strconcat(g_get_application_name(),".conf",NULL);
+			g_autofree gchar * filename = g_build_filename(g_get_user_config_dir(),name,NULL);
+			g_mkdir_with_parents(g_get_user_config_dir(),S_IRUSR|S_IWUSR);
+			g_file_set_contents(filename,text,-1,&error);
+		}
+
+
+		if(error) {
+			g_message( _( "Can't save session settings: %s" ), error->message);
+			g_error_free(error);
+		}
+
+	}
+
+	g_key_file_free(keyfile);
+	keyfile = NULL;
+
+}
+
+gchar * build_data_filename(const gchar *first_element, ...)
+{
+	va_list args;
+	gchar	*path;
+
+	va_start(args, first_element);
+	path = filename_from_va(first_element,args);
+	va_end(args);
+	return path;
+}
+
+gchar * filename_from_va(const gchar *first_element, va_list args)
+{
+	const gchar * appname[]	= { g_get_application_name(), PACKAGE_NAME };
+	size_t p,f;
+
+	// Make base path
+	const gchar *element;
+	GString	* result = g_string_new("");
+	for(element = first_element;element;element = va_arg(args, gchar *))
+    {
+    	g_string_append_c(result,G_DIR_SEPARATOR);
+    	g_string_append(result,element);
+    }
+
+	g_autofree gchar * suffix = g_string_free(result, FALSE);
+
+	// Check system data dirs
+	const gchar * const * system_data_dirs = g_get_system_data_dirs();
+	for(p=0;p<G_N_ELEMENTS(appname);p++)
+	{
+		for(f=0;system_data_dirs[f];f++)
+		{
+			gchar * path = g_build_filename(system_data_dirs[f],appname[p],suffix,NULL);
+			trace("searching \"%s\"",path);
+			if(g_file_test(path,G_FILE_TEST_EXISTS))
+				return path;
+			g_free(path);
+		}
+
+	}
+
+	// Check current dir
+	g_autofree gchar *dir = g_get_current_dir();
+	gchar * path = g_build_filename(dir,suffix,NULL);
+	trace("searching \"%s\"",path);
+	if(g_file_test(path,G_FILE_TEST_EXISTS))
+		return path;
+	g_free(path);
+
+	trace("Can't find \"%s\"",suffix);
+
+	return g_build_filename(".",suffix,NULL);
+}
+
+GKeyFile * pw3270_session_config_get(void)
+{
+	if(!keyfile)
+		pw3270_session_config_load(NULL);
+	return keyfile;
+}
+
+ static const struct _WindowState
+ {
+        const char *name;
+        GdkWindowState flag;
+        void (*activate)(GtkWindow *);
+ } WindowState[] =
+ {
+        { "Maximized",	GDK_WINDOW_STATE_MAXIMIZED,	gtk_window_maximize             },
+        { "Iconified",	GDK_WINDOW_STATE_ICONIFIED,	gtk_window_iconify              },
+        { "Sticky",		GDK_WINDOW_STATE_STICKY,	gtk_window_stick                }
+ };
+
+void save_window_state_to_config(const gchar *group, const gchar *key, GdkWindowState CurrentState)
+{
+	int			  f;
+	GKeyFile	* conf 	= pw3270_session_config_get();
+	gchar		* id	= g_strconcat(group,".",key,NULL);
+
+	for(f=0;f<G_N_ELEMENTS(WindowState);f++)
+		g_key_file_set_boolean(conf,id,WindowState[f].name,CurrentState & WindowState[f].flag);
+
+	g_free(id);
+
+}
+
+void save_window_size_to_config(const gchar *group, const gchar *key, GtkWidget *hwnd)
+{
+	int 		  pos[2];
+	GKeyFile	* conf 	= pw3270_session_config_get();
+	gchar		* id	= g_strconcat(group,".",key,NULL);
+
+	gtk_window_get_size(GTK_WINDOW(hwnd),&pos[0],&pos[1]);
+	g_key_file_set_integer_list(conf,id,"size",pos,2);
+
+	g_free(id);
+
+}
+
+void restore_window_from_config(const gchar *group, const gchar *key, GtkWidget *hwnd)
+{
+	gchar		* id	= g_strconcat(group,".",key,NULL);
+	GKeyFile	* conf 	= pw3270_session_config_get();
+
+	if(g_key_file_has_key(conf,id,"size",NULL))
+	{
+		gsize	  sz	= 2;
+		gint	* vlr	=  g_key_file_get_integer_list(conf,id,"size",&sz,NULL);
+		int		  f;
+
+		if(vlr)
+		{
+			gtk_window_resize(GTK_WINDOW(hwnd),vlr[0],vlr[1]);
+			g_free(vlr);
+		}
+
+		for(f=0;f<G_N_ELEMENTS(WindowState);f++)
+		{
+			if(g_key_file_get_boolean(conf,id,WindowState[f].name,NULL))
+				WindowState[f].activate(GTK_WINDOW(hwnd));
+		}
+
+	}
+
+	g_free(id);
+
+}
+
diff --git a/src/pw3270/linux/print.c b/src/pw3270/linux/print.c
index 80f59bc..4569581 100644
--- a/src/pw3270/linux/print.c
+++ b/src/pw3270/linux/print.c
@@ -48,7 +48,7 @@
 	g_message("Loading print settings");
 
 	// Load page and print settings
-	GKeyFile	* conf	= get_application_keyfile();
+	GKeyFile	* conf	= pw3270_session_config_get();
 	GError		* err	= NULL;
 
 	debug("print_settings=%s",g_key_file_has_group(conf,"print_settings") ? "TRUE" : "FALSE");
@@ -128,7 +128,7 @@
     trace("%s(%p)",__FUNCTION__,operation);
 	g_message("Saving print settings");
 
-	GKeyFile * conf = get_application_keyfile();
+	GKeyFile * conf = pw3270_session_config_get();
 	gtk_print_settings_to_key_file(settings,conf,"print_settings");
 	gtk_page_setup_to_key_file(pgsetup,conf,"page_setup");
 	gtk_paper_size_to_key_file(papersize,conf,"paper_size");
diff --git a/src/pw3270/main.c b/src/pw3270/main.c
index d454a38..f7d0438 100644
--- a/src/pw3270/main.c
+++ b/src/pw3270/main.c
@@ -50,6 +50,7 @@
 #include "v3270/accessible.h"
 #include <stdlib.h>
 #include <lib3270/log.h>
+#include "common.h"
 
 #define ERROR_DOMAIN g_quark_from_static_string(PACKAGE_NAME)
 
@@ -475,6 +476,21 @@ int main(int argc, char *argv[])
 	if(!session_name)
 		session_name = PACKAGE_NAME;
 
+	// Load session settings.
+	{
+		const gchar * session_settings_file_name = NULL;
+		size_t ix;
+
+		for(ix = 1; ix < argc; ix++)
+		{
+			if(argv[ix][0] != '-' && g_file_test(argv[ix],G_FILE_TEST_IS_REGULAR))
+					pw3270_session_config_load(argv[ix]);
+		}
+
+		pw3270_session_config_get();
+
+	}
+
 	rc = initialize();
 
 	if(!rc)
@@ -556,6 +572,7 @@ int main(int argc, char *argv[])
 
 		pw3270_stop_plugins(toplevel);
 		pw3270_unload_plugins();
+		pw3270_session_config_free();
 
 	}
 
diff --git a/src/pw3270/private.h b/src/pw3270/private.h
index 6c33ca4..5932c2b 100644
--- a/src/pw3270/private.h
+++ b/src/pw3270/private.h
@@ -68,7 +68,7 @@
 
 /*--[ Global prototipes ]----------------------------------------------------------------------------*/
 
- #include "common/common.h"
+ #include "common.h"
 
  G_GNUC_INTERNAL GtkWidget		* create_main_window(const gchar *uri);
  G_GNUC_INTERNAL void			  setup_font_list(GtkWidget *widget, GtkWidget *obj);
diff --git a/src/pw3270/tools.c b/src/pw3270/tools.c
index a281bbe..029e81d 100644
--- a/src/pw3270/tools.c
+++ b/src/pw3270/tools.c
@@ -75,23 +75,9 @@ int libpw3270_loaded(void)
 int libpw3270_unloaded(void)
 {
 	trace("%s",__FUNCTION__);
-	configuration_deinit();
 	return 0;
 }
 
-/*
-LIB3270_EXPORT gchar * pw3270_build_filename(GtkWidget *widget, const gchar *first_element, ...)
-{
-	va_list args;
-	gchar	*path;
-
-	va_start(args, first_element);
-	path = filename_from_va(first_element,args);
-	va_end(args);
-	return path;
-}
-*/
-
 LIB3270_EXPORT void pw3270_save_window_size(GtkWidget *widget, const gchar *name)
 {
 	trace("%s",__FUNCTION__);
diff --git a/src/pw3270/uiparser/private.h b/src/pw3270/uiparser/private.h
index ab78839..453cbbc 100644
--- a/src/pw3270/uiparser/private.h
+++ b/src/pw3270/uiparser/private.h
@@ -31,7 +31,7 @@
 
  #include <gtk/gtk.h>
  #include <config.h>
- #include "../common/common.h"
+ #include "../common.h"
  #include "parser.h"
 
  #define ERROR_DOMAIN g_quark_from_static_string("uiparser")
diff --git a/src/pw3270/uiparser/testprogram.c b/src/pw3270/uiparser/testprogram.c
index 392f811..f1eefa4 100644
--- a/src/pw3270/uiparser/testprogram.c
+++ b/src/pw3270/uiparser/testprogram.c
@@ -1,6 +1,6 @@
 
 #include <gtk/gtk.h>
-#include "../common/common.h"
+#include "../common.h"
 #include "parser.h"
 
 /*--[ Globals ]--------------------------------------------------------------------------------------*/
@@ -90,7 +90,6 @@ int main (int argc, char *argv[])
 	GtkWidget	* hbox;
 
 	gtk_init(&argc, &argv);
-	configuration_init();
 
 	hbox   = gtk_hbox_new(FALSE,5);
 	vbox   = gtk_vbox_new(FALSE,5);
diff --git a/src/pw3270/window.c b/src/pw3270/window.c
index 16d27de..385e9c1 100644
--- a/src/pw3270/window.c
+++ b/src/pw3270/window.c
@@ -40,7 +40,7 @@
 #include <v3270/trace.h>
 #include <v3270/toggle.h>
 #include <v3270/settings.h>
-#include "common/common.h"
+#include "common.h"
 
 /*--[ Widget definition ]----------------------------------------------------------------------------*/
 
@@ -163,8 +163,6 @@ static GtkWidget * trace_window = NULL;
 	}
 #endif // GTK3
 
-	configuration_init();
-
  }
 
  static void trace_on_file(G_GNUC_UNUSED H3270 *hSession, void * userdata, const char *fmt, va_list args)
@@ -420,7 +418,7 @@ static GtkWidget * trace_window = NULL;
 
 #else
 
-	v3270_to_key_file(widget, get_application_keyfile(), "terminal");
+	v3270_to_key_file(widget, pw3270_session_config_get(), "terminal");
 
 #endif // _WIN32
 
diff --git a/src/pw3270/windows/config.c b/src/pw3270/windows/config.c
new file mode 100644
index 0000000..cf7f30a
--- /dev/null
+++ b/src/pw3270/windows/config.c
@@ -0,0 +1,939 @@
+/*
+ * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270  e X3270
+ * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
+ * aplicativos mainframe. Registro no INPI sob o nome G3270.
+ *
+ * Copyright (C) <2008> <Banco do Brasil S.A.>
+ *
+ * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
+ * os termos da GPL v.2 - Licença Pública Geral  GNU,  conforme  publicado  pela
+ * Free Software Foundation.
+ *
+ * Este programa é distribuído na expectativa de  ser  útil,  mas  SEM  QUALQUER
+ * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou  de  ADEQUAÇÃO
+ * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
+ * obter mais detalhes.
+ *
+ * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
+ * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
+ * St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Este programa está nomeado como config.c e possui - linhas de código.
+ *
+ * Contatos:
+ *
+ * perry.werneck@gmail.com	(Alexandre Perry de Souza Werneck)
+ * erico.mendonca@gmail.com	(Erico Mascarenhas Mendonça)
+ * licinio@bb.com.br		(Licínio Luis Branco)
+ * kraucer@bb.com.br		(Kraucer Fernandes Mazuco)
+ *
+ */
+
+#ifdef _WIN32
+	#include <windows.h>
+#endif // _WIN32
+
+ #include "../pw3270/private.h"
+
+ #include "common.h"
+ #include <stdarg.h>
+ #include <glib/gstdio.h>
+
+#ifdef _WIN32
+
+	#include <windows.h>
+
+	#ifndef KEY_WOW64_64KEY
+		#define KEY_WOW64_64KEY 0x0100
+	#endif // KEY_WOW64_64KEY
+
+	#ifndef KEY_WOW64_32KEY
+		#define KEY_WOW64_32KEY	0x0200
+	#endif // KEY_WOW64_64KEY
+
+#endif // _WIN32
+
+/*--[ Globals ]--------------------------------------------------------------------------------------*/
+
+#ifdef ENABLE_WINDOWS_REGISTRY
+
+ 	static const gchar	* registry_path = "SOFTWARE";
+
+#else
+
+	static GKeyFile		* program_config = NULL;
+
+#endif // ENABLE_WINDOWS_REGISTRY
+
+/*--[ Implement ]------------------------------------------------------------------------------------*/
+
+#ifdef ENABLE_WINDOWS_REGISTRY
+
+ enum REG_KEY
+ {
+	REG_KEY_USER,
+	REG_KEY_SYSTEM,
+	REG_KEY_INEXISTENT
+ };
+
+ static enum REG_KEY registry_query(const gchar *group, const gchar *key, HKEY *hKey)
+ {
+ 	static HKEY	  predefined[] = { HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE };
+	gchar		* path = g_strdup_printf("%s\\%s\\%s",registry_path,g_get_application_name(),group);
+	int			  f;
+
+	for(f=0;f<G_N_ELEMENTS(predefined);f++)
+	{
+		if(RegOpenKeyEx(predefined[f],path,0,KEY_READ,hKey) == ERROR_SUCCESS)
+		{
+			if(RegQueryValueExA(*hKey,key,NULL,NULL,NULL,NULL) == ERROR_SUCCESS)
+			{
+				trace("Key\"%s\\%s\" found at id %d",path,key,f);
+				g_free(path);
+				return f;
+			}
+			RegCloseKey(*hKey);
+		}
+	}
+
+	trace("Key \"%s\\%s\""" not found",path,key,f);
+	g_free(path);
+
+	return -1;
+ }
+
+ static BOOL registry_open_key(const gchar *group, const gchar *key, REGSAM samDesired, HKEY *hKey)
+ {
+ 	static HKEY	  predefined[] = { HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE };
+ 	int			  f;
+	gchar		* path = g_strdup_printf("%s\\%s\\%s",registry_path,g_get_application_name(),group);
+
+	for(f=0;f<G_N_ELEMENTS(predefined);f++)
+	{
+		if(RegOpenKeyEx(predefined[f],path,0,samDesired,hKey) == ERROR_SUCCESS)
+		{
+			g_free(path);
+			return TRUE;
+		}
+	}
+
+	g_free(path);
+
+	return FALSE;
+ }
+
+ void registry_foreach(HKEY parent, const gchar *name,void (*cbk)(const gchar *key, const gchar *val, gpointer *user_data), gpointer *user_data)
+ {
+	HKEY hKey = 0;
+
+	if(RegOpenKeyEx(parent,name,0,KEY_READ,&hKey) == ERROR_SUCCESS)
+	{
+		#define MAX_KEY_LENGTH 255
+		#define MAX_VALUE_NAME 16383
+
+		TCHAR    	pName[MAX_KEY_LENGTH];
+		DWORD 		cName	= MAX_KEY_LENGTH;
+		int			ix		= 0;
+
+		while(RegEnumValue(hKey,ix++,pName,&cName,NULL,NULL,NULL,NULL) == ERROR_SUCCESS)
+		{
+			BYTE data[4097];
+			unsigned long datatype;
+			unsigned long datalen 	= 4096;
+
+			if(RegQueryValueExA(hKey,pName,NULL,&datatype,data,&datalen) == ERROR_SUCCESS)
+			{
+				data[datalen+1] = 0;
+				cbk(pName,(const gchar *) data, user_data);
+			}
+			cName = MAX_KEY_LENGTH;
+		}
+		RegCloseKey(hKey);
+	}
+ }
+
+ void registry_set_double(HKEY hKey, const gchar *key, gdouble value)
+ {
+	// Reference: http://git.gnome.org/browse/glib/tree/glib/gkeyfile.c
+	gchar result[G_ASCII_DTOSTR_BUF_SIZE];
+	g_ascii_dtostr (result, sizeof (result), value);
+
+	RegSetValueEx(hKey,key,0,REG_SZ,(const BYTE *) result,strlen(result)+1);
+ }
+
+ gboolean registry_get_double(HKEY hKey, const gchar *key, gdouble *value)
+ {
+//	GError			* error = NULL;
+	BYTE			  data[4096];
+	unsigned long	  datatype;
+	unsigned long	  datalen 	= sizeof(data);
+	gchar 			* end_of_valid_d;
+
+	if(RegQueryValueExA(hKey,key,NULL,&datatype,data,&datalen) != ERROR_SUCCESS)
+		return FALSE;
+
+	data[datalen] = 0;
+
+	* value = g_ascii_strtod((const gchar *) data, &end_of_valid_d);
+
+	if(*end_of_valid_d != '\0' || end_of_valid_d == ((gchar *) data))
+	{
+		g_warning("Key %s on registry isnt a valid double value",key);
+		return FALSE;
+	}
+
+ 	return TRUE;
+ }
+
+
+
+#else
+
+ static gchar * search_for_ini(void)
+ {
+ 	static const gchar * (*dir[])(void) =
+ 	{
+ 		g_get_user_config_dir,
+ 		g_get_user_data_dir,
+ 		g_get_home_dir,
+	};
+
+	size_t f;
+	g_autofree gchar * name = g_strconcat(g_get_application_name(),".conf",NULL);
+
+	//
+	// First search the user data
+	//
+
+ 	for(f=0;f<G_N_ELEMENTS(dir);f++)
+	{
+		gchar *filename = g_build_filename(dir[f](),name,NULL);
+
+		trace("Checking for %s",filename);
+
+		if(g_file_test(filename,G_FILE_TEST_IS_REGULAR))
+			return filename;
+		g_free(filename);
+
+	}
+
+#ifdef DATADIR
+	//
+	// Search the application DATADIR
+	//
+	{
+		gchar *filename = g_build_filename(DATAROOTDIR,G_STRINGIFY(PRODUCT_NAME),name,NULL);
+
+		trace("Checking for default config \"%s\"",filename);
+
+		if(g_file_test(filename,G_FILE_TEST_IS_REGULAR))
+			return filename;
+
+		g_message("Can't find default config (%s)",filename);
+
+		g_free(filename);
+
+	}
+#endif // DATADIR
+
+	//
+	// Search the system config folders
+	//
+	const gchar * const * sysconfig = g_get_system_config_dirs();
+ 	for(f=0;sysconfig[f];f++)
+	{
+		gchar *filename = g_build_filename(sysconfig[f],name,NULL);
+		trace("Checking for %s",filename);
+		if(g_file_test(filename,G_FILE_TEST_IS_REGULAR))
+			return filename;
+		g_free(filename);
+	}
+
+	//
+	// Search the system data folders
+	//
+	const gchar * const * sysdata = g_get_system_data_dirs();
+ 	for(f=0;sysdata[f];f++)
+	{
+		gchar *filename;
+
+		// Check for product dir
+		filename = g_build_filename(sysdata[f],G_STRINGIFY(PRODUCT_NAME),name,NULL);
+		trace("Checking for system data \"%s\"",filename);
+		if(g_file_test(filename,G_FILE_TEST_IS_REGULAR))
+			return filename;
+		g_free(filename);
+
+		// Check for file
+		filename = g_build_filename(sysdata[f],name,NULL);
+		trace("Checking for system data \"%s\"",filename);
+		if(g_file_test(filename,G_FILE_TEST_IS_REGULAR))
+			return filename;
+		g_free(filename);
+
+
+
+	}
+
+	//
+	// Can't find, use user config dir
+	//
+	g_message("No config, defaulting to %s/%s",g_get_user_config_dir(),name);
+ 	return g_build_filename(g_get_user_config_dir(),name,NULL);
+
+ }
+#endif  //  #ifdef ENABLE_WINDOWS_REGISTRY
+
+ gboolean get_boolean_from_config(const gchar *group, const gchar *key, gboolean def)
+ {
+#ifdef ENABLE_WINDOWS_REGISTRY
+	gboolean	ret 		= def;
+	HKEY 		hKey;
+
+	if(registry_query(group,key,&hKey) != REG_KEY_INEXISTENT)
+	{
+		DWORD			  data;
+		unsigned long	  datalen	= sizeof(data);
+		unsigned long	  datatype;
+
+		if(RegQueryValueExA(hKey,key,NULL,&datatype,(BYTE *) &data,&datalen) == ERROR_SUCCESS)
+		{
+			if(datatype == REG_DWORD)
+				ret = data ? TRUE : FALSE;
+			else
+				g_warning("Unexpected registry data type in %s\\%s\\%s\\%s",registry_path,g_get_application_name(),group,key);
+		}
+
+		RegCloseKey(hKey);
+	}
+
+	return ret;
+
+#else
+
+	if(program_config)
+	{
+		GError		* err = NULL;
+		gboolean	  val = g_key_file_get_boolean(program_config,group,key,&err);
+		if(err)
+			g_error_free(err);
+		else
+			return val;
+	}
+#endif // ENABLE_WINDOWS_REGISTRY
+
+	return def;
+ }
+
+ gint get_integer_from_config(const gchar *group, const gchar *key, gint def)
+ {
+#ifdef ENABLE_WINDOWS_REGISTRY
+
+	HKEY key_handle;
+
+	if(registry_open_key(group,key,KEY_READ,&key_handle))
+	{
+		DWORD			data;
+		gint			ret = def;
+		unsigned long	datalen	= sizeof(data);
+		unsigned long	datatype;
+
+		if(RegQueryValueExA(key_handle,key,NULL,&datatype,(BYTE *) &data,&datalen) == ERROR_SUCCESS)
+		{
+			if(datatype == REG_DWORD)
+				ret = (gint) data;
+			else
+				g_warning("Unexpected registry data type in %s\\%s\\%s\\%s",registry_path,g_get_application_name(),group,key);
+		}
+
+		RegCloseKey(key_handle);
+
+		return ret;
+
+	}
+
+#else
+
+	if(program_config)
+	{
+		GError	* err = NULL;
+		gint	  val = g_key_file_get_integer(program_config,group,key,&err);
+		if(err)
+			g_error_free(err);
+		else
+			return val;
+	}
+#endif // ENABLE_WINDOWS_REGISTRY
+
+	return def;
+ }
+
+
+ gchar * get_string_from_config(const gchar *group, const gchar *key, const gchar *def)
+ {
+#ifdef ENABLE_WINDOWS_REGISTRY
+
+	HKEY key_handle;
+	unsigned long	  datalen 	= 4096;
+	unsigned long	  datatype;
+	gchar 			* ret		= NULL;
+	BYTE			* data;
+
+	if(!registry_open_key(group,key,KEY_READ,&key_handle))
+	{
+		if(def)
+			return g_strdup(def);
+		return NULL;
+	}
+
+	data = (BYTE *) g_malloc0(datalen+2);
+
+	if(RegQueryValueExA(key_handle,key,NULL,&datatype,data,&datalen) == ERROR_SUCCESS)
+	{
+		data[datalen+1] = 0;
+		ret = g_strdup((const gchar *) data);
+	}
+	else if(def)
+	{
+		ret = g_strdup(def);
+	}
+
+	g_free(data);
+
+	RegCloseKey(key_handle);
+
+	return ret;
+
+#else
+
+	if(program_config)
+	{
+		gchar *ret = g_key_file_get_string(program_config,group,key,NULL);
+		if(ret)
+			return ret;
+	}
+
+	if(def)
+		return g_strdup(def);
+
+	return NULL;
+
+#endif // ENABLE_WINDOWS_REGISTRY
+ }
+
+void configuration_init(void)
+{
+#ifndef ENABLE_WINDOWS_REGISTRY
+	gchar *filename = search_for_ini();
+
+	if(program_config)
+		g_key_file_free(program_config);
+
+	program_config = g_key_file_new();
+
+	if(filename)
+	{
+		g_message(_("Loading %s"),filename);
+		g_key_file_load_from_file(program_config,filename,G_KEY_FILE_NONE,NULL);
+		g_free(filename);
+	}
+
+#endif // ENABLE_WINDOWS_REGISTRY
+}
+
+static void set_string(const gchar *group, const gchar *key, const gchar *fmt, va_list args)
+{
+	gchar * value = g_strdup_vprintf(fmt,args);
+
+#ifdef ENABLE_WINDOWS_REGISTRY
+
+	gchar * path = g_strdup_printf("%s\\%s\\%s",registry_path,g_get_application_name(),group);
+ 	HKEY	hKey;
+ 	DWORD	disp;
+
+	if(RegCreateKeyEx(HKEY_CURRENT_USER,path,0,NULL,REG_OPTION_NON_VOLATILE,KEY_SET_VALUE,NULL,&hKey,&disp) == ERROR_SUCCESS)
+	{
+		RegSetValueEx(hKey,key,0,REG_SZ,(const BYTE *) value,strlen(value)+1);
+		RegCloseKey(hKey);
+	}
+
+	g_free(path);
+
+#else
+
+	g_key_file_set_string(program_config,group,key,value);
+
+#endif
+
+	g_free(value);
+}
+
+void set_string_to_config(const gchar *group, const gchar *key, const gchar *fmt, ...)
+{
+	if(fmt)
+	{
+		va_list args;
+		va_start(args, fmt);
+		set_string(group,key,fmt,args);
+		va_end(args);
+	}
+#ifdef ENABLE_WINDOWS_REGISTRY
+	else
+	{
+
+		gchar * path = g_strdup_printf("%s\\%s\\%s",registry_path,g_get_application_name(),group);
+		HKEY	hKey;
+		DWORD	disp;
+
+		if(RegOpenKeyEx(HKEY_CURRENT_USER, path, 0, KEY_ALL_ACCESS, &hKey) == ERROR_SUCCESS)
+		{
+			RegDeleteKey(hKey,key);
+			RegCloseKey(hKey);
+		}
+
+		g_free(path);
+
+	}
+#else
+	else if(g_key_file_has_key(program_config,group,key,NULL))
+	{
+		g_key_file_remove_key(program_config,group,key,NULL);
+	}
+#endif
+}
+
+void set_boolean_to_config(const gchar *group, const gchar *key, gboolean val)
+{
+#ifdef ENABLE_WINDOWS_REGISTRY
+
+ 	HKEY	hKey;
+ 	DWORD	disp;
+	gchar * path = g_strdup_printf("%s\\%s\\%s",registry_path,g_get_application_name(),group);
+
+//	trace("Creating key %s",path);
+	if(RegCreateKeyEx(HKEY_CURRENT_USER,path,0,NULL,REG_OPTION_NON_VOLATILE,KEY_SET_VALUE,NULL,&hKey,&disp) == ERROR_SUCCESS)
+	{
+		DWORD	value = val ? 1 : 0;
+		LONG	rc = RegSetValueEx(hKey, key, 0, REG_DWORD,(const BYTE *) &value,sizeof(value));
+
+		SetLastError(rc);
+
+		if(rc != ERROR_SUCCESS)
+		{
+			gchar *msg = g_win32_error_message(GetLastError());
+			g_warning("Error \"%s\" when setting key HKCU\\%s\\%s",msg,path,key);
+			g_free(msg);
+		}
+		RegCloseKey(hKey);
+	}
+	else
+	{
+		gchar *msg = g_win32_error_message(GetLastError());
+		g_warning("Error \"%s\" when creating key HKCU\\%s",msg,path);
+		g_free(msg);
+	}
+
+	g_free(path);
+
+#else
+
+	if(program_config)
+		g_key_file_set_boolean(program_config,group,key,val);
+
+#endif // ENABLE_WINDOWS_REGISTRY
+
+}
+
+void set_integer_to_config(const gchar *group, const gchar *key, gint val)
+{
+#ifdef ENABLE_WINDOWS_REGISTRY
+
+ 	HKEY	hKey;
+ 	DWORD	disp;
+	gchar * path = g_strdup_printf("%s\\%s\\%s",registry_path,g_get_application_name(),group);
+
+	trace("Creating key %s",path);
+	if(RegCreateKeyEx(HKEY_CURRENT_USER,path,0,NULL,REG_OPTION_NON_VOLATILE,KEY_SET_VALUE,NULL,&hKey,&disp) == ERROR_SUCCESS)
+	{
+		DWORD	value = (DWORD) val;
+		LONG	rc = RegSetValueEx(hKey, key, 0, REG_DWORD,(const BYTE *) &value,sizeof(value));
+
+		SetLastError(rc);
+
+		if(rc != ERROR_SUCCESS)
+		{
+			gchar *msg = g_win32_error_message(GetLastError());
+			g_warning("Error \"%s\" when setting key HKCU\\%s\\%s",msg,path,key);
+			g_free(msg);
+		}
+		RegCloseKey(hKey);
+	}
+	else
+	{
+		gchar *msg = g_win32_error_message(GetLastError());
+		g_warning("Error \"%s\" when creating key HKCU\\%s",msg,path);
+		g_free(msg);
+	}
+
+	g_free(path);
+
+#else
+
+	if(program_config)
+		g_key_file_set_integer(program_config,group,key,val);
+
+#endif // ENABLE_WINDOWS_REGISTRY
+
+}
+
+void configuration_deinit(void)
+{
+#if !defined(ENABLE_WINDOWS_REGISTRY)
+
+	if(!program_config)
+		return;
+
+	g_autofree gchar * text = g_key_file_to_data(program_config,NULL,NULL);
+
+	if(text)
+	{
+		GError * error = NULL;
+
+		g_autofree gchar * name = g_strconcat(g_get_application_name(),".conf",NULL);
+		g_autofree gchar * filename = g_build_filename(g_get_user_config_dir(),name,NULL);
+
+		g_mkdir_with_parents(g_get_user_config_dir(),S_IRUSR|S_IWUSR);
+
+		g_message( _("Saving %s"), filename);
+
+		g_file_set_contents(filename,text,-1,&error);
+
+		if(error) {
+			g_message( _( "Can't save \"%s\": %s" ), filename, error->message);
+			g_error_free(error);
+		}
+
+	}
+
+	g_key_file_free(program_config);
+	program_config = NULL;
+
+#endif // ENABLE_WINDOWS_REGISTRY
+}
+
+gchar * build_data_filename(const gchar *first_element, ...)
+{
+	va_list args;
+	gchar	*path;
+
+	va_start(args, first_element);
+	path = filename_from_va(first_element,args);
+	va_end(args);
+	return path;
+}
+
+gchar * filename_from_va(const gchar *first_element, va_list args)
+{
+	const gchar * appname[]	= { g_get_application_name(), PACKAGE_NAME };
+	size_t p,f;
+
+	// Make base path
+	const gchar *element;
+	GString	* result = g_string_new("");
+	for(element = first_element;element;element = va_arg(args, gchar *))
+    {
+    	g_string_append_c(result,G_DIR_SEPARATOR);
+    	g_string_append(result,element);
+    }
+
+	g_autofree gchar * suffix = g_string_free(result, FALSE);
+
+#if defined( ENABLE_WINDOWS_REGISTRY )
+	for(p=0;p<G_N_ELEMENTS(appname) && !result;p++)
+	{
+		g_autofree gchar * path	= g_strconcat("Software\\",appname[p],NULL);
+
+		HKEY	  hKey	= 0;
+		LONG	  rc 	= 0;
+
+		// Note: This could be needed: http://support.microsoft.com/kb/556009
+		// http://msdn.microsoft.com/en-us/library/windows/desktop/aa384129(v=vs.85).aspx
+
+		rc = RegOpenKeyEx(HKEY_LOCAL_MACHINE,path,0,KEY_QUERY_VALUE,&hKey);
+		SetLastError(rc);
+
+		if(rc == ERROR_SUCCESS)
+		{
+			char			data[4096];
+			unsigned long	datalen	= sizeof(data);		// data field length(in), data returned length(out)
+			unsigned long	datatype;					// #defined in winnt.h (predefined types 0-11)
+
+			rc = RegQueryValueExA(hKey,"datadir",NULL,&datatype,(LPBYTE) data,&datalen);
+			if(rc == ERROR_SUCCESS)
+			{
+				gchar * path = g_build_filename(data,appname[p],suffix,NULL);
+				trace("searching \"%s\"",path);
+				if(g_file_test(path,G_FILE_TEST_EXISTS))
+					return path;
+				g_free(path);
+			}
+			RegCloseKey(hKey);
+		}
+
+	}
+#endif // ENABLE_WINDOWS_REGISTRY
+
+#ifdef _WIN32
+	for(p=0;p<G_N_ELEMENTS(appname) && !result;p++)
+	{
+		gchar * path = g_build_filename(g_win32_get_package_installation_directory_of_module(NULL),appname[p],suffix,NULL);
+		trace("searching \"%s\"",path);
+		if(g_file_test(path,G_FILE_TEST_EXISTS))
+			return path;
+		g_free(path);
+	}
+#endif // _WIN32
+
+	// Check system data dirs
+	const gchar * const * system_data_dirs = g_get_system_data_dirs();
+	for(p=0;p<G_N_ELEMENTS(appname);p++)
+	{
+		for(f=0;system_data_dirs[f];f++)
+		{
+			gchar * path = g_build_filename(system_data_dirs[f],appname[p],suffix,NULL);
+			trace("searching \"%s\"",path);
+			if(g_file_test(path,G_FILE_TEST_EXISTS))
+				return path;
+			g_free(path);
+		}
+
+	}
+
+	// Check current dir
+	g_autofree gchar *dir = g_get_current_dir();
+	gchar * path = g_build_filename(dir,suffix,NULL);
+	trace("searching \"%s\"",path);
+	if(g_file_test(path,G_FILE_TEST_EXISTS))
+		return path;
+	g_free(path);
+
+	trace("Can't find \"%s\"",suffix);
+
+	return g_build_filename(".",suffix,NULL);
+}
+
+#ifdef ENABLE_WINDOWS_REGISTRY
+gboolean get_registry_handle(const gchar *group, HKEY *hKey, REGSAM samDesired)
+{
+	gboolean	  ret;
+	gchar		* path;
+ 	DWORD		  disp;
+
+ 	if(group)
+		path = g_strdup_printf("%s\\%s\\%s",registry_path,g_get_application_name(),group);
+	else
+		path = g_strdup_printf("%s\\%s",registry_path,g_get_application_name());
+
+	if(RegCreateKeyEx(HKEY_CURRENT_USER,path,0,NULL,REG_OPTION_NON_VOLATILE,samDesired,NULL,hKey,&disp) == ERROR_SUCCESS)
+		ret = TRUE;
+	else
+		ret = FALSE;
+
+	g_free(path);
+
+	return ret;
+}
+#else
+#error Replace it!
+GKeyFile * get_application_keyfile(void)
+{
+	if(!program_config)
+		configuration_init();
+	return program_config;
+}
+#endif // ENABLE_WINDOWS_REGISTRY
+
+ static const struct _WindowState
+ {
+        const char *name;
+        GdkWindowState flag;
+        void (*activate)(GtkWindow *);
+ } WindowState[] =
+ {
+        { "Maximized",	GDK_WINDOW_STATE_MAXIMIZED,	gtk_window_maximize             },
+        { "Iconified",	GDK_WINDOW_STATE_ICONIFIED,	gtk_window_iconify              },
+        { "Sticky",		GDK_WINDOW_STATE_STICKY,	gtk_window_stick                }
+ };
+
+void save_window_state_to_config(const gchar *group, const gchar *key, GdkWindowState CurrentState)
+{
+#if defined( ENABLE_WINDOWS_REGISTRY )
+
+        gchar * path = g_strdup_printf("%s\\%s\\%s\\%s",registry_path,g_get_application_name(),group,key);
+
+        HKEY    hKey;
+        DWORD   disp;
+
+		if(RegCreateKeyEx(HKEY_CURRENT_USER,path,0,NULL,REG_OPTION_NON_VOLATILE,KEY_SET_VALUE,NULL,&hKey,&disp) == ERROR_SUCCESS)
+		{
+			int f;
+			for(f=0;f<G_N_ELEMENTS(WindowState);f++)
+			{
+				DWORD value = (CurrentState & WindowState[f].flag) ? 1 : 0;
+//				trace("%s=%s",WindowState[f].name,value ? "Yes" : "No");
+				RegSetValueEx(hKey, WindowState[f].name, 0, REG_DWORD,(const BYTE *) &value,sizeof(value));
+			}
+
+			RegCloseKey(hKey);
+		}
+
+		g_free(path);
+
+#else
+		int			  f;
+		GKeyFile	* conf 	= get_application_keyfile();
+		gchar		* id	= g_strconcat(group,".",key,NULL);
+
+		for(f=0;f<G_N_ELEMENTS(WindowState);f++)
+			g_key_file_set_boolean(conf,id,WindowState[f].name,CurrentState & WindowState[f].flag);
+
+		g_free(id);
+
+#endif // ENABLE_WINDOWS_REGISTRY
+}
+
+void save_window_size_to_config(const gchar *group, const gchar *key, GtkWidget *hwnd)
+{
+#if defined( ENABLE_WINDOWS_REGISTRY )
+
+        gchar * path = g_strdup_printf("%s\\%s\\%s\\%s",registry_path,g_get_application_name(),group,key);
+
+        HKEY    hKey;
+        DWORD   disp;
+
+		if(RegCreateKeyEx(HKEY_CURRENT_USER,path,0,NULL,REG_OPTION_NON_VOLATILE,KEY_SET_VALUE,NULL,&hKey,&disp) == ERROR_SUCCESS)
+		{
+			int pos[2];
+
+			gtk_window_get_size(GTK_WINDOW(hwnd),&pos[0],&pos[1]);
+
+			RegSetValueEx(hKey, "Size", 0, REG_BINARY,(const BYTE *) pos,sizeof(pos));
+
+			RegCloseKey(hKey);
+		}
+
+		g_free(path);
+
+#else
+		int 		  pos[2];
+		GKeyFile	* conf 	= get_application_keyfile();
+		gchar		* id	= g_strconcat(group,".",key,NULL);
+
+        gtk_window_get_size(GTK_WINDOW(hwnd),&pos[0],&pos[1]);
+        g_key_file_set_integer_list(conf,id,"size",pos,2);
+
+		g_free(id);
+
+#endif // ENABLE_WINDOWS_REGISTRY
+}
+
+#if defined( ENABLE_WINDOWS_REGISTRY )
+static void restore_window_from_regkey(GtkWidget *hwnd, HKEY hKey, const gchar *path)
+{
+	int 			f;
+	int 			pos[2];
+	unsigned long	datalen;
+	unsigned long	datatype;
+
+
+	datalen = sizeof(pos);
+	if(RegQueryValueExA(hKey,"Size",NULL,&datatype,(BYTE *) pos,&datalen) == ERROR_SUCCESS)
+	{
+		if(datatype == REG_BINARY && datalen == sizeof(pos))
+		{
+			gtk_window_resize(GTK_WINDOW(hwnd),pos[0],pos[1]);
+		}
+		else
+		{
+			g_warning("Unexpected registry data in %s\\Size",path);
+		}
+	}
+
+
+	for(f=0;f<G_N_ELEMENTS(WindowState);f++)
+	{
+		DWORD			data;
+
+		datalen       = sizeof(data);
+
+		if(RegQueryValueExA(hKey,WindowState[f].name,NULL,&datatype,(BYTE *) &data,&datalen) == ERROR_SUCCESS)
+		{
+			if(datatype == REG_DWORD)
+			{
+				if(data)
+					WindowState[f].activate(GTK_WINDOW(hwnd));
+
+			}
+			else
+			{
+				g_warning("Unexpected registry data type in %s\\%s",path,WindowState[f].name);
+			}
+		}
+	}
+
+
+}
+#endif // ENABLE_WINDOWS_REGISTRY
+
+void restore_window_from_config(const gchar *group, const gchar *key, GtkWidget *hwnd)
+{
+#if defined( ENABLE_WINDOWS_REGISTRY )
+
+	gchar * path = g_strdup_printf("%s\\%s\\%s\\%s",registry_path,g_get_application_name(),group,key);
+	HKEY    hKey;
+
+	if(RegOpenKeyEx(HKEY_CURRENT_USER,path,0,KEY_READ,&hKey) == ERROR_SUCCESS)
+	{
+		// Load user settings
+		restore_window_from_regkey(hwnd,hKey,path);
+		RegCloseKey(hKey);
+	}
+	else if(RegOpenKeyEx(HKEY_LOCAL_MACHINE,path,0,KEY_READ,&hKey) == ERROR_SUCCESS)
+	{
+		// Load system defaults
+		restore_window_from_regkey(hwnd,hKey,path);
+		RegCloseKey(hKey);
+	}
+
+	g_free(path);
+
+#else
+	gchar		* id	= g_strconcat(group,".",key,NULL);
+	GKeyFile	* conf 	= get_application_keyfile();
+
+	if(g_key_file_has_key(conf,id,"size",NULL))
+	{
+		gsize	  sz	= 2;
+		gint	* vlr	=  g_key_file_get_integer_list(conf,id,"size",&sz,NULL);
+		int		  f;
+
+		if(vlr)
+		{
+			gtk_window_resize(GTK_WINDOW(hwnd),vlr[0],vlr[1]);
+			g_free(vlr);
+		}
+
+		for(f=0;f<G_N_ELEMENTS(WindowState);f++)
+		{
+			if(g_key_file_get_boolean(conf,id,WindowState[f].name,NULL))
+				WindowState[f].activate(GTK_WINDOW(hwnd));
+		}
+
+	}
+
+	g_free(id);
+
+#endif // ENABLE_WINDOWS_REGISTRY
+
+}
+
--
libgit2 0.21.2