Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gail: Add support for action_set_description

Browse Source 
As set_description is never called and unsupported by the at-spi, we can
omit implementing it.
This means we can also omit get_description calls in various places, as
they'd just return the default value: NULL.
This commit is contained in:
Benjamin Otte
2011-06-22 03:47:25 +02:00
committed by Matthias Clasen
parent 26a2cfe62a
commit 521f9e2f15
14 changed files with 0 additions and 400 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
gtk/a11y/gailbutton.c
View File

@@ -59,15 +59,10 @@ static gboolean gail_button_do_action (AtkAction *action,
gint i);
static gboolean idle_do_action (gpointer data);
static gint gail_button_get_n_actions (AtkAction *action);
static const gchar* gail_button_get_description(AtkAction *action,
gint i);
static const gchar* gail_button_get_keybinding (AtkAction *action,
gint i);
static const gchar* gail_button_action_get_name(AtkAction *action,
gint i);
static gboolean gail_button_set_description(AtkAction *action,
gint i,
const gchar *desc);
static void gail_button_notify_label_weak_ref (gpointer data,
GObject *obj);
static void gail_button_notify_weak_ref (gpointer data,
@@ -173,9 +168,6 @@ gail_button_class_init (GailButtonClass *klass)
static void
gail_button_init (GailButton *button)
{
button->click_description = NULL;
button->press_description = NULL;
button->release_description = NULL;
button->click_keybinding = NULL;
button->action_queue = NULL;
button->action_idle_handler = 0;
@@ -409,10 +401,8 @@ atk_action_interface_init (AtkActionIface *iface)
{
iface->do_action = gail_button_do_action;
iface->get_n_actions = gail_button_get_n_actions;
iface->get_description = gail_button_get_description;
iface->get_keybinding = gail_button_get_keybinding;
iface->get_name = gail_button_action_get_name;
iface->set_description = gail_button_set_description;
}
static gboolean
@@ -560,33 +550,6 @@ gail_button_get_n_actions (AtkAction *action)
return 3;
}
static const gchar*
gail_button_get_description (AtkAction *action,
gint i)
{
GailButton *button;
const gchar *return_value;
button = GAIL_BUTTON (action);
switch (i)
{
case 0:
return_value = button->click_description;
break;
case 1:
return_value = button->press_description;
break;
case 2:
return_value = button->release_description;
break;
default:
return_value = NULL;
break;
}
return return_value;
}
static const gchar*
gail_button_get_keybinding (AtkAction *action,
gint i)
@@ -700,41 +663,6 @@ gail_button_action_get_name (AtkAction *action,
return return_value;
}
static gboolean
gail_button_set_description (AtkAction *action,
gint i,
const gchar *desc)
{
GailButton *button;
gchar **value;
button = GAIL_BUTTON (action);
switch (i)
{
case 0:
value = &button->click_description;
break;
case 1:
value = &button->press_description;
break;
case 2:
value = &button->release_description;
break;
default:
value = NULL;
break;
}
if (value)
{
g_free (*value);
*value = g_strdup (desc);
return TRUE;
}
else
return FALSE;
}
static gint
gail_button_get_n_children (AtkObject* obj)
{
@@ -1379,9 +1307,6 @@ gail_button_finalize (GObject *object)
{
GailButton *button = GAIL_BUTTON (object);
g_free (button->click_description);
g_free (button->press_description);
g_free (button->release_description);
g_free (button->click_keybinding);
if (button->action_idle_handler)
{

3
gtk/a11y/gailbutton.h
View File

@@ -44,9 +44,6 @@ struct _GailButton
*/
gint8 state;
gchar *click_description;
gchar *press_description;
gchar *release_description;
gchar *click_keybinding;
guint action_idle_handler;
GQueue *action_queue;

20
gtk/a11y/gailcell.c
View File

@@ -54,10 +54,6 @@ static const gchar *
gail_cell_action_get_description
(AtkAction *action,
gint index);
static gboolean gail_cell_action_set_description
(AtkAction *action,
gint index,
const gchar *desc);
static const gchar *
gail_cell_action_get_keybinding
(AtkAction *action,
@@ -292,7 +288,6 @@ atk_action_interface_init (AtkActionIface *iface)
iface->do_action = gail_cell_action_do_action;
iface->get_name = gail_cell_action_get_name;
iface->get_description = gail_cell_action_get_description;
iface->set_description = gail_cell_action_set_description;
iface->get_keybinding = gail_cell_action_get_keybinding;
}
@@ -426,21 +421,6 @@ gail_cell_action_get_description (AtkAction *action,
return info->description;
}
static gboolean
gail_cell_action_set_description (AtkAction *action,
gint index,
const gchar *desc)
{
GailCell *cell = GAIL_CELL(action);
ActionInfo *info = _gail_cell_get_action_info (cell, index);
if (info == NULL)
return FALSE;
g_free (info->description);
info->description = g_strdup (desc);
return TRUE;
}
static const gchar *
gail_cell_action_get_keybinding (AtkAction *action,
gint index)

42
gtk/a11y/gailcombobox.c
View File

@@ -41,15 +41,10 @@ static gboolean gail_combo_box_do_action (AtkAction *acti
gint i);
static gboolean idle_do_action (gpointer data);
static gint gail_combo_box_get_n_actions (AtkAction *action);
static const gchar* gail_combo_box_get_description(AtkAction *action,
gint i);
static const gchar* gail_combo_box_get_keybinding (AtkAction *action,
gint i);
static const gchar* gail_combo_box_action_get_name(AtkAction *action,
gint i);
static gboolean gail_combo_box_set_description(AtkAction *action,
gint i,
const gchar *desc);
static void atk_selection_interface_init (AtkSelectionIface *iface);
static gboolean gail_combo_box_add_selection (AtkSelection *selection,
gint i);
@@ -83,7 +78,6 @@ gail_combo_box_class_init (GailComboBoxClass *klass)
static void
gail_combo_box_init (GailComboBox *combo_box)
{
combo_box->press_description = NULL;
combo_box->press_keybinding = NULL;
combo_box->old_selection = -1;
combo_box->name = NULL;
@@ -265,10 +259,8 @@ atk_action_interface_init (AtkActionIface *iface)
{
iface->do_action = gail_combo_box_do_action;
iface->get_n_actions = gail_combo_box_get_n_actions;
iface->get_description = gail_combo_box_get_description;
iface->get_keybinding = gail_combo_box_get_keybinding;
iface->get_name = gail_combo_box_action_get_name;
iface->set_description = gail_combo_box_set_description;
}
static gboolean
@@ -340,21 +332,6 @@ gail_combo_box_get_n_actions (AtkAction *action)
return 1;
}
static const gchar*
gail_combo_box_get_description (AtkAction *action,
gint i)
{
if (i == 0)
{
GailComboBox *combo_box;
combo_box = GAIL_COMBO_BOX (action);
return combo_box->press_description;
}
else
return NULL;
}
static const gchar*
gail_combo_box_get_keybinding (AtkAction *action,
gint i)
@@ -416,24 +393,6 @@ gail_combo_box_action_get_name (AtkAction *action,
return NULL;
}
static gboolean
gail_combo_box_set_description (AtkAction *action,
gint i,
const gchar *desc)
{
if (i == 0)
{
GailComboBox *combo_box;
combo_box = GAIL_COMBO_BOX (action);
g_free (combo_box->press_description);
combo_box->press_description = g_strdup (desc);
return TRUE;
}
else
return FALSE;
}
static void
atk_selection_interface_init (AtkSelectionIface *iface)
{
@@ -577,7 +536,6 @@ gail_combo_box_finalize (GObject *object)
{
GailComboBox *combo_box = GAIL_COMBO_BOX (object);
g_free (combo_box->press_description);
g_free (combo_box->press_keybinding);
g_free (combo_box->name);
if (combo_box->action_idle_handler)

1
gtk/a11y/gailcombobox.h
View File

@@ -39,7 +39,6 @@ struct _GailComboBox
GailContainer parent;
gchar *press_keybinding;
gchar *press_description;
guint action_idle_handler;
gchar *name;

58
gtk/a11y/gailentry.c
View File

@@ -151,15 +151,10 @@ static gboolean gail_entry_do_action (AtkAction
gint i);
static gboolean idle_do_action (gpointer data);
static gint gail_entry_get_n_actions (AtkAction *action);
static const gchar* gail_entry_action_get_description (AtkAction *action,
gint i);
static const gchar* gail_entry_get_keybinding (AtkAction *action,
gint i);
static const gchar* gail_entry_action_get_name (AtkAction *action,
gint i);
static gboolean gail_entry_action_set_description (AtkAction *action,
gint i,
const gchar *desc);
typedef struct _GailEntryPaste GailEntryPaste;
@@ -201,7 +196,6 @@ gail_entry_init (GailEntry *entry)
entry->signal_name_delete = NULL;
entry->cursor_position = 0;
entry->selection_bound = 0;
entry->activate_description = NULL;
entry->activate_keybinding = NULL;
}
@@ -350,7 +344,6 @@ gail_entry_finalize (GObject *object)
GailEntry *entry = GAIL_ENTRY (object);
g_object_unref (entry->textutil);
g_free (entry->activate_description);
g_free (entry->activate_keybinding);
if (entry->action_idle_handler)
{
@@ -1245,10 +1238,8 @@ atk_action_interface_init (AtkActionIface *iface)
{
iface->do_action = gail_entry_do_action;
iface->get_n_actions = gail_entry_get_n_actions;
iface->get_description = gail_entry_action_get_description;
iface->get_keybinding = gail_entry_get_keybinding;
iface->get_name = gail_entry_action_get_name;
iface->set_description = gail_entry_action_set_description;
}
static gboolean
@@ -1309,26 +1300,6 @@ gail_entry_get_n_actions (AtkAction *action)
return 1;
}
static const gchar*
gail_entry_action_get_description (AtkAction *action,
gint i)
{
GailEntry *entry;
const gchar *return_value;
entry = GAIL_ENTRY (action);
switch (i)
{
case 0:
return_value = entry->activate_description;
break;
default:
return_value = NULL;
break;
}
return return_value;
}
static const gchar*
gail_entry_get_keybinding (AtkAction *action,
gint i)
@@ -1410,32 +1381,3 @@ gail_entry_action_get_name (AtkAction *action,
}
return return_value;
}
static gboolean
gail_entry_action_set_description (AtkAction *action,
gint i,
const gchar *desc)
{
GailEntry *entry;
gchar **value;
entry = GAIL_ENTRY (action);
switch (i)
{
case 0:
value = &entry->activate_description;
break;
default:
value = NULL;
break;
}
if (value)
{
g_free (*value);
*value = g_strdup (desc);
return TRUE;
}
else
return FALSE;
}

1
gtk/a11y/gailentry.h
View File

@@ -52,7 +52,6 @@ struct _GailEntry
gint cursor_position;
gint selection_bound;
gchar *activate_description;
gchar *activate_keybinding;
guint action_idle_handler;
guint insert_idle_handler;

61
gtk/a11y/gailexpander.c
View File

@@ -52,19 +52,12 @@ static gboolean gail_expander_do_action (AtkAction *action,
gint i);
static gboolean idle_do_action (gpointer data);
static gint gail_expander_get_n_actions(AtkAction *action);
static const gchar* gail_expander_get_description
(AtkAction *action,
gint i);
static const gchar* gail_expander_get_keybinding
(AtkAction *action,
gint i);
static const gchar* gail_expander_action_get_name
(AtkAction *action,
gint i);
static gboolean gail_expander_set_description
(AtkAction *action,
gint i,
const gchar *desc);
/* atktext.h */
static void atk_text_interface_init (AtkTextIface *iface);
@@ -139,7 +132,6 @@ gail_expander_class_init (GailExpanderClass *klass)
static void
gail_expander_init (GailExpander *expander)
{
expander->activate_description = NULL;
expander->activate_keybinding = NULL;
expander->action_idle_handler = 0;
expander->textutil = NULL;
@@ -352,10 +344,8 @@ atk_action_interface_init (AtkActionIface *iface)
{
iface->do_action = gail_expander_do_action;
iface->get_n_actions = gail_expander_get_n_actions;
iface->get_description = gail_expander_get_description;
iface->get_keybinding = gail_expander_get_keybinding;
iface->get_name = gail_expander_action_get_name;
iface->set_description = gail_expander_set_description;
}
static gboolean
@@ -417,27 +407,6 @@ gail_expander_get_n_actions (AtkAction *action)
return 1;
}
static const gchar*
gail_expander_get_description (AtkAction *action,
gint i)
{
GailExpander *expander;
const gchar *return_value;
expander = GAIL_EXPANDER (action);
switch (i)
{
case 0:
return_value = expander->activate_description;
break;
default:
return_value = NULL;
break;
}
return return_value;
}
static const gchar*
gail_expander_get_keybinding (AtkAction *action,
gint i)
@@ -502,35 +471,6 @@ gail_expander_action_get_name (AtkAction *action,
return return_value;
}
static gboolean
gail_expander_set_description (AtkAction *action,
gint i,
const gchar *desc)
{
GailExpander *expander;
gchar **value;
expander = GAIL_EXPANDER (action);
switch (i)
{
case 0:
value = &expander->activate_description;
break;
default:
value = NULL;
break;
}
if (value)
{
g_free (*value);
*value = g_strdup (desc);
return TRUE;
}
else
return FALSE;
}
static AtkStateSet*
gail_expander_ref_state_set (AtkObject *obj)
{
@@ -876,7 +816,6 @@ gail_expander_finalize (GObject *object)
{
GailExpander *expander = GAIL_EXPANDER (object);
g_free (expander->activate_description);
g_free (expander->activate_keybinding);
if (expander->action_idle_handler)
{

1
gtk/a11y/gailexpander.h
View File

@@ -39,7 +39,6 @@ struct _GailExpander
{
GailContainer parent;
gchar *activate_description;
gchar *activate_keybinding;
guint action_idle_handler;

44
gtk/a11y/gaillinkbutton.c
View File

@@ -30,7 +30,6 @@ struct _GailLinkButtonLink
AtkHyperlink parent;
GailLinkButton *button;
gchar *description;
};
struct _GailLinkButtonLinkClass
@@ -106,27 +105,13 @@ gail_link_button_link_get_end_index (AtkHyperlink *link)
static void
gail_link_button_link_init (GailLinkButtonLink *link)
{
link->description = NULL;
}
static void
gail_link_button_link_finalize (GObject *obj)
{
GailLinkButtonLink *link = (GailLinkButtonLink *)obj;
g_free (link->description);
G_OBJECT_CLASS (gail_link_button_link_parent_class)->finalize (obj);
}
static void
gail_link_button_link_class_init (GailLinkButtonLinkClass *class)
{
GObjectClass *object_class = G_OBJECT_CLASS (class);
AtkHyperlinkClass *hyperlink_class = ATK_HYPERLINK_CLASS (class);
object_class->finalize = gail_link_button_link_finalize;
hyperlink_class->get_uri = gail_link_button_link_get_uri;
hyperlink_class->get_n_anchors = gail_link_button_link_get_n_anchors;
hyperlink_class->is_valid = gail_link_button_link_is_valid;
@@ -172,41 +157,12 @@ gail_link_button_link_get_name (AtkAction *action,
return "activate";
}
static const gchar *
gail_link_button_link_get_description (AtkAction *action,
gint i)
{
GailLinkButtonLink *link = (GailLinkButtonLink *)action;
g_return_val_if_fail (i == 0, NULL);
return link->description;
}
static gboolean
gail_link_button_link_set_description (AtkAction *action,
gint i,
const gchar *description)
{
GailLinkButtonLink *link = (GailLinkButtonLink *)action;
g_return_val_if_fail (i == 0, FALSE);
g_free (link->description);
link->description = g_strdup (description);
return TRUE;
}
static void
atk_action_interface_init (AtkActionIface *iface)
{
iface->do_action = gail_link_button_link_do_action;
iface->get_n_actions = gail_link_button_link_get_n_actions;
iface->get_name = gail_link_button_link_get_name;
iface->get_description = gail_link_button_link_get_description;
iface->set_description = gail_link_button_link_set_description;
}
static gboolean

42
gtk/a11y/gailmenuitem.c
View File

@@ -52,15 +52,10 @@ static gboolean gail_menu_item_do_action (AtkAction *acti
gint i);
static gboolean idle_do_action (gpointer data);
static gint gail_menu_item_get_n_actions (AtkAction *action);
static const gchar* gail_menu_item_get_description(AtkAction *action,
gint i);
static const gchar* gail_menu_item_action_get_name (AtkAction *action,
gint i);
static const gchar* gail_menu_item_get_keybinding (AtkAction *action,
gint i);
static gboolean gail_menu_item_set_description(AtkAction *action,
gint i,
const gchar *desc);
static void menu_item_select (GtkMenuItem *item);
static void menu_item_deselect (GtkMenuItem *item);
static void menu_item_selection (GtkMenuItem *item,
@@ -195,7 +190,6 @@ static void
gail_menu_item_init (GailMenuItem *menu_item)
{
menu_item->click_keybinding = NULL;
menu_item->click_description = NULL;
}
static void
@@ -806,10 +800,8 @@ atk_action_interface_init (AtkActionIface *iface)
{
iface->do_action = gail_menu_item_do_action;
iface->get_n_actions = gail_menu_item_get_n_actions;
iface->get_description = gail_menu_item_get_description;
iface->get_name = gail_menu_item_action_get_name;
iface->get_keybinding = gail_menu_item_get_keybinding;
iface->set_description = gail_menu_item_set_description;
}
static gboolean
@@ -905,21 +897,6 @@ gail_menu_item_get_n_actions (AtkAction *action)
return 1;
}
static const gchar*
gail_menu_item_get_description (AtkAction *action,
gint i)
{
if (i == 0)
{
GailMenuItem *item;
item = GAIL_MENU_ITEM (action);
return item->click_description;
}
else
return NULL;
}
static const gchar*
gail_menu_item_action_get_name (AtkAction *action,
gint i)
@@ -1120,31 +1097,12 @@ gail_menu_item_get_keybinding (AtkAction *action,
return keybinding;
}
static gboolean
gail_menu_item_set_description (AtkAction *action,
gint i,
const gchar *desc)
{
if (i == 0)
{
GailMenuItem *item;
item = GAIL_MENU_ITEM (action);
g_free (item->click_description);
item->click_description = g_strdup (desc);
return TRUE;
}
else
return FALSE;
}
static void
gail_menu_item_finalize (GObject *object)
{
GailMenuItem *menu_item = GAIL_MENU_ITEM (object);
g_free (menu_item->click_keybinding);
g_free (menu_item->click_description);
if (menu_item->action_idle_handler)
{
g_source_remove (menu_item->action_idle_handler);

1
gtk/a11y/gailmenuitem.h
View File

@@ -44,7 +44,6 @@ struct _GailMenuItem
gchar *text;
gchar *click_keybinding;
gchar *click_description;
guint action_idle_handler;
};

50
gtk/a11y/gailrange.c
View File

@@ -57,15 +57,10 @@ static gboolean gail_range_do_action (AtkAction *action,
gint i);
static gboolean idle_do_action (gpointer data);
static gint gail_range_get_n_actions (AtkAction *action);
static const gchar* gail_range_get_description (AtkAction *action,
gint i);
static const gchar* gail_range_get_keybinding (AtkAction *action,
gint i);
static const gchar* gail_range_action_get_name (AtkAction *action,
gint i);
static gboolean gail_range_set_description (AtkAction *action,
gint i,
const gchar *desc);
G_DEFINE_TYPE_WITH_CODE (GailRange, gail_range, GAIL_TYPE_WIDGET,
G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init)
@@ -119,7 +114,6 @@ gail_range_real_initialize (AtkObject *obj,
else
range->adjustment = NULL;
range->activate_keybinding=NULL;
range->activate_description=NULL;
/*
* Assumed to GtkScale (either GtkHScale or GtkVScale)
*/
@@ -269,7 +263,6 @@ gail_range_finalize (GObject *object)
range->adjustment = NULL;
}
range->activate_keybinding=NULL;
range->activate_description=NULL;
if (range->action_idle_handler)
{
g_source_remove (range->action_idle_handler);
@@ -333,10 +326,8 @@ atk_action_interface_init (AtkActionIface *iface)
{
iface->do_action = gail_range_do_action;
iface->get_n_actions = gail_range_get_n_actions;
iface->get_description = gail_range_get_description;
iface->get_keybinding = gail_range_get_keybinding;
iface->get_name = gail_range_action_get_name;
iface->set_description = gail_range_set_description;
}
static gboolean
@@ -392,21 +383,6 @@ gail_range_get_n_actions (AtkAction *action)
return 1;
}
static const gchar*
gail_range_get_description (AtkAction *action,
gint i)
{
GailRange *range;
const gchar *return_value;
range = GAIL_RANGE (action);
if (i==0)
return_value = range->activate_description;
else
return_value = NULL;
return return_value;
}
static const gchar*
gail_range_get_keybinding (AtkAction *action,
gint i)
@@ -467,29 +443,3 @@ gail_range_action_get_name (AtkAction *action,
return return_value;
}
static gboolean
gail_range_set_description (AtkAction *action,
gint i,
const gchar *desc)
{
GailRange *range;
gchar **value;
range = GAIL_RANGE (action);
if (i==0)
value = &range->activate_description;
else
value = NULL;
if (value)
{
g_free (*value);
*value = g_strdup (desc);
return TRUE;
}
else
return FALSE;
}

1
gtk/a11y/gailrange.h
View File

@@ -39,7 +39,6 @@ struct _GailRange
GailWidget parent;
AtkObject *adjustment;
gchar *activate_description;
gchar *activate_keybinding;
guint action_idle_handler;