viking

commit e2f2c53afcdb670f09f7ab6fa0f5060500bc956f
parent 4c89dae80d33f6d9a22e8e3cd223c10f429a9eef
Author: Kyle Milz <kmilz@ucalgary.ca>
Date:   Wed,  3 Oct 2012 10:30:00 -0600

squash some warnings

Diffstat:
M
src/commands.c
 | 
35
++++++++++++++++-------------------
M
src/main.c
 | 
3
+--

2 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/src/commands.c b/src/commands.c
@@ -423,22 +423,19 @@ navigate(const Arg *arg, void *data)
 {
 	Window_Data *ad = data;
 
-	if (arg->i == NavigationBack)
-		ewk_view_back(ad->cur_buf->view);
-	else
-		ewk_view_forward(ad->cur_buf->view);
-
-	/*
 	if (arg->i & NavigationForwardBack) {
-		ewk_view_navigate(ad->cur_buf->view, (arg->i == NavigationBack ? -1 : 1) * (ad->count ? ad->count : 1));
-		//if (arg->i == NavigationBack)
-		//	ewk_view_reload(ad->cur_buf->view);
+		// ewk_view_navigate(ad->cur_buf->view, (arg->i == NavigationBack ? -1 : 1) * 
+		// (ad->count ? ad->count : 1));
+		if (arg->i == NavigationBack)
+			ewk_view_back(ad->cur_buf->view);
+		else
+			ewk_view_forward(ad->cur_buf->view);
 	}
 	else if (arg->i & NavigationReloadActions)
 		(arg->i == NavigationReload ? ewk_view_reload : ewk_view_reload_bypass_cache)(ad->cur_buf->view);
 	else
 		ewk_view_stop(ad->cur_buf->view);
-	*/
+
 	return EINA_TRUE;
 }
 
@@ -951,8 +948,8 @@ scroll(const Arg *arg, void *data)
 Eina_Bool
 zoom(const Arg *arg, void *data)
 {
-	Window_Data *wd = data;
-	App_Data *ad = wd->app;
+	// Window_Data *wd = data;
+	// App_Data *ad = wd->app;
 
 	/*
 	ewk_view_scale_set(wd->cur_buf->view, (arg->i & ZoomOut) ?
@@ -1300,7 +1297,7 @@ list(const Arg *arg, void *data)
 
 	Eina_List *l;
 	Buffer_Data *td;
-	Evas_Object *icon, *row, *label;
+	Evas_Object *row, *label;
 	// Evas *e = evas_object_evas_get(ad->win);
 
 	elm_box_clear(ad->event_box);
@@ -1344,7 +1341,8 @@ list(const Arg *arg, void *data)
 		evas_object_size_hint_align_set(label, 0.0, EVAS_HINT_FILL);
 		elm_box_pack_end(row, label);
 		evas_object_show(label);
-		url = strdup_printf("<font=Monospace font_size=12 backing=on backing_color=#FFF>%s", ewk_view_uri_get(td->view));
+		url = strdup_printf("<font=Monospace font_size=12 backing=on backing_color=#FFF>%s</font>",
+				ewk_view_uri_get(td->view));
 		elm_object_text_set(label, url);
 		free(url);
 
@@ -1353,13 +1351,12 @@ list(const Arg *arg, void *data)
 		evas_object_size_hint_align_set(label, 1.0, EVAS_HINT_FILL);
 		elm_box_pack_end(row, label);
 		evas_object_show(label);
-		/*
-		const Ewk_Text_With_Direction *txt = ewk_view_title_get(td->view);
-		count_str = strdup_printf("<backing=on backing_color=#FFF>%s", txt ? txt->string : "");
+
+		count_str = strdup_printf("<backing=on backing_color=#FFF>%s</font>",
+				ewk_view_title_get(td->view));
 		evas_object_text_font_set(label, "Monospace", 12);
 		elm_object_text_set(label, count_str);
 		free(count_str);
-		*/
 	}
 
 	evas_object_show(ad->event_box);
@@ -1485,7 +1482,7 @@ window(const Arg *arg, void *data)
 
 	if (arg->i & CreateWindow) {
 		a.i = DefaultBuf;
-		a.s = (arg->s ? arg->s : config_home_page_get(wd->app->config));
+		a.s = (char*)(arg->s ? arg->s : config_home_page_get(wd->app->config));
 		window_add(&a, wd->app);
 	}
 	else if (arg->i & DeleteWindow) {
diff --git a/src/main.c b/src/main.c
@@ -285,7 +285,7 @@ setup_config(App_Data *ad, int argc, char **argv)
 				EINA_FALSE /* frame_flattening */,
 				EINA_FALSE /* text_only_zoom */,
 				12 /* minimum_font_size */,
-				NULL,//ewk_cookies_policy_get(),
+				EWK_COOKIE_ACCEPT_POLICY_NO_THIRD_PARTY,//ewk_cookies_policy_get(),
 				backing_store_enum);
 		if (!config_save(config, path))
 			ERR("Could not save new configuration at %s", path);
@@ -466,7 +466,6 @@ elm_main(int argc, char *argv[])
 //	ad->log_domain = -1;
 
 	ewk_shutdown();
-	// ewk_shutdown();
 	viking_state_shutdown();
 
 	free(ad->modkeys);