diff options
Diffstat (limited to 'src/caja-places-sidebar.c')
| -rw-r--r-- | src/caja-places-sidebar.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/caja-places-sidebar.c b/src/caja-places-sidebar.c index 06281c6c..55517be2 100644 --- a/src/caja-places-sidebar.c +++ b/src/caja-places-sidebar.c @@ -53,8 +53,6 @@ #include "caja-places-sidebar.h" #include "caja-window.h" -#include "glibcompat.h" /* for g_list_free_full and g_clear_object */ - #define EJECT_BUTTON_XPAD 6 #define ICON_CELL_XPAD 6 @@ -1247,7 +1245,7 @@ drag_motion_callback (GtkTreeView *tree_view, { GtkTreePath *path; GtkTreeViewDropPosition pos; - int action; + int action = 0; GtkTreeIter iter; char *uri; gboolean res; @@ -1457,7 +1455,7 @@ reorder_bookmarks (CajaPlacesSidebar *sidebar, /* Get the selected path */ if (!get_selected_iter (sidebar, &iter)) - g_assert_not_reached (); + return; gtk_tree_model_get (GTK_TREE_MODEL (sidebar->filter_model), &iter, PLACES_SIDEBAR_COLUMN_ROW_TYPE, &type, @@ -1522,7 +1520,9 @@ drag_data_received_callback (GtkWidget *widget, } /* Compute position */ - compute_drop_position (tree_view, x, y, &tree_path, &tree_pos, sidebar); + success = compute_drop_position (tree_view, x, y, &tree_path, &tree_pos, sidebar); + if (!success) + goto out; success = FALSE; |