commit 92be3afe97862ec5e2da281b46b50f1fa2a24422
parent 5b05c8b9f59645f894040e9bb39cabaeb0d7107b
Author: Kyle Milz <kmilz@ucalgary.ca>
Date: Sat, 13 Oct 2012 22:31:38 -0600
clean up session_restore function
Diffstat:
1 file changed, 10 insertions(+), 16 deletions(-)
diff --git a/src/main.c b/src/main.c
@@ -136,32 +136,26 @@ uri_sanitize(const char *uri)
static Eina_Bool
session_restore(App_Data *ad)
{
- Eina_List *windows = session_windows_list_get(ad->session);
- Eina_List *window_iter;
+ Eina_List *windows, *window_iter;
+ Eina_List *buffers, *buffers_iter;
Session_Window *window;
+ Session_Item *buffer;
+ Window_Data *wd;
+ Buffer_Data *bd, *focused_buffer;
int n_tabs = 0;
+ windows = session_windows_list_get(ad->session);
EINA_LIST_FOREACH(windows, window_iter, window) {
- Eina_List *items = session_window_tabs_list_get(window);
- Eina_List *items_iter;
- Window_Data *wd;
- Session_Item *item;
- Buffer_Data *bd, *focused_buffer;
-
+ buffers = session_window_tabs_list_get(window);
wd = window_add(ad, window);
-
- EINA_LIST_FOREACH(items, items_iter, item) {
-
- bd = buffer_add(0, wd, session_item_url_get(item), item);
-
+ EINA_LIST_FOREACH(buffers, buffers_iter, buffer) {
+ bd = buffer_add(0, wd, session_item_url_get(buffer), buffer);
// session_restore_delayed_scroll(win->current_view, item);
- if (session_item_focused_get(item))
+ if (session_item_focused_get(buffer))
focused_buffer = bd;
-
n_tabs++;
}
-
buffer_current_set(focused_buffer);
}