From 7d53df8ccb3d653fff59fa475ec75a1aa956a82c Mon Sep 17 00:00:00 2001 From: Juan Pablo Ugarte Date: Fri, 2 Nov 2012 15:11:41 -0300 Subject: [PATCH] Removed bogus lines changes like spaces and such. --- gtk/gtkbuilder.c | 21 +++++++++++---------- gtk/gtkbuilder.h | 18 +++++++++--------- gtk/gtkbuilderparser.c | 9 ++------- gtk/gtkcontainer.h | 2 ++ 4 files changed, 24 insertions(+), 26 deletions(-) diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c index 80be5e95ec..1c6c573c9d 100644 --- a/gtk/gtkbuilder.c +++ b/gtk/gtkbuilder.c @@ -473,7 +473,7 @@ gtk_builder_get_parameters (GtkBuilder *builder, GObjectClass *oclass; DelayedProperty *property; GError *error = NULL; - + oclass = g_type_class_ref (object_type); g_assert (oclass != NULL); @@ -543,13 +543,13 @@ gtk_builder_get_parameters (GtkBuilder *builder, } } else if (!gtk_builder_value_from_string (builder, pspec, - prop->data, ¶meter.value, &error)) + prop->data, ¶meter.value, &error)) { g_warning ("Failed to set property %s.%s to %s: %s", g_type_name (object_type), prop->name, prop->data, - error->message); - g_error_free (error); - error = NULL; + error->message); + g_error_free (error); + error = NULL; continue; } @@ -566,7 +566,7 @@ static GObject * gtk_builder_get_internal_child (GtkBuilder *builder, ObjectInfo *info, const gchar *childname, - GError **error) + GError **error) { GObject *obj = NULL; @@ -1491,6 +1491,7 @@ gtk_builder_connect_signals_default (GtkBuilder *builder, g_signal_connect_data (object, signal_name, func, args->data, NULL, flags); } + /** * gtk_builder_connect_signals: * @builder: a #GtkBuilder @@ -1608,11 +1609,11 @@ gtk_builder_connect_signals_full (GtkBuilder *builder, signal->connect_object_name); if (!connect_object) - g_warning ("Could not lookup object %s on signal %s of object %s.", - signal->connect_object_name, signal->name, - signal->object_name); + g_warning ("Could not lookup object %s on signal %s of object %s", + signal->connect_object_name, signal->name, + signal->object_name); } - + func (builder, object, signal->name, signal->handler, connect_object, signal->flags, user_data); } diff --git a/gtk/gtkbuilder.h b/gtk/gtkbuilder.h index dc22f8d45a..e2a73ac183 100644 --- a/gtk/gtkbuilder.h +++ b/gtk/gtkbuilder.h @@ -132,9 +132,9 @@ guint gtk_builder_add_objects_from_file (GtkBuilder *builder, GError **error); GDK_AVAILABLE_IN_3_4 guint gtk_builder_add_objects_from_resource(GtkBuilder *builder, - const gchar *resource_path, - gchar **object_ids, - GError **error); + const gchar *resource_path, + gchar **object_ids, + GError **error); guint gtk_builder_add_objects_from_string (GtkBuilder *builder, const gchar *buffer, gsize length, @@ -163,10 +163,10 @@ void gtk_builder_expose_object (GtkBuilder *builder, const gchar *name, GObject *object); void gtk_builder_connect_signals (GtkBuilder *builder, - gpointer user_data); + gpointer user_data); void gtk_builder_connect_signals_full (GtkBuilder *builder, GtkBuilderConnectFunc func, - gpointer user_data); + gpointer user_data); void gtk_builder_set_translation_domain (GtkBuilder *builder, const gchar *domain); const gchar* gtk_builder_get_translation_domain (GtkBuilder *builder); @@ -174,15 +174,15 @@ GType gtk_builder_get_type_from_name (GtkBuilder *builder, const char *type_name); gboolean gtk_builder_value_from_string (GtkBuilder *builder, - GParamSpec *pspec, + GParamSpec *pspec, const gchar *string, GValue *value, - GError **error); + GError **error); gboolean gtk_builder_value_from_string_type (GtkBuilder *builder, - GType type, + GType type, const gchar *string, GValue *value, - GError **error); + GError **error); /** * GTK_BUILDER_WARN_INVALID_CHILD_TYPE: diff --git a/gtk/gtkbuilderparser.c b/gtk/gtkbuilderparser.c index 914f566647..1cfc0a94ea 100644 --- a/gtk/gtkbuilderparser.c +++ b/gtk/gtkbuilderparser.c @@ -476,7 +476,6 @@ parse_child (ParserData *data, { ObjectInfo* object_info; ChildInfo *child_info; - GObject *object; guint i; object_info = state_peek_info (data, ObjectInfo); @@ -485,9 +484,6 @@ parse_child (ParserData *data, error_invalid_tag (data, element_name, NULL, error); return; } - - GTK_NOTE (BUILDER, g_print ("parsing child of parent type %s\n", - object_info->object ? G_OBJECT_TYPE_NAME (object_info->object) : "(none)")); child_info = g_slice_new0 (ChildInfo); state_push (data, child_info); @@ -504,9 +500,7 @@ parse_child (ParserData *data, child_info->parent = (CommonInfo*)object_info; - object = builder_construct (data, object_info, error); - object_info->object = object; - + object_info->object = builder_construct (data, object_info, error); } static void @@ -1325,6 +1319,7 @@ _gtk_builder_parser_parse_buffer (GtkBuilder *builder, data->domain = g_strdup (domain); data->object_ids = g_hash_table_new_full (g_str_hash, g_str_equal, (GDestroyNotify)g_free, NULL); + data->requested_objects = NULL; if (requested_objs) { diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h index 0ddac91ba7..af07eacba5 100644 --- a/gtk/gtkcontainer.h +++ b/gtk/gtkcontainer.h @@ -44,6 +44,7 @@ G_BEGIN_DECLS #define GTK_IS_CONTAINER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CONTAINER)) #define GTK_CONTAINER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CONTAINER, GtkContainerClass)) + typedef struct _GtkContainer GtkContainer; typedef struct _GtkContainerPrivate GtkContainerPrivate; typedef struct _GtkContainerClass GtkContainerClass; @@ -90,6 +91,7 @@ struct _GtkContainerClass /*< private >*/ + unsigned int _handle_border_width : 1; GtkContainerClassPrivate *priv;