X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fgtk%2Fapp-config.c;h=eccfc4d871a983ec7703af7cc264f17073906478;hb=dc0e2b9353081e3f41b98976fb16bd2c56c17c5b;hp=90022f24c4c338a930a18a56bb41cedcedb5855b;hpb=1eb382f72510d50b3636fb88c4bfaf17183672b6;p=emu8051.git

diff --git a/src/gtk/app-config.c b/src/gtk/app-config.c
index 90022f2..eccfc4d 100644
--- a/src/gtk/app-config.c
+++ b/src/gtk/app-config.c
@@ -3,19 +3,7 @@
  *
  * Copyright (C) 2013 Hugo Villeneuve <hugo@hugovil.com>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ * This file is released under the GPLv2
  */
 
 #if HAVE_CONFIG_H
@@ -60,25 +48,25 @@ app_config_init(void)
 	/* View menu options */
 	cfg->layout = UI_LAYOUT1;
 	cfg->view_int_memory = 1;
-	cfg->view_sfr_memory = 1;
 	cfg->view_ext_memory = 1;
-	cfg->bits_per_row = 16; /* 8 or 16 */
+	cfg->bytes_per_row = 16; /* 8 or 16 */
 }
 
 static int
-app_config_key_file_get_int(GKeyFile *kf, const char *grp, const char *key, int *value)
+app_config_key_file_get_int(GKeyFile *kf, const char *grp, const char *key,
+			    int *value)
 {
-    char *str = g_key_file_get_value(kf, grp, key, NULL);
+	char *str = g_key_file_get_value(kf, grp, key, NULL);
 
-    log_debug("key: %s", key);
+	log_debug("key: %s", key);
 
-    if (G_LIKELY(str)) {
-	    *value = atoi(str);
-	    log_debug("  value = %d", *value);
-	    g_free(str);
-    }
+	if (G_LIKELY(str)) {
+		*value = atoi(str);
+		log_debug("  value = %d", *value);
+		g_free(str);
+	}
 
-    return str != NULL;
+	return str != NULL;
 }
 
 static void
@@ -104,12 +92,10 @@ app_config_load_from_key_file(GKeyFile *kf)
 	}
 	app_config_key_file_get_int(kf, "view", "int_memory",
 				    &cfg->view_int_memory);
-	app_config_key_file_get_int(kf, "view", "sfr_memory",
-				    &cfg->view_sfr_memory);
 	app_config_key_file_get_int(kf, "view", "ext_memory",
 				    &cfg->view_ext_memory);
-	app_config_key_file_get_int(kf, "view", "bits_per_row",
-				    &cfg->bits_per_row);
+	app_config_key_file_get_int(kf, "view", "bytes_per_row",
+				    &cfg->bytes_per_row);
 }
 
 static char *
@@ -174,10 +160,9 @@ app_config_save(void)
 
 	dir_path = app_config_get_dir_path();
 
-	if (g_mkdir_with_parents(dir_path, 0700) != -1)
-	{
+	if (g_mkdir_with_parents(dir_path, 0700) != -1) {
 		char *file_path;
-		GString* buf = g_string_sized_new(1024);
+		GString *buf = g_string_sized_new(1024);
 
 		g_string_append(buf, "\n[emulation]\n");
 
@@ -197,12 +182,10 @@ app_config_save(void)
 		g_string_append_printf(buf, "layout=%d\n", cfg->layout);
 		g_string_append_printf(buf, "int_memory=%d\n",
 				       cfg->view_int_memory);
-		g_string_append_printf(buf, "sfr_memory=%d\n",
-				       cfg->view_sfr_memory);
 		g_string_append_printf(buf, "ext_memory=%d\n",
 				       cfg->view_ext_memory);
-		g_string_append_printf(buf, "bits_per_row=%d\n",
-				       cfg->bits_per_row);
+		g_string_append_printf(buf, "bytes_per_row=%d\n",
+				       cfg->bytes_per_row);
 
 		file_path = app_config_get_file_path();