summaryrefslogtreecommitdiff
path: root/src/nautilus-toolbar.c
diff options
context:
space:
mode:
authorCarlos Soriano <csoriano@gnome.org>2015-02-11 12:34:04 +0100
committerCarlos Soriano <csoriano@gnome.org>2015-02-11 12:38:03 +0100
commitf01175d4d99eeb2a4f48f1c695f9e51192248883 (patch)
treee7dc458efefb915a86d21da3b511f103aee3cf1a /src/nautilus-toolbar.c
parentafb7a5648ea04d30e5a5df1b17e251d687df4b8f (diff)
downloadnautilus-f01175d4d99eeb2a4f48f1c695f9e51192248883.tar.gz
nautilus-window: Use GtkBuilder definitionwip/csoriano/window_gtkbuilder
Diffstat (limited to 'src/nautilus-toolbar.c')
-rw-r--r--src/nautilus-toolbar.c22
1 files changed, 19 insertions, 3 deletions
diff --git a/src/nautilus-toolbar.c b/src/nautilus-toolbar.c
index 93b1c1ba6..7c7bcd66a 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>
@@ -408,10 +409,13 @@ static void
nautilus_toolbar_init (NautilusToolbar *self)
{
GtkBuilder *builder;
+ GtkWidget *null_label;
+ GtkWidget *title;
self->priv = nautilus_toolbar_get_instance_private (self);
gtk_widget_init_template (GTK_WIDGET (self));
+ g_print("init\n");
self->priv->path_bar = g_object_new (NAUTILUS_TYPE_PATH_BAR, NULL);
gtk_container_add (GTK_CONTAINER (self->priv->path_bar_container),
self->priv->path_bar);
@@ -498,6 +502,7 @@ nautilus_toolbar_set_property (GObject *object,
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
}
+ g_print ("set property\n");
}
static void
@@ -513,6 +518,14 @@ nautilus_toolbar_dispose (GObject *obj)
}
static void
+nautilus_toolbar_constructed (GObject *object)
+{
+ NautilusToolbar *self = NAUTILUS_TOOLBAR (object);
+
+ g_print ("constructed\n");
+}
+
+static void
nautilus_toolbar_class_init (NautilusToolbarClass *klass)
{
GObjectClass *oclass;
@@ -522,6 +535,7 @@ nautilus_toolbar_class_init (NautilusToolbarClass *klass)
oclass = G_OBJECT_CLASS (klass);
oclass->get_property = nautilus_toolbar_get_property;
oclass->set_property = nautilus_toolbar_set_property;
+ oclass->constructed = nautilus_toolbar_constructed;
oclass->dispose = nautilus_toolbar_dispose;
properties[PROP_WINDOW] =
@@ -529,7 +543,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",
@@ -549,6 +563,8 @@ nautilus_toolbar_class_init (NautilusToolbarClass *klass)
gtk_widget_class_bind_template_child_private (widget_class, NautilusToolbar, location_entry_container);
gtk_widget_class_bind_template_child_private (widget_class, NautilusToolbar, back_button);
gtk_widget_class_bind_template_child_private (widget_class, NautilusToolbar, forward_button);
+
+ g_print ("class init\n");
}
void
@@ -602,10 +618,10 @@ nautilus_toolbar_reset_menus (NautilusToolbar *self)
}
GtkWidget *
-nautilus_toolbar_new (NautilusWindow *window)
+nautilus_toolbar_new ()
{
+ g_print ("new called \n");
return g_object_new (NAUTILUS_TYPE_TOOLBAR,
- "window", window,
"show-close-button", TRUE,
"custom-title", gtk_label_new (NULL),
"valign", GTK_ALIGN_CENTER,