fixed indentation inconsistency by dmitry

diff --git a/src/battery/battery.h b/src/battery/battery.h
index ac979b21eee25f3ef57ad7239c04a7949375611c..71280e1510b69f52bc429d558fbab0fa825ccd39 100644 (file)
--- a/src/battery/battery.h
+++ b/src/battery/battery.h
@@ -18,12 +18,12 @@
 #include "area.h"
 
 typedef struct Battery {
-   // always start with area
-   Area area;
+       // always start with area
+       Area area;
 
-   config_color font;
-   int bat1_posy;
-   int bat2_posy;
+       config_color font;
+       int bat1_posy;
+       int bat2_posy;
 } Battery;
 
 enum chargestate {

diff --git a/src/clock/clock.h b/src/clock/clock.h
index f607f7284f53b1199f81a3782ec14bf0f28c71f7..f521de45020ff9c970c88e4a46f29abba7b52597 100644 (file)
--- a/src/clock/clock.h
+++ b/src/clock/clock.h
@@ -15,12 +15,12 @@
 
 
 typedef struct Clock {
-   // always start with area
-   Area area;
+       // always start with area
+       Area area;
 
-   config_color font;
-   int time1_posy;
-   int time2_posy;
+       config_color font;
+       int time1_posy;
+       int time2_posy;
 } Clock;
 
 

diff --git a/src/panel.h b/src/panel.h
index dff0a03bc43b30098190737bf2da002371407936..9676089beb8dd0fa89a64e55aa64bb65286ea416 100644 (file)
--- a/src/panel.h
+++ b/src/panel.h
@@ -58,39 +58,39 @@ extern Imlib_Image default_icon;
 
 
 typedef struct {
-   // always start with area
-   // area.list own all objects of the panel according to config file
-   Area area;
+       // always start with area
+       // area.list own all objects of the panel according to config file
+       Area area;
 
-   // --------------------------------------------------
-   // panel
-   Window main_win;
-   Pixmap temp_pmap;
+       // --------------------------------------------------
+       // panel
+       Window main_win;
+       Pixmap temp_pmap;
 
-   // position relative to root window
+       // position relative to root window
        int posx, posy;
-   int marginx, marginy;
-   float initial_width, initial_height;
-   int pourcentx, pourcenty;
-   // location of the panel (monitor number)
-   int monitor;
-
-   // --------------------------------------------------
-   // task and taskbar parameter per panel
+       int marginx, marginy;
+       float initial_width, initial_height;
+       int pourcentx, pourcenty;
+       // location of the panel (monitor number)
+       int monitor;
+
+       // --------------------------------------------------
+       // task and taskbar parameter per panel
        Area g_taskbar;
        Global_task g_task;
 
-   // --------------------------------------------------
-   // taskbar point to the first taskbar in panel.area.list.
-   // number of tasbar == nb_desktop
+       // --------------------------------------------------
+       // taskbar point to the first taskbar in panel.area.list.
+       // number of tasbar == nb_desktop
        // taskbar[i] is used to loop over taskbar,
        // while panel->area.list is used to loop over all panel's objects
-   Taskbar *taskbar;
-   int  nb_desktop;
+       Taskbar *taskbar;
+       int  nb_desktop;
 
-   // --------------------------------------------------
-   // clock
-   Clock clock;
+       // --------------------------------------------------
+       // clock
+       Clock clock;
 
        // --------------------------------------------------
        // battery

diff --git a/src/systray/systraybar.h b/src/systray/systraybar.h
index d2e5d32834d21a1ff2e3a00472dfec89176ae4ba..46b56187a2c6c205a46a1e9b2585df4273a72e6d 100644 (file)
--- a/src/systray/systraybar.h
+++ b/src/systray/systraybar.h
@@ -20,8 +20,8 @@
 
 
 typedef struct {
-   // always start with area
-   Area area;
+       // always start with area
+       Area area;
 
        GSList *list_icons;
        int sort;
@@ -30,9 +30,9 @@ typedef struct {
 
 typedef struct
 {
-   Window id;
-   int x, y;
-   int width, height;
+       Window id;
+       int x, y;
+       int width, height;
        int hide;
 } TrayWindow;
 

diff --git a/src/taskbar/taskbar.h b/src/taskbar/taskbar.h
index 2a08c27872bdfae842b07e6dc13cfcf6791ceb3f..67733db5f92b46479edf03efe113d2de4f631726 100644 (file)
--- a/src/taskbar/taskbar.h
+++ b/src/taskbar/taskbar.h
@@ -12,15 +12,15 @@
 
 
 typedef struct {
-   // always start with area
-   Area area;
+       // always start with area
+       Area area;
 
-   int desktop;
+       int desktop;
 
-   // task parameters
-   int task_width;
-   int task_modulo;
-   int text_width;
+       // task parameters
+       int task_width;
+       int task_modulo;
+       int text_width;
 } Taskbar;
 
 

diff --git a/src/tint2conf/main.c b/src/tint2conf/main.c
index 15c96340d0c38156ea9fea3d011fd7d2bec90fa1..21bf898885f8b9a91dcfaa003e9a734734a3bbe4 100644 (file)
--- a/src/tint2conf/main.c
+++ b/src/tint2conf/main.c
@@ -69,34 +69,34 @@ static void loadDir();
 
 // define menubar and toolbar
 static const char *fallback_ui_file =
-        "<ui>"
-        "  <menubar name='MenuBar'>"
-        "    <menu action='ThemeMenu'>"
-        "      <menuitem action='ThemeAdd'/>"
-        "      <menuitem action='ThemeSaveAs'/>"
-        "      <separator/>"
-        "      <menuitem action='ThemeProperties'/>"
-        "      <menuitem action='ThemeRename'/>"
-        "      <separator/>"
-        "      <menuitem action='ThemeDelete'/>"
-        "      <separator/>"
-        "      <menuitem action='ThemeQuit'/>"
-        "    </menu>"
-        "    <menu action='ViewMenu'>"
-        "      <menuitem action='ViewRefresh'/>"
-        "      <menuitem action='ViewRefreshAll'/>"
-        "    </menu>"
-        "    <menu action='HelpMenu'>"
-        "      <menuitem action='HelpAbout'/>"
-        "    </menu>"
-        "  </menubar>"
-        "  <toolbar  name='ToolBar'>"
-        "    <toolitem action='ViewRefreshAll'/>"
-        "    <separator/>"
-        "    <toolitem action='ThemeProperties'/>"
-        "    <toolitem action='ViewApply'/>"
-        "  </toolbar>"
-        "</ui>";
+       "<ui>"
+       "  <menubar name='MenuBar'>"
+       "    <menu action='ThemeMenu'>"
+       "      <menuitem action='ThemeAdd'/>"
+       "      <menuitem action='ThemeSaveAs'/>"
+       "      <separator/>"
+       "      <menuitem action='ThemeProperties'/>"
+       "      <menuitem action='ThemeRename'/>"
+       "      <separator/>"
+       "      <menuitem action='ThemeDelete'/>"
+       "      <separator/>"
+       "      <menuitem action='ThemeQuit'/>"
+       "    </menu>"
+       "    <menu action='ViewMenu'>"
+       "      <menuitem action='ViewRefresh'/>"
+       "      <menuitem action='ViewRefreshAll'/>"
+       "    </menu>"
+       "    <menu action='HelpMenu'>"
+       "      <menuitem action='HelpAbout'/>"
+       "    </menu>"
+       "  </menubar>"
+       "  <toolbar  name='ToolBar'>"
+       "    <toolitem action='ViewRefreshAll'/>"
+       "    <separator/>"
+       "    <toolitem action='ThemeProperties'/>"
+       "    <toolitem action='ViewApply'/>"
+       "  </toolbar>"
+       "</ui>";
 
 // define menubar and toolbar action
 static GtkActionEntry entries[] = {

diff --git a/src/util/area.h b/src/util/area.h
index c5c833805dfea2319ce6b2cbb9bada3722b8b3a0..52a8c492492b0126fbff39b5928a60b3ff38d74f 100644 (file)
--- a/src/util/area.h
+++ b/src/util/area.h
@@ -27,58 +27,58 @@
 
 typedef struct
 {
-   double color[3];
-   double alpha;
-   int width;
-   int rounded;
+       double color[3];
+       double alpha;
+       int width;
+       int rounded;
 } Border;
 
 
 typedef struct
 {
-   double color[3];
-   double alpha;
+       double color[3];
+       double alpha;
 } Color;
 
 
 typedef struct
 {
-   Pixmap pmap;
-   Color back;
-   Border border;
+       Pixmap pmap;
+       Color back;
+       Border border;
 } Pmap;
 
 
 typedef struct {
-   // absolute coordinate in panel
-   int posx, posy;
-   // width and height including border
-   int width, height;
-   Pmap pix;
-   Pmap pix_active;
+       // absolute coordinate in panel
+       int posx, posy;
+       // width and height including border
+       int width, height;
+       Pmap pix;
+       Pmap pix_active;
 
-   // list of child : Area object
-   GSList *list;
+       // list of child : Area object
+       GSList *list;
 
        int on_screen;
        // need compute position and width
        int resize;
-   // need redraw Pixmap
-   int redraw;
-   int use_active, is_active;
-   // paddingxlr = horizontal padding left/right
-   // paddingx = horizontal padding between childs
-   int paddingxlr, paddingx, paddingy;
-   // parent Area
-   void *parent;
-   // panel
-   void *panel;
-
-   // each object can overwrite following function
-   void (*_draw_foreground)(void *obj, cairo_t *c, int active);
-   void (*_resize)(void *obj);
-   void (*_add_child)(void *obj);
-   int (*_remove_child)(void *obj);
+       // need redraw Pixmap
+       int redraw;
+       int use_active, is_active;
+       // paddingxlr = horizontal padding left/right
+       // paddingx = horizontal padding between childs
+       int paddingxlr, paddingx, paddingy;
+       // parent Area
+       void *parent;
+       // panel
+       void *panel;
+
+       // each object can overwrite following function
+       void (*_draw_foreground)(void *obj, cairo_t *c, int active);
+       void (*_resize)(void *obj);
+       void (*_add_child)(void *obj);
+       int (*_remove_child)(void *obj);
 } Area;
 
 

diff --git a/src/util/common.h b/src/util/common.h
index fd22c55f7564d7a87556589921d4ecbc9ff069f2..16e16690625b642e598aefd3034f45f13aa91fda 100644 (file)
--- a/src/util/common.h
+++ b/src/util/common.h
@@ -36,17 +36,17 @@ enum { NONE=0, CLOSE, TOGGLE, ICONIFY, SHADE, TOGGLE_ICONIFY, MAXIMIZE_RESTORE,
 
 typedef struct config_border
 {
-   double color[3];
-   double alpha;
-   int width;
-   int rounded;
+       double color[3];
+       double alpha;
+       int width;
+       int rounded;
 } config_border;
 
 
 typedef struct config_color
 {
-   double color[3];
-   double alpha;
+       double color[3];
+       double alpha;
 } config_color;