mirrors/zathura
1
0
Fork 0
mirror of https://git.pwmt.org/pwmt/zathura.git synced 2024-11-14 08:23:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix some bugs in the D-Bus and synctex code

Browse Source 
Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
This commit is contained in:
Sebastian Ramacher 2014-01-15 20:59:18 +01:00
parent 51267cdae0
commit 0e733af2a5
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dbus-interface.c
View File

@ -163,15 +163,13 @@ highlight_rects(zathura_t* zathura, unsigned int page,
NULL); NULL);
if (p == page) { if (p == page) {
g_object_set(widget, "search-current", 0, NULL); g_object_set(widget, "search-current", 0, NULL);
} else {
g_object_set(widget, "search-current", -1, NULL);
} }
} }
page_set(zathura, page);
document_draw_search_results(zathura, true); document_draw_search_results(zathura, true);
if (rectangles[0] == NULL || girara_list_size(rectangles[0]) == 0) { if (rectangles[0] == NULL || girara_list_size(rectangles[0]) == 0) {
page_set(zathura, page);
return; return;
} }
@ -308,6 +306,9 @@ handle_method_call(GDBusConnection* UNUSED(connection),
highlight_rects(priv->zathura, page - 1, rectangles); highlight_rects(priv->zathura, page - 1, rectangles);
g_free(rectangles); g_free(rectangles);
GVariant* result = g_variant_new("(b)", true);
g_dbus_method_invocation_return_value(invocation, result);
} }
} }
@ -354,8 +355,7 @@ zathura_dbus_goto_page_and_highlight(const char* filename, int page,
GDBusConnection* connection = g_bus_get_sync(G_BUS_TYPE_SESSION, GDBusConnection* connection = g_bus_get_sync(G_BUS_TYPE_SESSION,
NULL, &error); NULL, &error);
if (connection == NULL) { if (connection == NULL) {
girara_error("Could not create proxy for 'org.freedesktop.DBus': %s", girara_error("Could not connect to session bus: %s", error->message);
error->message);
g_error_free(error); g_error_free(error);
return false; return false;
} }
@ -420,8 +420,8 @@ zathura_dbus_goto_page_and_highlight(const char* filename, int page,
GVariantBuilder* second_builder = g_variant_builder_new(G_VARIANT_TYPE("a(idddd)")); GVariantBuilder* second_builder = g_variant_builder_new(G_VARIANT_TYPE("a(idddd)"));
if (secondary_rects != NULL) { if (secondary_rects != NULL) {
GIRARA_LIST_FOREACH(secondary_rects, synctex_page_rect_t*, iter, rect) GIRARA_LIST_FOREACH(secondary_rects, synctex_page_rect_t*, iter, rect)
g_variant_builder_add(builder, "(idddd)", rect->page, rect->rect.x1, g_variant_builder_add(second_builder, "(idddd)", rect->page,
rect->rect.x2, rect->rect.y1, rect->rect.y2); rect->rect.x1, rect->rect.x2, rect->rect.y1, rect->rect.y2);
GIRARA_LIST_FOREACH_END(secondary_rects, synctex_page_rect_t*, iter, rect); GIRARA_LIST_FOREACH_END(secondary_rects, synctex_page_rect_t*, iter, rect);
} }

2
synctex.c
View File

@ -96,7 +96,7 @@ girara_list_t*
synctex_rectangles_from_position(const char* filename, const char* position, synctex_rectangles_from_position(const char* filename, const char* position,
int* page, girara_list_t** secondary_rects) int* page, girara_list_t** secondary_rects)
{ {
if (filename == NULL || position == NULL || page) { if (filename == NULL || position == NULL || page == NULL) {
return NULL; return NULL;
} }