viking

commit ce54303a7085492ed01211def72f9027b702b792
parent 272e675bb6162f50636ea5b92d1be32694b9803c
Author: Kyle Milz <kmilz@ucalgary.ca>
Date:   Tue, 25 Sep 2012 21:24:06 -0600

use efreet_* functions instead of our own hand rolled ones

also silence some printf's

Diffstat:
M
src/main.c
 | 
12
+++---------
M
src/utilities.c
 | 
4
++--

2 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/src/main.c b/src/main.c
@@ -666,7 +666,7 @@ uri_sanitize(const char *uri) {
 static void
 setup_config(App_Data *ad, int argc, char **argv)
 {
-	char *home, *basename;
+	char *basename;
 	char path[PATH_MAX];
 	Config *config;
 	Hist *hist;
@@ -740,16 +740,10 @@ setup_config(App_Data *ad, int argc, char **argv)
 
 	viking_state_init();
 
-	home = getenv("HOME");
-	if (!home || !home[0]) {
-		CRITICAL("Could not get $HOME");
-		home = "/";
-	}
-
-	dirlen = snprintf(path, sizeof(path), "%s/.config/viking", home);
+	dirlen = snprintf(path, sizeof(path), "%s/viking", efreet_config_home_get());
 
 	if (dirlen >= sizeof(path))
-		ERR("Path is too long: %s/.config/viking", home);
+		ERR("Path is too long: %s/viking", efreet_config_home_get());
 
 	if (!ecore_file_mkpath(path))
 		ERR("Could not create %s", path);
diff --git a/src/utilities.c b/src/utilities.c
@@ -200,7 +200,7 @@ make_keyslist(void)
         i++;
     }
 
-	printf("make_keylist() processed %i keys.\n", i);
+	// printf("make_keylist() processed %i keys.\n", i);
 	return keylistroot;
 }
 
@@ -1098,6 +1098,6 @@ setup_modkeys(void *data)
 		if (keys[i].key && !evas_object_key_grab(ad->win, keys[i].key, mask, 0, EINA_FALSE))
 			fprintf(stderr, "Could not grab trigger for mask = %s, key = %s\n", keys[i].mask , keys[i].key);
 	}
-	fprintf(stderr, "Modkey array looks like %s\n", ad->modkeys);
+	// fprintf(stderr, "Modkey array looks like %s\n", ad->modkeys);
 }