diff options
author | lukefromdc <[email protected]> | 2018-04-06 15:18:46 -0400 |
---|---|---|
committer | monsta <[email protected]> | 2018-04-13 15:34:46 +0300 |
commit | ec549737322a5939d6b4ce4c02f827dcf7ee7e83 (patch) | |
tree | 4b685173c9329709af211454e2b69f253acd2d6a /src/caja-pathbar.h | |
parent | 73aa7284a075fe0b730190d414e79f3ec72fe85a (diff) | |
download | caja-ec549737322a5939d6b4ce4c02f827dcf7ee7e83.tar.bz2 caja-ec549737322a5939d6b4ce4c02f827dcf7ee7e83.tar.xz |
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"
Diffstat (limited to 'src/caja-pathbar.h')
-rw-r--r-- | src/caja-pathbar.h | 8 |
1 files changed, 6 insertions, 2 deletions
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); |