diff options
Diffstat (limited to 'shell')
-rw-r--r-- | shell/e-shell-migrate.c | 2 | ||||
-rw-r--r-- | shell/e-shell-switcher.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/shell/e-shell-migrate.c b/shell/e-shell-migrate.c index 6f7208a593..1186b7934f 100644 --- a/shell/e-shell-migrate.c +++ b/shell/e-shell-migrate.c @@ -157,7 +157,7 @@ shell_migrate_remove_dir (const gchar *root, { GDir *dir; const gchar *basename; - gchar *filename; + gchar *filename = NULL; gint result = -1; /* Recursively removes a directory and its contents. */ diff --git a/shell/e-shell-switcher.c b/shell/e-shell-switcher.c index ec4f23ce53..226279e0b5 100644 --- a/shell/e-shell-switcher.c +++ b/shell/e-shell-switcher.c @@ -91,7 +91,7 @@ shell_switcher_layout_actions (EShellSwitcher *switcher) /* If using text buttons, we want to try to have a * completely filled-in grid, but if we can't, we want * the odd row to have just a single button. */ - while (num_btns % btns_per_row > 1) + while (btns_per_row > 0 && num_btns % btns_per_row > 1) btns_per_row--; } |