viking

commit ead982fcbf4a9f0f62c94dc50cd8b61e3d7ac73b
parent 28e751af49d53fb11cef5e2407cd13f04490f4e5
Author: Kyle Milz <kmilz@ucalgary.ca>
Date:   Sat,  6 Oct 2012 19:25:55 -0600

minor style fixes

Diffstat:
M
src/main.c
 | 
14
++++----------

1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/src/main.c b/src/main.c
@@ -309,9 +309,7 @@ elm_main(int argc, char *argv[])
 			EWK_COOKIE_ACCEPT_POLICY_NO_THIRD_PARTY);
 
 	eina_strlcpy(basename, "config.eet", sizeof(path) - dirlen);
-	config = config_load(path);
-	if (!config) {
-
+	if (!(config = config_load(path))) {
 		config = config_new(EINA_TRUE /* allow_popup */,
 				EINA_TRUE /* enable_auto_load_images */,
 				EINA_TRUE /* enable_auto_shrink_images */,
@@ -330,15 +328,13 @@ elm_main(int argc, char *argv[])
 			ERR("Could not save new configuration at %s", path);
 	}
 
-	hist = hist_load(path);
-	if (!hist) {
+	if (!(hist = hist_load(path))) {
 		hist = hist_new();
 		if (!hist_save(hist, path))
 			ERR("Could not save new history file at %s", path);
 	}
 
-	session = session_load(path);
-	if (!session) {
+	if (!(session = session_load(path))) {
 		session = session_new(NULL);
 		if (!session_save(session, path))
 			ERR("Could not save new session file at %s", path);
@@ -363,7 +359,6 @@ elm_main(int argc, char *argv[])
 	ad->keylistroot = make_keyslist();
 	ad->zoomstep = 0.1f;
 
-
 	if (!(svr = ecore_con_server_add(ECORE_CON_LOCAL_USER, "viking", 0, NULL))) {
 		printf("could not create server -- this is bad!\n");
 		exit(1);
@@ -376,7 +371,6 @@ elm_main(int argc, char *argv[])
 	ecore_con_server_timeout_set(svr, 10);
 	// ecore_con_server_client_limit_set(svr, 3, 0);
 
-
 	/* try to restore session */
 	if (session_windows_count(session) > 0 && session_restore()) {
 		printf("session restored successfully.\n");
@@ -389,7 +383,6 @@ elm_main(int argc, char *argv[])
 
 	elm_run();
 
-
 	// printf("viking was up for %0.3f seconds\n", ecore_con_server_uptime_get(svr));
 	ecore_con_shutdown();
 
@@ -405,6 +398,7 @@ elm_main(int argc, char *argv[])
 	Eina_List *w;
 	void *data;
 	Window_Data *wd;
+	/* free window specific data */
 	EINA_LIST_FOREACH(ad->windows, w, data) {
 		wd = data;
 		eina_list_free(wd->buffer_list);