mirror of
https://gitlab.gnome.org/GNOME/nautilus
synced 2024-06-30 23:46:35 +00:00
toolbar: Handle showing current location menu
This makes NautilusPathBar effectively private to NautilusToolbar, like NautilusLocationEntry already is.
This commit is contained in:
parent
874150b017
commit
3e8b382fce
|
@ -437,12 +437,6 @@ nautilus_toolbar_new (void)
|
|||
NULL);
|
||||
}
|
||||
|
||||
GtkWidget *
|
||||
nautilus_toolbar_get_path_bar (NautilusToolbar *self)
|
||||
{
|
||||
return self->path_bar;
|
||||
}
|
||||
|
||||
static void
|
||||
box_remove_all_children (GtkBox *box)
|
||||
{
|
||||
|
@ -493,6 +487,12 @@ slot_on_templates_menu_changed (NautilusToolbar *self,
|
|||
menu);
|
||||
}
|
||||
|
||||
void
|
||||
nautilus_toolbar_show_current_location_menu (NautilusToolbar *self)
|
||||
{
|
||||
nautilus_path_bar_show_current_location_menu (NAUTILUS_PATH_BAR (self->path_bar));
|
||||
}
|
||||
|
||||
/* Called from on_window_slot_destroyed(), since bindings and signal handlers
|
||||
* are automatically removed once the slot goes away.
|
||||
*/
|
||||
|
|
|
@ -36,7 +36,7 @@ G_DECLARE_FINAL_TYPE (NautilusToolbar, nautilus_toolbar, NAUTILUS, TOOLBAR, AdwB
|
|||
|
||||
GtkWidget *nautilus_toolbar_new (void);
|
||||
|
||||
GtkWidget *nautilus_toolbar_get_path_bar (NautilusToolbar *self);
|
||||
void nautilus_toolbar_show_current_location_menu (NautilusToolbar *self);
|
||||
|
||||
void nautilus_toolbar_open_location_entry (NautilusToolbar *self,
|
||||
const char *special_text);
|
||||
|
|
|
@ -53,7 +53,6 @@
|
|||
#include "nautilus-network-address-bar.h"
|
||||
#include "nautilus-mime-actions.h"
|
||||
#include "nautilus-module.h"
|
||||
#include "nautilus-pathbar.h"
|
||||
#include "nautilus-progress-indicator.h"
|
||||
#include "nautilus-scheme.h"
|
||||
#include "nautilus-shortcut-manager.h"
|
||||
|
@ -381,12 +380,9 @@ action_show_current_location_menu (GSimpleAction *action,
|
|||
GVariant *state,
|
||||
gpointer user_data)
|
||||
{
|
||||
NautilusWindow *window = user_data;
|
||||
GtkWidget *path_bar;
|
||||
NautilusWindow *self = NAUTILUS_WINDOW (user_data);
|
||||
|
||||
path_bar = nautilus_toolbar_get_path_bar (NAUTILUS_TOOLBAR (window->toolbar));
|
||||
|
||||
nautilus_path_bar_show_current_location_menu (NAUTILUS_PATH_BAR (path_bar));
|
||||
nautilus_toolbar_show_current_location_menu (NAUTILUS_TOOLBAR (self->toolbar));
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
Loading…
Reference in New Issue
Block a user