[nautilus/wip/gbsneto/code-cleanup] project: drop deprecated Atk calls



commit 032719edf58d268080cb4b9ec1705bf168783585
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Wed Jun 17 02:25:41 2015 -0300

    project: drop deprecated Atk calls

 libnautilus-private/nautilus-canvas-container.c |   13 -------------
 libnautilus-private/nautilus-canvas-item.c      |   10 +++-------
 2 files changed, 3 insertions(+), 20 deletions(-)
---
diff --git a/libnautilus-private/nautilus-canvas-container.c b/libnautilus-private/nautilus-canvas-container.c
index 1483032..137622e 100644
--- a/libnautilus-private/nautilus-canvas-container.c
+++ b/libnautilus-private/nautilus-canvas-container.c
@@ -783,13 +783,6 @@ clear_keyboard_focus (NautilusCanvasContainer *container)
        container->details->keyboard_focus = NULL;
 }
 
-static void inline
-emit_atk_focus_tracker_notify (NautilusCanvasIcon *icon)
-{
-       AtkObject *atk_object = atk_gobject_accessible_for_object (G_OBJECT (icon->item));
-       atk_focus_tracker_notify (atk_object);
-}
-
 /* Set @icon as the icon currently selected for keyboard operations. */
 static void
 set_keyboard_focus (NautilusCanvasContainer *container,
@@ -808,8 +801,6 @@ set_keyboard_focus (NautilusCanvasContainer *container,
        eel_canvas_item_set (EEL_CANVAS_ITEM (container->details->keyboard_focus->item),
                             "highlighted_as_keyboard_focus", 1,
                             NULL);
-
-       emit_atk_focus_tracker_notify (icon);
 }
 
 static void
@@ -2067,9 +2058,6 @@ select_range (NautilusCanvasContainer *container,
                
        }
        
-       if (selection_changed && icon2 != NULL) {
-               emit_atk_focus_tracker_notify (icon2);
-       }
        return selection_changed;
 }
 
@@ -2092,7 +2080,6 @@ select_one_unselect_others (NautilusCanvasContainer *container,
        }
        
        if (selection_changed && icon_to_select != NULL) {
-               emit_atk_focus_tracker_notify (icon_to_select);
                reveal_icon (container, icon_to_select);
        }
        return selection_changed;
diff --git a/libnautilus-private/nautilus-canvas-item.c b/libnautilus-private/nautilus-canvas-item.c
index fc4b167..50de400 100644
--- a/libnautilus-private/nautilus-canvas-item.c
+++ b/libnautilus-private/nautilus-canvas-item.c
@@ -336,12 +336,8 @@ nautilus_canvas_item_set_property (GObject        *object,
                        return;
                }
                details->is_highlighted_as_keyboard_focus = g_value_get_boolean (value);
-
-               if (details->is_highlighted_as_keyboard_focus) {
-                       atk_focus_tracker_notify (accessible);
-               }
                break;
-               
+
         case PROP_HIGHLIGHTED_FOR_DROP:
                if (!details->is_highlighted_for_drop == !g_value_get_boolean (value)) {
                        return;
@@ -2238,7 +2234,7 @@ nautilus_canvas_item_accessible_get_image_position
                        }
                }
        }
-       atk_component_get_position (ATK_COMPONENT (image), x, y, coord_type);
+       atk_component_get_extents (ATK_COMPONENT (image), x, y, NULL, NULL, coord_type);
        *x += x_offset;
        *y += y_offset;
 }
@@ -2393,7 +2389,7 @@ nautilus_canvas_item_accessible_get_character_extents (AtkText       *text,
        gboolean have_editable;
        gint text_offset, pix_height;
 
-       atk_component_get_position (ATK_COMPONENT (text), &pos_x, &pos_y, coords);
+       atk_component_get_extents (ATK_COMPONENT (text), &pos_x, &pos_y, NULL, NULL, coords);
        item = NAUTILUS_CANVAS_ITEM (atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (text)));
 
        if (item->details->pixbuf) {


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