summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--eel/eel-editable-label.c1
-rw-r--r--libcaja-private/caja-icon-container.c4
2 files changed, 2 insertions, 3 deletions
diff --git a/eel/eel-editable-label.c b/eel/eel-editable-label.c
index af008c56..96598a87 100644
--- a/eel/eel-editable-label.c
+++ b/eel/eel-editable-label.c
@@ -2792,7 +2792,6 @@ eel_editable_label_move_cursor (EelEditableLabel *label,
case GTK_MOVEMENT_DISPLAY_LINES:
new_pos = eel_editable_label_move_line (label, new_pos, count);
break;
- break;
case GTK_MOVEMENT_PARAGRAPHS:
case GTK_MOVEMENT_PAGES:
break;
diff --git a/libcaja-private/caja-icon-container.c b/libcaja-private/caja-icon-container.c
index 5de4ac39..b45d046f 100644
--- a/libcaja-private/caja-icon-container.c
+++ b/libcaja-private/caja-icon-container.c
@@ -3278,8 +3278,8 @@ rightmost_in_top_row (CajaIconContainer *container,
{
return TRUE;
}
- return compare_icons_vertical (container, best_so_far, candidate) > 0;
- return compare_icons_horizontal (container, best_so_far, candidate) < 0;
+ return ((compare_icons_vertical (container, best_so_far, candidate) > 0) &&
+ (compare_icons_horizontal (container, best_so_far, candidate) < 0));
}
static gboolean