GNOME.org
 

[monet] [monet-gtk] remove trailing white space and re-indent to two spaces

commit 37ced27b589a8352932b4044fac3c0de8848cee9
Author: Thomas Wood <thos gnome org>
Date:   Sun Nov 1 11:01:45 2009 +0000

    [monet-gtk] remove trailing white space and re-indent to two spaces

 monet-gtk/src/main.c    |   14 +++---
 monet-gtk/src/rcstyle.c |  106 +++++++++++++++++++-------------------
 monet-gtk/src/rcstyle.h |    8 ++--
 monet-gtk/src/style.c   |  132 +++++++++++++++++++++++-----------------------
 monet-gtk/src/style.h   |    4 +-
 5 files changed, 132 insertions(+), 132 deletions(-)
---
diff --git a/monet-gtk/src/main.c b/monet-gtk/src/main.c
index 44cadbc..2a76a5f 100644
--- a/monet-gtk/src/main.c
+++ b/monet-gtk/src/main.c
@@ -32,20 +32,20 @@ G_MODULE_EXPORT const gchar* g_module_check_init (GModule *module);
 G_MODULE_EXPORT void
 theme_init (GTypeModule *module)
 {
-	noop_rc_style_register_type (module);
-	noop_style_register_type (module);
+  noop_rc_style_register_type (module);
+  noop_style_register_type (module);
 }
 
 G_MODULE_EXPORT void
 theme_exit (void)
 {
-	/* Called when the engine is unloaded again. */
+  /* Called when the engine is unloaded again. */
 }
 
 G_MODULE_EXPORT GtkRcStyle *
 theme_create_rc_style (void)
 {
-	return GTK_RC_STYLE (g_object_new (NOOP_TYPE_RC_STYLE, NULL));
+  return GTK_RC_STYLE (g_object_new (NOOP_TYPE_RC_STYLE, NULL));
 }
 
 /* The following function will be called by GTK+ when the module
@@ -55,7 +55,7 @@ theme_create_rc_style (void)
 const gchar*
 g_module_check_init (GModule *module)
 {
-	return gtk_check_version (GTK_MAJOR_VERSION,
-	                          GTK_MINOR_VERSION,
-	                          GTK_MICRO_VERSION - GTK_INTERFACE_AGE);
+  return gtk_check_version (GTK_MAJOR_VERSION,
+                            GTK_MINOR_VERSION,
+                            GTK_MICRO_VERSION - GTK_INTERFACE_AGE);
 }
diff --git a/monet-gtk/src/rcstyle.c b/monet-gtk/src/rcstyle.c
index 89198d0..14076f4 100644
--- a/monet-gtk/src/rcstyle.c
+++ b/monet-gtk/src/rcstyle.c
@@ -34,57 +34,57 @@ GType noop_type_rc_style = 0;
 void
 noop_rc_style_register_type (GTypeModule *module)
 {
-	if (!noop_type_rc_style) {
-		static const GTypeInfo object_info =
-		{
-			sizeof (NoopRcStyleClass),
-			(GBaseInitFunc) NULL,
-			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) noop_rc_style_class_init,
-			NULL,           /* class_finalize */
-			NULL,           /* class_data */
-			sizeof (NoopRcStyle),
-			0,              /* n_preallocs */
-			(GInstanceInitFunc) noop_rc_style_init,
-			NULL
-		};
-		
-		noop_type_rc_style = g_type_module_register_type (module,
-		                         GTK_TYPE_RC_STYLE,
-		                         "NoopRcStyle",
-		                         &object_info, 0);
-	}
+  if (!noop_type_rc_style) {
+    static const GTypeInfo object_info =
+    {
+      sizeof (NoopRcStyleClass),
+      (GBaseInitFunc) NULL,
+      (GBaseFinalizeFunc) NULL,
+      (GClassInitFunc) noop_rc_style_class_init,
+      NULL,           /* class_finalize */
+      NULL,           /* class_data */
+      sizeof (NoopRcStyle),
+      0,              /* n_preallocs */
+      (GInstanceInitFunc) noop_rc_style_init,
+      NULL
+    };
+
+    noop_type_rc_style = g_type_module_register_type (module,
+                             GTK_TYPE_RC_STYLE,
+                             "NoopRcStyle",
+                             &object_info, 0);
+  }
 }
 
 static void
 noop_rc_style_init (NoopRcStyle *style)
 {
-	/* Initilize any variables of the NoopRcStyle object here */
+  /* Initilize any variables of the NoopRcStyle object here */
 }
 
 static void
 noop_rc_style_finalize (NoopRcStyle *style)
 {
-	/* Clean up any data from the RC style in here. */
+  /* Clean up any data from the RC style in here. */
 }
 
 static void
 noop_rc_style_merge (GtkRcStyle *dest, GtkRcStyle *src)
 {
-	parent_class->merge (dest, src);
-	
-	if (!NOOP_IS_RC_STYLE (src))
-		return;
-
-	/* This function "merges" two RC styles. All matched styles from the
-	 * gtkrc are merged together to form the final style.
-	 *
-	 * Note about the order: The merging happens in REVERSE
-	 * (at least to what I woulde expect).
-	 * Often one will want to keep track of where an option has been set
-	 * and use the version that was set last. For this one needs a bitfield
-	 * and some code to copy when neccessary. (You can refere to eg. Clearlooks
-	 * or other engines in gtk-engines of how this can be handled.) */	
+  parent_class->merge (dest, src);
+
+  if (!NOOP_IS_RC_STYLE (src))
+    return;
+
+  /* This function "merges" two RC styles. All matched styles from the
+   * gtkrc are merged together to form the final style.
+   *
+   * Note about the order: The merging happens in REVERSE
+   * (at least to what I woulde expect).
+   * Often one will want to keep track of where an option has been set
+   * and use the version that was set last. For this one needs a bitfield
+   * and some code to copy when neccessary. (You can refere to eg. Clearlooks
+   * or other engines in gtk-engines of how this can be handled.) */  
 }
 
 static guint
