diff options
author | Carlos Soriano <csoriano@gnome.org> | 2015-02-11 12:34:04 +0100 |
---|---|---|
committer | Carlos Soriano <csoriano@gnome.org> | 2015-03-02 13:38:18 +0100 |
commit | 037e49fc295d11eb3141091b27f10e67818f5b8b (patch) | |
tree | abf63d94ae8d6428cfdc4956b6bad46cc98744a9 /src/nautilus-toolbar.c | |
parent | 2a1d2df280c4eb0c5f46c15c6f47e00d496db865 (diff) | |
download | nautilus-037e49fc295d11eb3141091b27f10e67818f5b8b.tar.gz |
nautilus-window: Use GtkBuilder definition
Use a GtkBuilder definition for the UI of the window. This makes the code
cleaner and allow us to merge some UI definitions in the same place, like the
notification.
This will make easier to hack on the UI in the future, as we plan to do.
Diffstat (limited to 'src/nautilus-toolbar.c')
-rw-r--r-- | src/nautilus-toolbar.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nautilus-toolbar.c b/src/nautilus-toolbar.c index 0c12f21be..68bb86dce 100644 --- a/src/nautilus-toolbar.c +++ b/src/nautilus-toolbar.c @@ -28,6 +28,7 @@ #include "nautilus-location-entry.h" #include "nautilus-pathbar.h" +#include "nautilus-window.h" #include <libnautilus-private/nautilus-global-preferences.h> #include <libnautilus-private/nautilus-ui-utilities.h> @@ -544,7 +545,7 @@ nautilus_toolbar_class_init (NautilusToolbarClass *klass) "The NautilusWindow", "The NautilusWindow this toolbar is part of", NAUTILUS_TYPE_WINDOW, - G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | + G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS); properties[PROP_SHOW_LOCATION_ENTRY] = g_param_spec_boolean ("show-location-entry", @@ -617,10 +618,9 @@ nautilus_toolbar_reset_menus (NautilusToolbar *self) } GtkWidget * -nautilus_toolbar_new (NautilusWindow *window) +nautilus_toolbar_new () { return g_object_new (NAUTILUS_TYPE_TOOLBAR, - "window", window, "show-close-button", TRUE, "custom-title", gtk_label_new (NULL), "valign", GTK_ALIGN_CENTER, |