callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

a11y: Remove idle handler for switch action handling

Browse Source
This commit is contained in:
Benjamin Otte
2011-07-05 14:39:12 +02:00
parent 8efc350127
commit 659d24c9ab
2 changed files with 3 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
gtk/a11y/gtkswitchaccessible.c
View File

@ -55,17 +55,6 @@ gtk_switch_accessible_ref_state_set (AtkObject *accessible)
return state_set; return state_set;
} }
static void
gtk_switch_accessible_finalize (GObject *obj)
{
GtkSwitchAccessible *accessible = (GtkSwitchAccessible *)obj;
if (accessible->action_idle)
g_source_remove (accessible->action_idle);
G_OBJECT_CLASS (gtk_switch_accessible_parent_class)->finalize (obj);
}
static void static void
gtk_switch_accessible_initialize (AtkObject *accessible, gtk_switch_accessible_initialize (AtkObject *accessible,
gpointer widget) gpointer widget)
@ -80,11 +69,8 @@ gtk_switch_accessible_initialize (AtkObject *accessible,
static void static void
gtk_switch_accessible_class_init (GtkSwitchAccessibleClass *klass) gtk_switch_accessible_class_init (GtkSwitchAccessibleClass *klass)
{ {
GObjectClass *object_class = G_OBJECT_CLASS (klass);
AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass); AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
object_class->finalize = gtk_switch_accessible_finalize;
atk_class->initialize = gtk_switch_accessible_initialize; atk_class->initialize = gtk_switch_accessible_initialize;
atk_class->ref_state_set = gtk_switch_accessible_ref_state_set; atk_class->ref_state_set = gtk_switch_accessible_ref_state_set;
} }
@ -92,7 +78,6 @@ gtk_switch_accessible_class_init (GtkSwitchAccessibleClass *klass)
static void static void
gtk_switch_accessible_init (GtkSwitchAccessible *self) gtk_switch_accessible_init (GtkSwitchAccessible *self)
{ {
self->action_idle = 0;
} }
static gint static gint
@ -111,32 +96,11 @@ gtk_switch_action_get_name (AtkAction *action,
return "toggle"; return "toggle";
} }
static gboolean
idle_do_action (gpointer data)
{
GtkSwitchAccessible *accessible = data;
GtkWidget *widget;
GtkSwitch *sw;
widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (data));
sw = GTK_SWITCH (widget);
accessible->action_idle = 0;
if (widget == NULL ||
!gtk_widget_is_sensitive (widget) || !gtk_widget_get_visible (widget))
return FALSE;
gtk_switch_set_active (sw, !gtk_switch_get_active (sw));
return FALSE;
}
static gboolean static gboolean
gtk_switch_action_do_action (AtkAction *action, gtk_switch_action_do_action (AtkAction *action,
gint i) gint i)
{ {
GtkSwitchAccessible *accessible; GtkSwitch *sw;
GtkWidget *widget; GtkWidget *widget;
widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (action)); widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (action));
@ -149,10 +113,8 @@ gtk_switch_action_do_action (AtkAction *action,
if (!gtk_widget_is_sensitive (widget) || !gtk_widget_get_visible (widget)) if (!gtk_widget_is_sensitive (widget) || !gtk_widget_get_visible (widget))
return FALSE; return FALSE;
accessible = (GtkSwitchAccessible *)action; sw = GTK_SWITCH (widget);
gtk_switch_set_active (sw, !gtk_switch_get_active (sw));
if (!accessible->action_idle)
accessible->action_idle = gdk_threads_add_idle (idle_do_action, accessible);
return TRUE; return TRUE;
} }

2
gtk/a11y/gtkswitchaccessible.h
View File

@ -37,8 +37,6 @@ typedef struct _GtkSwitchAccessibleClass GtkSwitchAccessibleClass;
struct _GtkSwitchAccessible struct _GtkSwitchAccessible
{ {
GtkWidgetAccessible parent; GtkWidgetAccessible parent;
guint action_idle;
}; };
struct _GtkSwitchAccessibleClass struct _GtkSwitchAccessibleClass