@@ -92,27 +92,27 @@ noop_rc_style_parse (GtkRcStyle   *rc_style,
                      GtkSettings  *settings,
                      GScanner     *scanner)
 {
-	NoopRcStyle *noop_rc_style = NOOP_RC_STYLE (rc_style);
-	
-	return G_TOKEN_NONE;
+  NoopRcStyle *noop_rc_style = NOOP_RC_STYLE (rc_style);
+
+  return G_TOKEN_NONE;
 }
 
 static void
 noop_rc_style_class_init (NoopRcStyleClass *klass)
 {
-	GtkRcStyleClass *rc_style_class = GTK_RC_STYLE_CLASS (klass);
-	GObjectClass    *g_object_class = G_OBJECT_CLASS (klass);
-
-	parent_class = g_type_class_peek_parent (klass);
-
-	/* These are the functions we override from the GtkRcStyle class.
-	 * We need to override at least create_style. (Uncomment the other
-	 * two to override them) */
-	rc_style_class->create_style = noop_rc_style_create_style;
-	/*rc_style_class->merge = noop_rc_style_merge;
-	rc_style_class->parse        = noop_rc_style_parse;
-	
-	g_object_class->finalize     = noop_rc_style_finalize;*/
+  GtkRcStyleClass *rc_style_class = GTK_RC_STYLE_CLASS (klass);
+  GObjectClass    *g_object_class = G_OBJECT_CLASS (klass);
+
+  parent_class = g_type_class_peek_parent (klass);
+
+  /* These are the functions we override from the GtkRcStyle class.
+   * We need to override at least create_style. (Uncomment the other
+   * two to override them) */
+  rc_style_class->create_style = noop_rc_style_create_style;
+  /*rc_style_class->merge = noop_rc_style_merge;
+  rc_style_class->parse        = noop_rc_style_parse;
+
+  g_object_class->finalize     = noop_rc_style_finalize;*/
 }
 
 /* Create an empty style suitable to this RC style
@@ -120,7 +120,7 @@ noop_rc_style_class_init (NoopRcStyleClass *klass)
 static GtkStyle *
 noop_rc_style_create_style (GtkRcStyle *rc_style)
 {
-	return GTK_STYLE (g_object_new (NOOP_TYPE_STYLE, NULL));
+  return GTK_STYLE (g_object_new (NOOP_TYPE_STYLE, NULL));
 }
 
 
diff --git a/monet-gtk/src/rcstyle.h b/monet-gtk/src/rcstyle.h
index 00288c6..c5cbada 100644
--- a/monet-gtk/src/rcstyle.h
+++ b/monet-gtk/src/rcstyle.h
@@ -1,7 +1,7 @@
 /*  Noop GTK engine: rcstyle.h
- *  
+ *
  *  Copyright (C) 2008  Benjamin Berg <benjamin sipsolutions net>
- *  
+ *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
  *  License as published by the Free Software Foundation; either
@@ -38,12 +38,12 @@ GType noop_type_rc_style G_GNUC_INTERNAL;
 
 struct _NoopRcStyle
 {
-	GtkRcStyle parent_instance;
+  GtkRcStyle parent_instance;
 };
 
 struct _NoopRcStyleClass
 {
-	GtkRcStyleClass parent_class;
+  GtkRcStyleClass parent_class;
 };
 
 void noop_rc_style_register_type (GTypeModule *module) G_GNUC_INTERNAL;
diff --git a/monet-gtk/src/style.c b/monet-gtk/src/style.c
index 628a0eb..958ac10 100644
--- a/monet-gtk/src/style.c
+++ b/monet-gtk/src/style.c
@@ -1,7 +1,7 @@
 /*  Noop GTK engine: style.c
- *  
+ *
  *  Copyright (C) 2008  Benjamin Berg <benjamin sipsolutions net>
- *  
+ *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
  *  License as published by the Free Software Foundation; either
@@ -34,7 +34,7 @@ noop_draw_hline  (GtkStyle        *style,
                   gint             x2,
                   gint             y)
 {
-	noop_style_parent_class->draw_vline (style, window, state_type, area, widget, detail, x1, x2, y);
+  noop_style_parent_class->draw_vline (style, window, state_type, area, widget, detail, x1, x2, y);
 }
 /*##################################*/
 
