aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/gui/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook/gui/widgets')
-rw-r--r--addressbook/gui/widgets/e-addressbook-view.c2
-rw-r--r--addressbook/gui/widgets/ea-minicard.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index 9d7b1826c7..5206041d29 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -1439,7 +1439,7 @@ e_addressbook_view_delete_selection (EAddressbookView *view,
}
/* Sets the cursor, at the row after the deleted row */
- if (GAL_IS_VIEW_MINICARD (gal_view) && row != 0) {
+ if (GAL_IS_VIEW_MINICARD (gal_view) && row != 0 && selection_model) {
select = e_sorter_model_to_sorted (selection_model->sorter, row);
/* Sets the cursor, before the deleted row if its the last row */
diff --git a/addressbook/gui/widgets/ea-minicard.c b/addressbook/gui/widgets/ea-minicard.c
index 8a93265d7f..cfa35db349 100644
--- a/addressbook/gui/widgets/ea-minicard.c
+++ b/addressbook/gui/widgets/ea-minicard.c
@@ -140,7 +140,7 @@ ea_minicard_get_name (AtkObject *accessible)
{
#define BUFFERSIZE 500
- static gchar name[BUFFERSIZE];
+ static gchar name[BUFFERSIZE + 1];
GString *new_str = g_string_new (NULL);
gchar *string;
EMinicard *card;
@@ -167,6 +167,7 @@ ea_minicard_get_name (AtkObject *accessible)
/* if there exist no enough space for remain info, return */
if (new_str->len >= BUFFERSIZE) {
strncpy (name, new_str->str, BUFFERSIZE);
+ name[BUFFERSIZE] = '\0';
return name;
}