viking

commit e5de6a5556b99da9d67c281e37a1dfa8f2786a69
parent 4d12a33a3a3283980564d3c27dc53251b732a49b
Author: Kyle Milz <kmilz@ucalgary.ca>
Date:   Mon,  8 Oct 2012 00:20:31 -0600

style cleanups and printf removal

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

1 file changed, 12 insertions(+), 43 deletions(-)
diff --git a/src/main.c b/src/main.c
@@ -25,9 +25,8 @@ EAPI_MAIN int elm_main(int argc, char *argv[]);
 char *uri_sanitize(const char *);
 
 static Eina_Bool
-_cb_session_save(void *data)
+session_save_cb(void *data)
 {
-	printf("session_saved()\n");
 	Window_Data *wd;
 	Buffer_Data *bd;
 	Eina_List *buffer_iter, *win_iter;
@@ -37,11 +36,9 @@ _cb_session_save(void *data)
 
 	if (!config_restore_state_get(ad->config)) goto end;
 
-	EINA_LIST_FOREACH(ad->windows, win_iter, wd)
-	{
-		EINA_LIST_FOREACH(wd->buffer_list, buffer_iter, bd)
-		{
-			printf("iterating over buffer ..\n");
+	EINA_LIST_FOREACH(ad->windows, win_iter, wd) {
+
+		EINA_LIST_FOREACH(wd->buffer_list, buffer_iter, bd) {
 			Evas_Object *view = bd->view;
 
 			const Eina_Bool focused = bd == wd->cur_buf;
@@ -56,25 +53,21 @@ _cb_session_save(void *data)
 
 			url = session_item_url_get(si);
 			wk_url = ewk_view_uri_get(view);
-			if ((url && wk_url && strcmp(url, wk_url)) || (wk_url && !url))
-			{
+			if ((url && wk_url && strcmp(url, wk_url)) || (wk_url && !url)) {
 				session_item_url_set(si, wk_url);
 				changed = EINA_TRUE;
 			}
 
 			/*
 			ewk_frame_scroll_pos_get(frame, &sx, &sy);
-			if (session_item_scroll_x_get(si) != sx ||
-					session_item_scroll_y_get(si) != sy)
-			{
+			if (session_item_scroll_x_get(si) != sx || session_item_scroll_y_get(si) != sy) {
 				session_item_scroll_x_set(si, sx);
 				session_item_scroll_y_set(si, sy);
 				changed = EINA_TRUE;
 			}
 			*/
 
-			if (session_item_focused_get(si) != focused)
-			{
+			if (session_item_focused_get(si) != focused) {
 				session_item_focused_set(si, focused);
 				changed = EINA_TRUE;
 			}
@@ -106,8 +99,9 @@ static const Ecore_Getopt options = {
 	}
 };
 
-char *
-uri_sanitize(const char *uri) {
+char*
+uri_sanitize(const char *uri)
+{
    char *fixed_uri;
    char *schema;
    char *tmp;
@@ -151,8 +145,6 @@ session_restore(App_Data *ad)
 	Session_Window *window;
 	int n_tabs = 0;
 
-	printf("restoring session with %i windows..\n", eina_list_count(windows));
-
 	EINA_LIST_FOREACH(windows, window_iter, window) {
 
 		Eina_List *items = session_window_tabs_list_get(window);
@@ -161,23 +153,10 @@ session_restore(App_Data *ad)
 		Session_Item *item;
 		Buffer_Data *bd, *focused_buffer;
 
-		printf("\trestoring window with %i buffers ..\n", eina_list_count(items));
-
-		// if (!items) continue;
-		// item = eina_list_data_get(items);
-
 		wd = window_add(ad, window);
-		// focused_buffer = buffer_add(0, wd, session_item_url_get(item), item);
-		// printf("\t\tbuffer restored, url = %s\n", session_item_url_get(item));
-		// if (!wd) continue;
-
-		// focused_buffer = win->current_chrome;
-		// session_restore_delayed_scroll(win->current_view, item);
-		//n_tabs++;
 
 		EINA_LIST_FOREACH(items, items_iter, item) {
 
-			printf("\t\tbuffer restored, url = %s\n", session_item_url_get(item));
 			bd = buffer_add(0, wd, session_item_url_get(item), item);
 
 			// session_restore_delayed_scroll(win->current_view, item);
@@ -187,7 +166,6 @@ session_restore(App_Data *ad)
 			n_tabs++;
 		}
 
-		// tab_focus_chrome(win, focused_chrome);
 		buffer_current_set(focused_buffer);
 	}
 
@@ -239,18 +217,9 @@ _client_del(void *data, int type, Ecore_Con_Event_Server_Del *ev)
 static Eina_Bool
 _server_data(void *data, int type, Ecore_Con_Event_Client_Data *ev)
 {
-	Arg arg;
 	char *uri = ev->data;
 	App_Data *ad = data;
 
-	arg.i = SwitchToBuffer;
-	if (!strncmp(uri, "NULL", 4))
-		arg.i |= DefaultUrl;
-	else {
-		arg.i |= CustomUrl;
-		arg.s = uri;
-	}
-	/* second arg can be NULL because InNewWindow flag set */
 	Window_Data *wd = window_add(ad, NULL);
 	buffer_add(SwitchToBuffer, wd, uri, NULL);
 
@@ -376,7 +345,7 @@ elm_main(int argc, char *argv[])
 			ERR("Could not save new session file at %s", path);
 	}
 
-	session_save_timer = ecore_timer_loop_add(10, _cb_session_save, ad);
+	session_save_timer = ecore_timer_loop_add(30, session_save_cb, ad);
 	if (!session_save_timer)
 		ERR("Could not register session save timer");
 
@@ -418,7 +387,7 @@ elm_main(int argc, char *argv[])
 
 	elm_run();
 
-	_cb_session_save(ad);
+	session_save_cb(ad);
 
 	config_save(ad->config, NULL);
 	config_free(ad->config);