commit e47e6a355790cefbcb1a310b3c6b17ae7177a101
parent 3e791e929bb977bdb3bd6cd58c1f2f84ee5e40ed
Author: Kyle Milz <kmilz@ucalgary.ca>
Date: Tue, 16 Oct 2012 18:44:34 -0600
buffer_current_set -> window_main_buffer_set
Diffstat:
6 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/buffer.c b/src/buffer.c
@@ -486,7 +486,7 @@ webview_free_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
wd->buffer_list = eina_list_remove(wd->buffer_list, bd);
if (eina_list_count(wd->buffer_list)) {
- buffer_current_set(eina_list_nth(wd->buffer_list, 0));
+ window_main_buffer_set(eina_list_nth(wd->buffer_list, 0));
}
free(bd);
@@ -698,7 +698,7 @@ buffer_add(const unsigned char flags, Window_Data *wd, const char *url, Session_
ewk_view_url_set(bd->view, config_home_page_get(wd->app->config));
if (flags & SwitchToBuffer)
- buffer_current_set(bd);
+ window_main_buffer_set(bd);
if (!session_item) {
if (!(session_item = session_item_new(ewk_view_url_get(bd->view), EINA_FALSE, 0, 0)))
diff --git a/src/commands.c b/src/commands.c
@@ -7,6 +7,7 @@
#include "viking.h"
#include "commands.h"
#include "utilities.h"
+#include "window.h"
#include "buffer.h"
// static unsigned int scrollstep = 40; /* cursor difference in pixel */
@@ -1049,12 +1050,12 @@ switch_buffer(const Arg *arg, void *data)
EINA_LIST_FOREACH(ad->buffer_list, l, td) {
/*
if (arg_count == td->buf_number) {
- buffer_current_set(td);
+ window_main_buffer_set(td);
return EINA_TRUE;
}
*/
if (ad->count == td->buf_number) {
- buffer_current_set(td);
+ window_main_buffer_set(td);
return EINA_TRUE;
}
}
diff --git a/src/main.c b/src/main.c
@@ -156,7 +156,7 @@ session_restore(App_Data *ad)
focused_buffer = bd;
n_tabs++;
}
- buffer_current_set(focused_buffer);
+ window_main_buffer_set(focused_buffer);
}
return !!n_tabs;
diff --git a/src/utilities.h b/src/utilities.h
@@ -30,7 +30,6 @@ void setup_modkeys(void *data);
Eina_Bool echo(const Arg *arg, void *);
void update_state(Window_Data*);
void update_url(const char*, Window_Data*);
-void buffer_current_set(Buffer_Data *td);
Eina_Bool enable_proxy(Buffer_Data *bd);
char *find_uri_for_searchengine(const char *handle);
diff --git a/src/window.c b/src/window.c
@@ -321,9 +321,8 @@ _win_del_request_cb(void *data, Evas_Object *obj, void *event_info)
free(wd);
}
-
void
-buffer_current_set(Buffer_Data *new_buf)
+window_main_buffer_set(Buffer_Data *new_buf)
{
Window_Data *wd = new_buf->window;
Buffer_Data *old_buf = wd->cur_buf;
diff --git a/src/window.h b/src/window.h
@@ -1,5 +1,7 @@
-Window_Data* window_add(App_Data *, Session_Window*);
+Window_Data* window_add(App_Data*, Session_Window*);
+void window_main_buffer_set(Buffer_Data*);
+
#define IS_ESCAPE(ev) ((!strcmp(ev->keyname, "Escape")) || \
(!strcmp(ev->keyname, "[") && evas_key_modifier_is_set(ev->modifiers, "Control")))