summaryrefslogtreecommitdiff
path: root/src/file-manager/fm-icon-view.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/file-manager/fm-icon-view.c')
-rw-r--r--src/file-manager/fm-icon-view.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c
index c624610a..6ab19c4e 100644
--- a/src/file-manager/fm-icon-view.c
+++ b/src/file-manager/fm-icon-view.c
@@ -2061,7 +2061,7 @@ icon_container_activate_alternate_callback (CajaIconContainer *container,
g_assert (FM_IS_ICON_VIEW (icon_view));
g_assert (container == get_icon_container (icon_view));
- open_in_tab = FALSE;
+ open_in_tab = TRUE;
window_info = fm_directory_view_get_caja_window (FM_DIRECTORY_VIEW (icon_view));
@@ -2170,6 +2170,8 @@ audio_child_died (GPid pid,
{
FMIconView *icon_view;
+ g_return_if_fail (FM_IS_ICON_VIEW (data));
+
icon_view = FM_ICON_VIEW (data);
icon_view->details->audio_preview_child_watch = 0;
@@ -2637,12 +2639,11 @@ fm_icon_view_icon_text_changed_callback (CajaIconContainer *container,
FMIconView *icon_view)
{
g_assert (CAJA_IS_FILE (file));
- g_assert (new_name != NULL);
/* Don't allow a rename with an empty string. Revert to original
* without notifying the user.
*/
- if (new_name[0] == '\0')
+ if ((new_name == NULL) || (new_name[0] == '\0'))
{
return;
}