@@ -49,7 +49,7 @@ noop_draw_vline  (GtkStyle        *style,
                   gint             y2,
                   gint             x)
 {
-	noop_style_parent_class->draw_vline (style, window, state_type, area, widget, detail, y1, y2, x);
+  noop_style_parent_class->draw_vline (style, window, state_type, area, widget, detail, y1, y2, x);
 }
 /*##################################*/
 
@@ -66,7 +66,7 @@ noop_draw_shadow (GtkStyle        *style,
                   gint             width,
                   gint             height)
 {
-	noop_style_parent_class->draw_shadow (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
+  noop_style_parent_class->draw_shadow (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
 }
 /*##################################*/
 
@@ -85,7 +85,7 @@ noop_draw_arrow  (GtkStyle        *style,
                   gint             width,
                   gint             height)
 {
-	noop_style_parent_class->draw_arrow (style, window, state_type, shadow_type, area, widget, detail, arrow_type, fill, x, y, width, height);
+  noop_style_parent_class->draw_arrow (style, window, state_type, shadow_type, area, widget, detail, arrow_type, fill, x, y, width, height);
 }
 
 /*##################################*/
@@ -103,7 +103,7 @@ noop_draw_box    (GtkStyle        *style,
                   gint             width,
                   gint             height)
 {
-	noop_style_parent_class->draw_box (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
+  noop_style_parent_class->draw_box (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
 }
 /*##################################*/
 
@@ -120,7 +120,7 @@ noop_draw_flat_box (GtkStyle        *style,
                     gint             width,
                     gint             height)
 {
-	noop_style_parent_class->draw_flat_box (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
+  noop_style_parent_class->draw_flat_box (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
 }
 /*##################################*/
 
@@ -137,7 +137,7 @@ noop_draw_check  (GtkStyle        *style,
                   gint             width,
                   gint             height)
 {
-	noop_style_parent_class->draw_check (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
+  noop_style_parent_class->draw_check (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
 }
 /*##################################*/
 
@@ -154,7 +154,7 @@ noop_draw_option (GtkStyle        *style,
                   gint             width,
                   gint             height)
 {
-	noop_style_parent_class->draw_option (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
+  noop_style_parent_class->draw_option (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
 }
 /*##################################*/
 
@@ -171,7 +171,7 @@ noop_draw_tab (GtkStyle        *style,
                gint             width,
                gint             height)
 {
-	noop_style_parent_class->draw_tab (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
+  noop_style_parent_class->draw_tab (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
 }
 /*##################################*/
 
@@ -191,7 +191,7 @@ noop_draw_shadow_gap (GtkStyle        *style,
                       gint             gap_x,
                       gint             gap_width)
 {
-	noop_style_parent_class->draw_shadow_gap (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side, gap_x, gap_width);
+  noop_style_parent_class->draw_shadow_gap (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side, gap_x, gap_width);
 }
 /*##################################*/
 
@@ -211,7 +211,7 @@ noop_draw_box_gap(GtkStyle        *style,
                   gint             gap_x,
                   gint             gap_width)
 {
-	noop_style_parent_class->draw_shadow_gap (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side, gap_x, gap_width);
+  noop_style_parent_class->draw_shadow_gap (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side, gap_x, gap_width);
 }
 /*##################################*/
 
@@ -229,7 +229,7 @@ noop_draw_extension  (GtkStyle        *style,
                       gint             height,
                       GtkPositionType  gap_side)
 {
-	noop_style_parent_class->draw_extension (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side);
+  noop_style_parent_class->draw_extension (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side);
 }
 /*##################################*/
 
@@ -245,7 +245,7 @@ noop_draw_focus  (GtkStyle        *style,
                   gint             width,
                   gint             height)
 {
-	noop_style_parent_class->draw_focus (style, window, state_type, area, widget, detail, x, y, width, height);
+  noop_style_parent_class->draw_focus (style, window, state_type, area, widget, detail, x, y, width, height);
 }
 /*##################################*/
 
@@ -263,7 +263,7 @@ noop_draw_slider (GtkStyle        *style,
                   gint             height,
                   GtkOrientation   orientation)
 {
-	noop_style_parent_class->draw_slider (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, orientation);
+  noop_style_parent_class->draw_slider (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, orientation);
 }
 /*##################################*/
 
@@ -281,7 +281,7 @@ noop_draw_handle (GtkStyle        *style,
                   gint             height,
                   GtkOrientation   orientation)
 {
-	noop_style_parent_class->draw_handle (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, orientation);
+  noop_style_parent_class->draw_handle (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, orientation);
 }
 /*##################################*/
 
@@ -296,7 +296,7 @@ noop_draw_expander (GtkStyle        *style,
                     gint             y,
                     GtkExpanderStyle expander_style)
 {
-	noop_style_parent_class->draw_expander (style, window, state_type, area, widget, detail, x, y, expander_style);
+  noop_style_parent_class->draw_expander (style, window, state_type, area, widget, detail, x, y, expander_style);
 }
 /*##################################*/
 
@@ -313,63 +313,63 @@ noop_draw_resize_grip (GtkStyle       *style,
                        gint            width,
                        gint            height)
 {
-	noop_style_parent_class->draw_resize_grip (style, window, state_type, area, widget, detail, edge, x, y, width, height);
+  noop_style_parent_class->draw_resize_grip (style, window, state_type, area, widget, detail, edge, x, y, width, height);
 }
 
 
 static void
 noop_style_class_init (NoopStyleClass * klass)
 {
-	GtkStyleClass *style_class = GTK_STYLE_CLASS (klass);
-	
-	noop_style_parent_class = g_type_class_peek_parent (klass);
-	
-	/* All functions that have prototypes here are not commented out. */
-	style_class->draw_hline       = noop_draw_hline;
-	style_class->draw_vline       = noop_draw_vline;
-	style_class->draw_shadow      = noop_draw_shadow;
-	style_class->draw_arrow       = noop_draw_arrow;
-	style_class->draw_box         = noop_draw_box;
-	style_class->draw_flat_box    = noop_draw_flat_box;
-	style_class->draw_check       = noop_draw_check;
-	style_class->draw_option      = noop_draw_option;
-	style_class->draw_tab         = noop_draw_tab;
-	style_class->draw_shadow_gap  = noop_draw_shadow_gap;
-	style_class->draw_box_gap     = noop_draw_box_gap;
-	style_class->draw_extension   = noop_draw_extension;
-	style_class->draw_focus       = noop_draw_focus;
-	style_class->draw_slider      = noop_draw_slider;
-	style_class->draw_handle      = noop_draw_handle;
-	style_class->draw_expander    = noop_draw_expander;
-	style_class->draw_resize_grip = noop_draw_resize_grip;
-	/*style_class->render_icon      = noop_render_icon;
-	style_class->draw_layout      = noop_draw_layout; */
-	
-	/* There are some more functions in GtkStyleClass that may be overridden.
-	 * See gtkstyle.h in the GTK+ sources for a list and help for most of them. */
+  GtkStyleClass *style_class = GTK_STYLE_CLASS (klass);
+
+  noop_style_parent_class = g_type_class_peek_parent (klass);
+
+  /* All functions that have prototypes here are not commented out. */
+  style_class->draw_hline       = noop_draw_hline;
+  style_class->draw_vline       = noop_draw_vline;
+  style_class->draw_shadow      = noop_draw_shadow;
+  style_class->draw_arrow       = noop_draw_arrow;
+  style_class->draw_box         = noop_draw_box;
+  style_class->draw_flat_box    = noop_draw_flat_box;
+  style_class->draw_check       = noop_draw_check;
+  style_class->draw_option      = noop_draw_option;
+  style_class->draw_tab         = noop_draw_tab;
+  style_class->draw_shadow_gap  = noop_draw_shadow_gap;
+  style_class->draw_box_gap     = noop_draw_box_gap;
+  style_class->draw_extension   = noop_draw_extension;
+  style_class->draw_focus       = noop_draw_focus;
+  style_class->draw_slider      = noop_draw_slider;
+  style_class->draw_handle      = noop_draw_handle;
+  style_class->draw_expander    = noop_draw_expander;
+  style_class->draw_resize_grip = noop_draw_resize_grip;
+  /*style_class->render_icon      = noop_render_icon;
+  style_class->draw_layout      = noop_draw_layout; */
+
+  /* There are some more functions in GtkStyleClass that may be overridden.
+   * See gtkstyle.h in the GTK+ sources for a list and help for most of them. */
 }
 
 void
 noop_style_register_type (GTypeModule * module)
 {
-	if (!noop_type_style) {
-		static const GTypeInfo object_info =
-		{
-			sizeof (NoopStyleClass),
-			(GBaseInitFunc) NULL,
-			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) noop_style_class_init,
-			NULL,			/* class_finalize */
-			NULL,			/* class_data */
-			sizeof (NoopStyle),
-			0,				/* n_preallocs */
-			(GInstanceInitFunc) NULL,
-			NULL
-		};
-		
-		noop_type_style = g_type_module_register_type (module,
-		                                                     GTK_TYPE_STYLE,
-		                                                     "NoopStyle",
-		                                                     &object_info, 0);
-	}
+  if (!noop_type_style) {
+    static const GTypeInfo object_info =
+    {
+      sizeof (NoopStyleClass),
+      (GBaseInitFunc) NULL,
+      (GBaseFinalizeFunc) NULL,
+      (GClassInitFunc) noop_style_class_init,
+      NULL,     /* class_finalize */
+      NULL,     /* class_data */
+      sizeof (NoopStyle),
+      0,        /* n_preallocs */
+      (GInstanceInitFunc) NULL,
+      NULL
+    };
+
+    noop_type_style = g_type_module_register_type (module,
+                                                         GTK_TYPE_STYLE,
+                                                         "NoopStyle",
+                                                         &object_info, 0);
+  }
 }
diff --git a/monet-gtk/src/style.h b/monet-gtk/src/style.h
index ae7abd7..ab3708f 100644
--- a/monet-gtk/src/style.h
+++ b/monet-gtk/src/style.h
@@ -1,7 +1,7 @@
 /*  noop GTK engine: style.h
- *  
+ *
  *  Copyright (C) 2008  Benjamin Berg <benjamin sipsolutions net>
- *  
+ *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
  *  License as published by the Free Software Foundation; either
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]