[gtk+/composite-templates] Fixed identation



commit f2ddbfe29c59a13e111c6f472e14035d5634f743
Author: Juan Pablo Ugarte <juanpablougarte gmail com>
Date:   Tue Jul 31 11:31:34 2012 -0300

    Fixed identation

 gtk/gtkbuilder.c        |   48 +++++++++++++++++++++++-----------------------
 gtk/gtkbuilder.h        |   42 ++++++++++++++++++++--------------------
 gtk/gtkbuilderparser.c  |    2 +-
 gtk/gtkbuilderprivate.h |    2 +-
 gtk/gtkcontainer.c      |   12 +++++-----
 gtk/gtkcontainer.h      |    8 -------
 6 files changed, 53 insertions(+), 61 deletions(-)
---
diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c
index aaf9419..f90cdae 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);
 
@@ -499,11 +499,11 @@ gtk_builder_get_parameters (GtkBuilder  *builder,
       if (G_IS_PARAM_SPEC_OBJECT (pspec) &&
           (G_PARAM_SPEC_VALUE_TYPE (pspec) != GDK_TYPE_PIXBUF))
         {
-	  GObject *object;
+          GObject *object;
 
           if (prop->external)
-	    {
-	      object = g_hash_table_lookup (builder->priv->external_objects, prop->data);
+            {
+              object = g_hash_table_lookup (builder->priv->external_objects, prop->data);
 
               if (!object)
                 {
@@ -515,10 +515,10 @@ gtk_builder_get_parameters (GtkBuilder  *builder,
 
               g_value_init (&parameter.value, G_OBJECT_TYPE (object));
               g_value_set_object (&parameter.value, object);
-	    }
+            }
           else if (pspec->flags & G_PARAM_CONSTRUCT_ONLY)
             {
-	      object = gtk_builder_get_object (builder, prop->data);
+              object = gtk_builder_get_object (builder, prop->data);
 
               if (!object)
                 {
@@ -530,7 +530,7 @@ gtk_builder_get_parameters (GtkBuilder  *builder,
               g_value_init (&parameter.value, G_OBJECT_TYPE (object));
               g_value_set_object (&parameter.value, object);
             }
-	  else
+          else
             {
               /* Delay setting property */
               property = g_slice_new (DelayedProperty);
@@ -543,13 +543,13 @@ gtk_builder_get_parameters (GtkBuilder  *builder,
             }
         }
       else if (!gtk_builder_value_from_string (builder, pspec,
-					       prop->data, &parameter.value, &error))
+                                               prop->data, &parameter.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;
 
@@ -937,9 +937,9 @@ gtk_builder_add_from_file (GtkBuilder   *builder,
  **/
 guint
 gtk_builder_add_to_parent_from_file (GtkBuilder   *builder,
-				     GObject      *parent,
-				     const gchar  *filename,
-				     GError      **error)
+                                     GObject      *parent,
+                                     const gchar  *filename,
+                                     GError      **error)
 {
   gchar *buffer;
   gsize length;
@@ -1076,7 +1076,7 @@ gtk_builder_add_from_resource (GtkBuilder   *builder,
  * gtk_builder_add_to_parent_from_resource:
  * @builder: a #GtkBuilder
  * @parent: the parent object to be assumed in context while parsing the file
- * @resource_path: the resource path to parse
+ * @path: the resource path to parse
  * @error: (allow-none): return location for an error, or %NULL
  *
  * Like gtk_builder_add_from_file() except the format will expect
@@ -1091,7 +1091,7 @@ gtk_builder_add_from_resource (GtkBuilder   *builder,
 guint
 gtk_builder_add_to_parent_from_resource (GtkBuilder   *builder,
                                          GObject      *parent,
-                                         const gchar  *resource_path,
+                                         const gchar  *path,
                                          GError      **error)
 {
   GError *tmp_error;
@@ -1269,10 +1269,10 @@ gtk_builder_add_from_string (GtkBuilder   *builder,
  **/
 guint
 gtk_builder_add_to_parent_from_string (GtkBuilder   *builder,
-				       GObject      *parent,
-				       const gchar  *buffer,
-				       gsize         length,
-				       GError      **error)
+                                       GObject      *parent,
+                                       const gchar  *buffer,
+                                       gsize         length,
+                                       GError      **error)
 {
   GError *tmp_error;
 
@@ -1473,8 +1473,8 @@ gtk_builder_get_translation_domain (GtkBuilder *builder)
  */
 void         
 gtk_builder_expose_object (GtkBuilder    *builder,
-	        	   const gchar   *name,
-			   GObject       *object)
+                           const gchar   *name,
+                           GObject       *object)
 {
   GtkBuilderPrivate *priv;
 
@@ -1621,7 +1621,7 @@ gtk_builder_connect_signals_full (GtkBuilder            *builder,
   for (l = builder->priv->signals; l; l = l->next)
     {
       SignalInfo *signal = (SignalInfo*)l->data;
-      
+
       g_assert (signal != NULL);
       g_assert (signal->name != NULL);
 
diff --git a/gtk/gtkbuilder.h b/gtk/gtkbuilder.h
index dc5ac67..3588a39 100644
--- a/gtk/gtkbuilder.h
+++ b/gtk/gtkbuilder.h
@@ -131,38 +131,38 @@ guint        gtk_builder_add_objects_from_file   (GtkBuilder    *builder,
                                                   gchar        **object_ids,
                                                   GError       **error);
 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,
                                                   gchar        **object_ids,
                                                   GError       **error);
-guint        gtk_builder_add_to_parent_from_file (GtkBuilder   *builder,
-						  GObject      *parent,
-						  const gchar  *filename,
-						  GError      **error);
-guint        gtk_builder_add_to_parent_from_string (GtkBuilder   *builder,
-						    GObject      *parent,
-						    const gchar  *buffer,
-						    gsize         length,
-						    GError      **error);
+guint        gtk_builder_add_to_parent_from_file     (GtkBuilder   *builder,
+                                                      GObject      *parent,
+                                                      const gchar  *filename,
+                                                      GError      **error);
+guint        gtk_builder_add_to_parent_from_string   (GtkBuilder   *builder,
+                                                      GObject      *parent,
+                                                      const gchar  *buffer,
+                                                      gsize         length,
+                                                      GError      **error);
 guint        gtk_builder_add_to_parent_from_resource (GtkBuilder   *builder,
                                                       GObject      *parent,
-                                                      const gchar  *resource_path,
+                                                      const gchar  *path,
                                                       GError      **error);
 GObject*     gtk_builder_get_object              (GtkBuilder    *builder,
                                                   const gchar   *name);
 GSList*      gtk_builder_get_objects             (GtkBuilder    *builder);
 void         gtk_builder_expose_object           (GtkBuilder    *builder,
-						  const gchar   *name,
-						  GObject       *object);
+                                                  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);
@@ -170,15 +170,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 10b4c1f..ae3e8af 100644
--- a/gtk/gtkbuilderparser.c
+++ b/gtk/gtkbuilderparser.c
@@ -1282,7 +1282,7 @@ static const GMarkupParser parser = {
 
 void
 _gtk_builder_parser_parse_buffer (GtkBuilder   *builder,
-				  GObject      *parent,
+                                  GObject      *parent,
                                   const gchar  *filename,
                                   const gchar  *buffer,
                                   gsize         length,
diff --git a/gtk/gtkbuilderprivate.h b/gtk/gtkbuilderprivate.h
index bcac8bc..9e4b292 100644
--- a/gtk/gtkbuilderprivate.h
+++ b/gtk/gtkbuilderprivate.h
@@ -116,7 +116,7 @@ typedef GType (*GTypeGetFunc) (void);
 
 /* Things only GtkBuilder should use */
 void _gtk_builder_parser_parse_buffer (GtkBuilder *builder,
-				       GObject     *parent,
+                                       GObject     *parent,
                                        const gchar *filename,
                                        const gchar *buffer,
                                        gsize length,
diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index 5cf7789..e5dc22b 100644
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -295,8 +295,8 @@ static void     gtk_container_class_init           (GtkContainerClass *klass);
 static void     gtk_container_init                 (GtkContainer      *container);
 static void     gtk_container_destroy              (GtkWidget         *widget);
 static GObject *gtk_container_constructor          (GType                  type,
-						    guint                  n_construct_properties,
-						    GObjectConstructParam *construct_properties);
+                                                    guint                  n_construct_properties,
+                                                    GObjectConstructParam *construct_properties);
 static void     gtk_container_set_property         (GObject         *object,
                                                     guint            prop_id,
                                                     const GValue    *value,
@@ -1445,8 +1445,8 @@ gtk_container_class_set_template_from_resource (GtkContainerClass *container_cla
  * defined by this class's GtkBuilder template.
  */
 void
-gtk_container_class_set_connect_func    (GtkContainerClass *container_class,
-					 GtkBuilderConnectFunc connect_func)
+gtk_container_class_set_connect_func (GtkContainerClass *container_class,
+                                      GtkBuilderConnectFunc connect_func)
 {
   g_return_if_fail (GTK_IS_CONTAINER_CLASS(container_class));
   g_return_if_fail (connect_func != NULL);
@@ -1596,8 +1596,8 @@ gtk_container_child_set_internal (GtkContainer *container,
 
 static GObject *
 gtk_container_constructor (GType                  type,
-			   guint                  n_construct_properties,
-			   GObjectConstructParam *construct_properties)
+                           guint                  n_construct_properties,
+                           GObjectConstructParam *construct_properties)
 {
   GtkContainerClassPrivate *priv;
   GtkContainer *container;
diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h
index a0164a0..774e3ea 100644
--- a/gtk/gtkcontainer.h
+++ b/gtk/gtkcontainer.h
@@ -230,14 +230,6 @@ void    gtk_container_class_declare_internal_child     (GtkContainerClass *conta
                                                         gboolean use_private,
                                                         guint struct_offset,
                                                         const gchar *name);
-/* Non-public methods */
-void	_gtk_container_queue_resize	     (GtkContainer *container);
-void    _gtk_container_clear_resize_widgets   (GtkContainer *container);
-void   _gtk_container_dequeue_resize_handler (GtkContainer *container);
-GList *_gtk_container_focus_sort             (GtkContainer     *container,
-					      GList            *children,
-					      GtkDirectionType  direction,
-					      GtkWidget        *old_focus);
 
 GtkWidgetPath * gtk_container_get_path_for_child (GtkContainer      *container,
                                                   GtkWidget         *child);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]