diff options
Diffstat (limited to 'a11y/addressbook')
-rw-r--r-- | a11y/addressbook/ea-addressbook-view.c | 17 | ||||
-rw-r--r-- | a11y/addressbook/ea-addressbook.c | 2 | ||||
-rw-r--r-- | a11y/addressbook/ea-minicard-view.c | 13 |
3 files changed, 13 insertions, 19 deletions
diff --git a/a11y/addressbook/ea-addressbook-view.c b/a11y/addressbook/ea-addressbook-view.c index 962e73e707..eff7eb4044 100644 --- a/a11y/addressbook/ea-addressbook-view.c +++ b/a11y/addressbook/ea-addressbook-view.c @@ -28,7 +28,7 @@ static G_CONST_RETURN gchar* ea_ab_view_get_name (AtkObject *accessible); static G_CONST_RETURN gchar* ea_ab_view_get_description (AtkObject *accessible); -static void ea_ab_view_class_init (EABViewClass *klass); +static void ea_ab_view_class_init (EAddressbookViewClass *class); static gpointer parent_class = NULL; @@ -42,13 +42,13 @@ ea_ab_view_get_type (void) if (!type) { static GTypeInfo tinfo = { - sizeof (EABViewClass), + sizeof (EAddressbookViewClass), (GBaseInitFunc) NULL, /* base_init */ (GBaseFinalizeFunc) NULL, /* base_finalize */ (GClassInitFunc) ea_ab_view_class_init, (GClassFinalizeFunc) NULL, /* class_finalize */ NULL, /* class_data */ - sizeof (EaABView), + sizeof (EAddressbookView), 0, /* n_preallocs */ (GInstanceInitFunc) NULL, /* instance init */ NULL /* value table */ @@ -74,14 +74,15 @@ ea_ab_view_get_type (void) } static void -ea_ab_view_class_init (EABViewClass *klass) +ea_ab_view_class_init (EAddressbookViewClass *class) { - AtkObjectClass *class = ATK_OBJECT_CLASS (klass); + AtkObjectClass *atk_object_class; - parent_class = g_type_class_peek_parent (klass); + parent_class = g_type_class_peek_parent (class); - class->get_name = ea_ab_view_get_name; - class->get_description = ea_ab_view_get_description; + atk_object_class = ATK_OBJECT_CLASS (class); + atk_object_class->get_name = ea_ab_view_get_name; + atk_object_class->get_description = ea_ab_view_get_description; } static G_CONST_RETURN gchar* diff --git a/a11y/addressbook/ea-addressbook.c b/a11y/addressbook/ea-addressbook.c index b41a98434e..e94309de43 100644 --- a/a11y/addressbook/ea-addressbook.c +++ b/a11y/addressbook/ea-addressbook.c @@ -55,7 +55,7 @@ void e_minicard_view_a11y_init (void) void eab_view_a11y_init (void) { - EA_SET_FACTORY (eab_view_get_type (), ea_ab_view); + EA_SET_FACTORY (E_TYPE_ADDRESSBOOK_VIEW, ea_ab_view); } static gboolean diff --git a/a11y/addressbook/ea-minicard-view.c b/a11y/addressbook/ea-minicard-view.c index 944060b91a..aed11ed2ac 100644 --- a/a11y/addressbook/ea-minicard-view.c +++ b/a11y/addressbook/ea-minicard-view.c @@ -362,11 +362,9 @@ static gboolean atk_action_interface_do_action (AtkAction *action, gint i) { gboolean return_value = TRUE; EMinicardView *card_view; - EContact *contact = e_contact_new(); AtkGObjectAccessible *atk_gobj= NULL; EReflow *reflow = NULL; - EBook *book; atk_gobj = ATK_GOBJECT_ACCESSIBLE (action); reflow = E_REFLOW (atk_gobject_accessible_get_object (atk_gobj)); @@ -375,26 +373,21 @@ static gboolean atk_action_interface_do_action (AtkAction *action, gint i) return FALSE; card_view = E_MINICARD_VIEW (reflow); - g_object_get(card_view, - "book", &book, - NULL); - g_return_val_if_fail (E_IS_BOOK (book), FALSE); switch (i) { case 0: /* New Contact */ - eab_show_contact_editor (book, contact, TRUE, TRUE); + e_minicard_view_create_contact (card_view); break; case 1: /* New Contact List */ - eab_show_contact_list_editor (book, contact, TRUE, TRUE); + e_minicard_view_create_contact_list (card_view); break; default: return_value = FALSE; break; } - g_object_unref (book); - g_object_unref (contact); + return return_value; } |