[evince] libview: Rename ev_view_set_focused_element and make it public internally



commit 617dc0ce5f6d4b630deaae6b563423c066771f7b
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Mon Jun 23 08:29:49 2014 -0400

    libview: Rename ev_view_set_focused_element and make it public internally
    
    This will be needed in order to implement atk_component_grab_focus
    
    https://bugzilla.gnome.org/show_bug.cgi?id=728475

 libview/ev-view-private.h |    4 ++++
 libview/ev-view.c         |   20 ++++++++++----------
 2 files changed, 14 insertions(+), 10 deletions(-)
---
diff --git a/libview/ev-view-private.h b/libview/ev-view-private.h
index 4f1721a..e2d5640 100644
--- a/libview/ev-view-private.h
+++ b/libview/ev-view-private.h
@@ -286,5 +286,9 @@ void _ev_view_set_selection   (EvView   *view,
                               GdkPoint *start_point,
                               GdkPoint *end_point);
 
+void _ev_view_set_focused_element (EvView *view,
+                                  EvMapping *element_mapping,
+                                  gint page);
+
 #endif  /* __EV_VIEW_PRIVATE_H__ */
 
diff --git a/libview/ev-view.c b/libview/ev-view.c
index 039e0bf..24f474b 100644
--- a/libview/ev-view.c
+++ b/libview/ev-view.c
@@ -2113,8 +2113,8 @@ ev_view_get_focused_area (EvView       *view,
        return TRUE;
 }
 
-static void
-ev_view_set_focused_element (EvView *view,
+void
+_ev_view_set_focused_element (EvView *view,
                             EvMapping *element_mapping,
                             gint page)
 {
@@ -2283,7 +2283,7 @@ ev_view_form_field_button_create_widget (EvView      *view,
        form_mapping = ev_page_cache_get_form_field_mapping (view->page_cache,
                                                             field->page->index);
        mapping = ev_mapping_list_find (form_mapping, field);
-       ev_view_set_focused_element (view, mapping, field->page->index);
+       _ev_view_set_focused_element (view, mapping, field->page->index);
 
        return NULL;
 }
@@ -2632,7 +2632,7 @@ ev_view_focus_form_field (EvView      *view,
        EvMappingList *form_field_mapping;
        EvMapping     *mapping;
 
-       ev_view_set_focused_element (view, NULL, -1);
+       _ev_view_set_focused_element (view, NULL, -1);
 
        if (field->is_read_only)
                return;
@@ -3177,7 +3177,7 @@ ev_view_focus_annotation (EvView    *view,
        if (!EV_IS_DOCUMENT_ANNOTATIONS (view->document))
                return;
 
-       ev_view_set_focused_element (view, annot_mapping,
+       _ev_view_set_focused_element (view, annot_mapping,
                                     ev_annotation_get_page_index (EV_ANNOTATION (annot_mapping->data)));
 }
 
@@ -4292,13 +4292,13 @@ ev_view_set_focused_element_at_location (EvView *view,
 
        mapping = get_annotation_mapping_at_location (view, x, y, &page);
        if (mapping) {
-               ev_view_set_focused_element (view, mapping, page);
+               _ev_view_set_focused_element (view, mapping, page);
                return;
        }
 
        mapping = get_link_mapping_at_location (view, x, y, &page);
        if (mapping) {
-               ev_view_set_focused_element (view, mapping, page);
+               _ev_view_set_focused_element (view, mapping, page);
                return;
        }
 
@@ -4308,7 +4308,7 @@ ev_view_set_focused_element_at_location (EvView *view,
                return;
        }
 
-        ev_view_set_focused_element (view, NULL, -1);
+        _ev_view_set_focused_element (view, NULL, -1);
 }
 
 static gboolean
@@ -4692,7 +4692,7 @@ ev_view_button_press_event (GtkWidget      *widget,
                                ev_view_remove_all (view);
                                ev_view_handle_form_field (view, field);
                        } else if ((link = get_link_mapping_at_location (view, event->x, event->y, &page))){
-                               ev_view_set_focused_element (view, link, page);
+                               _ev_view_set_focused_element (view, link, page);
                        } else if (!location_in_text (view, event->x + view->scroll_x, event->y + 
view->scroll_y) &&
                                   (image = ev_view_get_image_at_location (view, event->x, event->y))) {
                                if (view->image_dnd_info.image)
@@ -4704,7 +4704,7 @@ ev_view_button_press_event (GtkWidget      *widget,
                                view->image_dnd_info.start.y = event->y + view->scroll_y;
                        } else {
                                ev_view_remove_all (view);
-                               ev_view_set_focused_element (view, NULL, -1);
+                               _ev_view_set_focused_element (view, NULL, -1);
 
                                if (view->synctex_result) {
                                        g_free (view->synctex_result);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]