From 017b058c8a209f1d5d39ff0ef346eb69ce0e0748 Mon Sep 17 00:00:00 2001 From: lukefromdc Date: Fri, 6 Apr 2018 15:18:46 -0400 Subject: pathbar: fix random segfaults on opening mounts from Desktop Adapt and apply these four relevent Nautilus commits, which remove the code responsible for the segfaults: *https://github.com/GNOME/nautilus/commit/e1ad3c05a6cd08c8cbf18ae53701dd742249d5fd#diff-f896071d07d34e87af94a18de95e4ea2 "pathbar: add a path-event signal" *https://github.com/GNOME/nautilus/commit/875efc324f8e91f2d157c7532fe5570c1de421c7#diff-f896071d07d34e87af94a18de95e4ea2 "pathbar: remove unused code" *https://github.com/GNOME/nautilus/commit/cfa51e6702ade6a8ca9045791773e6e10560262f "window-pane: use the path-event signal from NautilusPathBar" (now CajaPathBar) *https://github.com/GNOME/nautilus/commit/2759def4968f89c1a2370ca5b2b91af84dc4afd3 "pathbar: add a return value from path-event signal" --- src/caja-pathbar.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/caja-pathbar.h') diff --git a/src/caja-pathbar.h b/src/caja-pathbar.h index 7fbcc786..fef82e7c 100644 --- a/src/caja-pathbar.h +++ b/src/caja-pathbar.h @@ -71,15 +71,19 @@ struct _CajaPathBarClass void (* path_clicked) (CajaPathBar *path_bar, GFile *location); - void (* path_set) (CajaPathBar *path_bar, - GFile *location); + + void (* path_event) (CajaPathBar *path_bar, + GdkEventButton *event, + GFile *location); }; GType caja_path_bar_get_type (void) G_GNUC_CONST; gboolean caja_path_bar_set_path (CajaPathBar *path_bar, GFile *file); + GFile * caja_path_bar_get_path_for_button (CajaPathBar *path_bar, GtkWidget *button); + void caja_path_bar_clear_buttons (CajaPathBar *path_bar); GtkWidget * caja_path_bar_get_button_from_button_list_entry (gpointer entry); -- cgit v1.2.1