diff options
| author | raveit65 <[email protected]> | 2016-07-04 13:27:22 +0200 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2016-07-11 22:28:14 +0200 |
| commit | c75269f5b317ffa20142d640108ab64b85835e09 (patch) | |
| tree | 8cc7176bcb1fe618de8d51c5e8df51d3ef82f431 /src/caja-navigation-window.c | |
| parent | 5968f6bb40c334a797175ebeeb946d76163ce288 (diff) | |
| download | caja-c75269f5b317ffa20142d640108ab64b85835e09.tar.bz2 caja-c75269f5b317ffa20142d640108ab64b85835e09.tar.xz | |
navigation-bar: remove useless abstract class
Merge the useful pieces into CajaLocationBar itself, which is the
only implementor anyway.
taken from:
https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-6&id=ca1fa0c
https://git.gnome.org/browse/nautilus/commit/?h=gnome-3-0&id=66c46dd
Diffstat (limited to 'src/caja-navigation-window.c')
| -rw-r--r-- | src/caja-navigation-window.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/caja-navigation-window.c b/src/caja-navigation-window.c index bd79d774..fbaaf5a4 100644 --- a/src/caja-navigation-window.c +++ b/src/caja-navigation-window.c @@ -318,7 +318,7 @@ caja_navigation_window_is_in_temporary_navigation_bar (GtkWidget *widget, for (walk = CAJA_WINDOW(window)->details->panes; walk; walk = walk->next) { CajaNavigationWindowPane *pane = walk->data; - if(gtk_widget_get_ancestor (widget, CAJA_TYPE_NAVIGATION_BAR) != NULL && + if(gtk_widget_get_ancestor (widget, CAJA_TYPE_LOCATION_BAR) != NULL && pane->temporary_navigation_bar) is_in_any = TRUE; } @@ -833,8 +833,8 @@ real_prompt_for_location (CajaWindow *window, const char *initial) if (initial) { - caja_navigation_bar_set_location (CAJA_NAVIGATION_BAR (pane->navigation_bar), - initial); + caja_location_bar_set_location (CAJA_LOCATION_BAR (pane->navigation_bar), + initial); } } |