From 84736dc89bcd707a9073c708af85ddd17997a147 Mon Sep 17 00:00:00 2001 From: Abdo Roig-Maranges Date: Sun, 20 Oct 2013 23:51:13 +0200 Subject: [PATCH] remove zathura->global.update_page_number global hack The callbacks are no longer aware of it anyways --- marks.c | 1 - shortcuts.c | 1 - zathura.c | 5 ----- zathura.h | 1 - 4 files changed, 8 deletions(-) diff --git a/marks.c b/marks.c index 614bb41..4cd294c 100644 --- a/marks.c +++ b/marks.c @@ -244,7 +244,6 @@ mark_evaluate(zathura_t* zathura, int key) position_set(zathura, mark->position_x, mark->position_y); zathura_jumplist_add(zathura); - zathura->global.update_page_number = true; return; } GIRARA_LIST_FOREACH_END(zathura->global.marks, zathura_mark_t*, iter, mark); diff --git a/shortcuts.c b/shortcuts.c index e7182d6..f50325e 100644 --- a/shortcuts.c +++ b/shortcuts.c @@ -305,7 +305,6 @@ sc_mouse_scroll(girara_session_t* session, girara_argument_t* argument, girara_e gtk_adjustment_get_value(x_adj) - (event->x - x)); zathura_adjustment_set_value(y_adj, gtk_adjustment_get_value(y_adj) - (event->y - y)); - zathura->global.update_page_number = true; break; /* unhandled events */ diff --git a/zathura.c b/zathura.c index c4e6aa3..b95ab75 100644 --- a/zathura.c +++ b/zathura.c @@ -55,7 +55,6 @@ zathura_create(void) zathura_t* zathura = g_malloc0(sizeof(zathura_t)); /* global settings */ - zathura->global.update_page_number = true; zathura->global.search_direction = FORWARD; /* plugins */ @@ -1115,10 +1114,6 @@ position_set(zathura_t* zathura, double position_x, double position_y) zathura_document_set_position_x(zathura->document, position_x); zathura_document_set_position_y(zathura->document, position_y); - /* prevent cb_view_adjustment_value_changed from updating document page number and - position from the adjustments. */ - zathura->global.update_page_number = false; - /* trigger a 'change' event for both adjustments */ refresh_view(zathura); diff --git a/zathura.h b/zathura.h index 113585e..4b198ed 100644 --- a/zathura.h +++ b/zathura.h @@ -101,7 +101,6 @@ struct zathura_s struct { - bool update_page_number; /**< Update current page number */ int search_direction; /**< Current search direction (FORWARD or BACKWARD) */ girara_list_t* marks; /**< Marker */ char** arguments; /**> Arguments that were passed at startup */