Cleaning up HildonHVolumebar. Defines fixes in HildonVVolumebar.

diff --git a/ChangeLog b/ChangeLog
index fb908b2..4ea6683 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-12-12  Michael Dominic K.  <mdk@mdk.am> 
+
+       * TODO: 
+       * src/hildon-hvolumebar.c:
+       * src/hildon-hvolumebar.h: Cleaning up.
+
+       * src/hildon-vvolumebar.c: Defines fixes.
+
 2006-12-12  Michael Dominic Kostrzewa  <michael.kostrzewa@nokia.com> 
 
        * TODO: Removing cleaned stuff.

diff --git a/TODO b/TODO
index 8d09a7b..ee9e82b 100644 (file)
--- a/TODO
+++ b/TODO
@@ -33,8 +33,6 @@
   hildon-font-selection-dialog.h
   hildon-get-password-dialog.c
   hildon-get-password-dialog.h
-  hildon-hvolumebar.c
-  hildon-hvolumebar.h
   hildon-input-mode-hint.h
   hildon-marshalers.list
   hildon-name-password-dialog.c

diff --git a/src/hildon-hvolumebar.c b/src/hildon-hvolumebar.c
index a7e3647..cd61957 100644 (file)
--- a/src/hildon-hvolumebar.c
+++ b/src/hildon-hvolumebar.c
@@ -32,113 +32,133 @@
  * a mute icon which users can click to mute the sound.
  */
 
-
-/* Horizontal volumebar subclass */
-
-#include <config.h>
-#include "hildon-hvolumebar.h"
-#include "hildon-volumebar.h"
-#include "hildon-volumebar-range.h"
-#include "hildon-volumebar-private.h"
-#include <gtk/gtktoolbar.h>
+#include                                        "hildon-hvolumebar.h"
+#include                                        "hildon-volumebar.h"
+#include                                        "hildon-volumebar-range.h"
+#include                                        "hildon-volumebar-private.h"
+#include                                        <gtk/gtktoolbar.h>
 
 /* Defines for normal version of HVolumebar */
 /* Toggle button */
-#define DEFAULT_TBUTTON_WIDTH  26
-#define DEFAULT_TBUTTON_HEIGHT 26
+
+#define                                         DEFAULT_TBUTTON_WIDTH 26
+
+#define                                         DEFAULT_TBUTTON_HEIGHT 26
+
 /* Volume bar */
-#define MINIMUM_BAR_WIDTH     147
-#define DEFAULT_BAR_HEIGHT     58
-#define DEFAULT_ENDING_SIZE    20
+#define                                         MINIMUM_BAR_WIDTH 147
+
+#define                                         DEFAULT_BAR_HEIGHT 58
+
+#define                                         DEFAULT_ENDING_SIZE 20
 
 /* Gap to leave for mute button */
-#define VERTICAL_MUTE_GAP      16
-#define HORIZONTAL_MUTE_GAP     6
+#define                                         VERTICAL_MUTE_GAP 16
+
+#define                                         HORIZONTAL_MUTE_GAP 6
 
 /* Sizes inside a toolbar */
 /* Toggle button */
-#define TOOL_DEFAULT_TBUTTON_WIDTH  26
-#define TOOL_DEFAULT_TBUTTON_HEIGHT 26
+
+#define                                         TOOL_DEFAULT_TBUTTON_WIDTH 26
+
+#define                                         TOOL_DEFAULT_TBUTTON_HEIGHT 26
+
 /* Volumebar */
-#define TOOL_MINIMUM_BAR_WIDTH     121
-#define TOOL_DEFAULT_BAR_HEIGHT     40
-#define TOOL_DEFAULT_ENDING_SIZE     0
-#define TOOL_VERTICAL_MUTE_GAP ((TOOL_DEFAULT_BAR_HEIGHT - TOOL_DEFAULT_TBUTTON_HEIGHT) / 2)
 
-static HildonVolumebarClass *parent_class;
-static void hildon_hvolumebar_class_init(HildonHVolumebarClass * klass);
-static void hildon_hvolumebar_init(HildonHVolumebar * hvolumebar);
+#define                                         TOOL_MINIMUM_BAR_WIDTH 121
+
+#define                                         TOOL_DEFAULT_BAR_HEIGHT 40
 
-static gboolean hildon_hvolumebar_expose(GtkWidget * widget,
-                                         GdkEventExpose * event);
-static void hildon_hvolumebar_size_request(GtkWidget * widget,
-                                           GtkRequisition * requisition);
-static void hildon_hvolumebar_size_allocate(GtkWidget * widget,
-                                            GtkAllocation * allocation);
-static void hildon_hvolumebar_map(GtkWidget * widget);
+#define                                         TOOL_DEFAULT_ENDING_SIZE 0
 
+#define                                         TOOL_VERTICAL_MUTE_GAP \
+                                                ((TOOL_DEFAULT_BAR_HEIGHT - TOOL_DEFAULT_TBUTTON_HEIGHT) / 2)
 
-GType hildon_hvolumebar_get_type(void)
+static HildonVolumebarClass*                    parent_class;
+
+static void 
+hildon_hvolumebar_class_init                    (HildonHVolumebarClass *klass);
+
+static void 
+hildon_hvolumebar_init                          (HildonHVolumebar *hvolumebar);
+
+static gboolean
+hildon_hvolumebar_expose                        (GtkWidget *widget,
+                                                 GdkEventExpose *event);
+static void 
+hildon_hvolumebar_size_request                  (GtkWidget *widget,
+                                                 GtkRequisition *requisition);
+static void 
+hildon_hvolumebar_size_allocate                 (GtkWidget *widget,
+                                                 GtkAllocation *allocation);
+static void 
+hildon_hvolumebar_map                           (GtkWidget *widget);
+
+
+GType G_GNUC_CONST
+hildon_hvolumebar_get_type                      (void)
 {
     static GType type = 0;
 
     if (!type) {
         static const GTypeInfo info = {
-            sizeof(HildonHVolumebarClass),
+            sizeof (HildonHVolumebarClass),
             NULL,       /* base_init */
             NULL,       /* base_finalize */
             (GClassInitFunc) hildon_hvolumebar_class_init,     /* class_init */
             NULL,       /* class_finalize */
             NULL,       /* class_data */
-            sizeof(HildonHVolumebar),
+            sizeof (HildonHVolumebar),
             0,
             (GInstanceInitFunc) hildon_hvolumebar_init,
         };
-        type = g_type_register_static(HILDON_TYPE_VOLUMEBAR,
-                                      "HildonHVolumebar", &info, 0);
+        type = g_type_register_static (HILDON_TYPE_VOLUMEBAR,
+                "HildonHVolumebar", &info, 0);
     }
     return type;
 }
 
-
-static void hildon_hvolumebar_class_init(HildonHVolumebarClass * klass)
+static void
+hildon_hvolumebar_class_init                    (HildonHVolumebarClass *klass)
 {
-    GtkWidgetClass *volumebar_class = GTK_WIDGET_CLASS(klass);
+    GtkWidgetClass *volumebar_class = GTK_WIDGET_CLASS (klass);
 
-    parent_class = g_type_class_peek_parent(klass);
+    parent_class = g_type_class_peek_parent (klass);
 
-    volumebar_class->size_request = hildon_hvolumebar_size_request;
-    volumebar_class->size_allocate = hildon_hvolumebar_size_allocate;
-    volumebar_class->map = hildon_hvolumebar_map;
-    volumebar_class->expose_event = hildon_hvolumebar_expose;
+    volumebar_class->size_request   = hildon_hvolumebar_size_request;
+    volumebar_class->size_allocate  = hildon_hvolumebar_size_allocate;
+    volumebar_class->map            = hildon_hvolumebar_map;
+    volumebar_class->expose_event   = hildon_hvolumebar_expose;
 }
 
-
-static void hildon_hvolumebar_init(HildonHVolumebar * hvolumebar)
+static void 
+hildon_hvolumebar_init                          (HildonHVolumebar *hvolumebar)
 {
     HildonVolumebarPrivate *priv;
 
-    priv = HILDON_VOLUMEBAR_GET_PRIVATE(hvolumebar);
+    priv = HILDON_VOLUMEBAR_GET_PRIVATE (hvolumebar);
 
     priv->volumebar =
         HILDON_VOLUMEBAR_RANGE(hildon_volumebar_range_new
-                               (GTK_ORIENTATION_HORIZONTAL));
+                (GTK_ORIENTATION_HORIZONTAL));
 
-    GTK_WIDGET_UNSET_FLAGS(GTK_WIDGET(hvolumebar), GTK_CAN_FOCUS);
+    GTK_WIDGET_UNSET_FLAGS (GTK_WIDGET (hvolumebar), GTK_CAN_FOCUS);
 
-    gtk_widget_set_parent(GTK_WIDGET(priv->tbutton), GTK_WIDGET(hvolumebar));
-    gtk_widget_set_parent(GTK_WIDGET(priv->volumebar), GTK_WIDGET(hvolumebar));
+    gtk_widget_set_parent (GTK_WIDGET (priv->tbutton), GTK_WIDGET (hvolumebar));
+    gtk_widget_set_parent (GTK_WIDGET (priv->volumebar), GTK_WIDGET (hvolumebar));
 
-    gtk_scale_set_draw_value(GTK_SCALE(priv->volumebar), FALSE);
+    gtk_scale_set_draw_value (GTK_SCALE (priv->volumebar), FALSE);
 
     /* Signals */
-    g_signal_connect_swapped(G_OBJECT(priv->volumebar), "value-changed",
-                             G_CALLBACK(hildon_volumebar_level_change),
-                             hvolumebar);
-    g_signal_connect_swapped(priv->tbutton, "toggled",
-        G_CALLBACK(hildon_volumebar_mute_toggled), hvolumebar);
+    g_signal_connect_swapped (G_OBJECT (priv->volumebar), "value-changed",
+            G_CALLBACK(hildon_volumebar_level_change),
+            hvolumebar);
+
+    g_signal_connect_swapped (priv->tbutton, "toggled",
+            G_CALLBACK (hildon_volumebar_mute_toggled), hvolumebar);
 
-    gtk_widget_show(GTK_WIDGET(priv->volumebar));
+    gtk_widget_show (GTK_WIDGET (priv->volumebar));
 }
 
 /**
@@ -148,48 +168,52 @@ static void hildon_hvolumebar_init(HildonHVolumebar * hvolumebar)
  *
  * Returns: a new #HildonHVolumebar
  */
-GtkWidget *hildon_hvolumebar_new(void)
+GtkWidget*
+hildon_hvolumebar_new                           (void)
 {
-    return GTK_WIDGET(g_object_new(HILDON_TYPE_HVOLUMEBAR, NULL));
+    return GTK_WIDGET (g_object_new(HILDON_TYPE_HVOLUMEBAR, NULL));
 }
 
-static void hildon_hvolumebar_map(GtkWidget * widget)
+static void 
+hildon_hvolumebar_map                           (GtkWidget* widget)
 {
     HildonVolumebarPrivate *priv;
     GtkWidget *parent;
 
-    g_assert(HILDON_IS_HVOLUMEBAR(widget));
-
     priv = HILDON_VOLUMEBAR_GET_PRIVATE(widget);
-    parent = gtk_widget_get_ancestor(GTK_WIDGET(widget), GTK_TYPE_TOOLBAR);
+    g_assert (priv);
+
+    parent = gtk_widget_get_ancestor (GTK_WIDGET (widget), GTK_TYPE_TOOLBAR);
 
     /* Check if the volumebar is in a toolbar */
     if (parent)
         priv->is_toolbar = TRUE;
 
-    GTK_WIDGET_CLASS(parent_class)->map(widget);
+    GTK_WIDGET_CLASS (parent_class)->map (widget);
 }
 
-static gboolean hildon_hvolumebar_expose(GtkWidget * widget,
-                                         GdkEventExpose * event)
+static gboolean 
+hildon_hvolumebar_expose                        (GtkWidget * widget,
+                                                 GdkEventExpose * event)
 {
     HildonVolumebarPrivate *priv;
 
-    g_assert(HILDON_IS_HVOLUMEBAR(widget));
-
     priv = HILDON_VOLUMEBAR_GET_PRIVATE(HILDON_VOLUMEBAR(widget));
+    g_assert (priv);
 
-    if (GTK_WIDGET_DRAWABLE(widget)) {
+    if (GTK_WIDGET_DRAWABLE (widget)) {
         /* Paint background */
-        gtk_paint_box(widget->style, widget->window,
-                      GTK_WIDGET_STATE(priv->volumebar), GTK_SHADOW_OUT,
-                      NULL, widget, "background",
-                      widget->allocation.x,
-                      widget->allocation.y,
-                      widget->allocation.width,
-                      widget->allocation.height);
-
-       /* The contents of the widget can paint themselves */
+        gtk_paint_box (widget->style, widget->window,
+                GTK_WIDGET_STATE (priv->volumebar), GTK_SHADOW_OUT,
+                NULL, widget, "background",
+                widget->allocation.x,
+                widget->allocation.y,
+                widget->allocation.width,
+                widget->allocation.height);
+
+
+        /* The contents of the widget can paint themselves */
+        /* FIXME Not sure if this is even needed here */
         (*GTK_WIDGET_CLASS(parent_class)->expose_event) (widget, event);
     }
 
@@ -197,51 +221,51 @@ static gboolean hildon_hvolumebar_expose(GtkWidget * widget,
 }
 
 static void
-hildon_hvolumebar_size_request(GtkWidget * widget,
-                               GtkRequisition * requisition)
+hildon_hvolumebar_size_request                  (GtkWidget * widget,
+                                                 GtkRequisition * requisition)
 {
     HildonVolumebarPrivate *priv;
 
-    g_assert(HILDON_IS_HVOLUMEBAR(widget));
-
     priv = HILDON_VOLUMEBAR_GET_PRIVATE(HILDON_VOLUMEBAR(widget));
+    g_assert (priv);
 
     /* Volumebar has different dimensions in toolbar */
     requisition->width = (priv->is_toolbar
-                          ? TOOL_MINIMUM_BAR_WIDTH
-                          : MINIMUM_BAR_WIDTH);
+            ? TOOL_MINIMUM_BAR_WIDTH
+            : MINIMUM_BAR_WIDTH);
+
     requisition->height = (priv->is_toolbar
-                           ? TOOL_DEFAULT_BAR_HEIGHT
-                           : DEFAULT_BAR_HEIGHT);
+            ? TOOL_DEFAULT_BAR_HEIGHT
+            : DEFAULT_BAR_HEIGHT);
 }
 
 static void
-hildon_hvolumebar_size_allocate(GtkWidget * widget,
-                                GtkAllocation * allocation)
+hildon_hvolumebar_size_allocate                 (GtkWidget * widget,
+                                                 GtkAllocation * allocation)
 {
     HildonVolumebarPrivate *priv;
     GtkAllocation button_allocation, range_allocation;
 
-    g_assert(HILDON_IS_HVOLUMEBAR(widget));
-
     priv = HILDON_VOLUMEBAR_GET_PRIVATE(widget);
-    
+    g_assert (priv);
+
     button_allocation.x = 0;
     button_allocation.width = 0;
-    
+
     /* Center the widget vertically */
     if (priv->is_toolbar && allocation->height > TOOL_DEFAULT_BAR_HEIGHT) {
         allocation->y += (allocation->height - TOOL_DEFAULT_BAR_HEIGHT) / 2;
         allocation->height = TOOL_DEFAULT_BAR_HEIGHT;
     }
+
     if (!priv->is_toolbar && allocation->height > DEFAULT_BAR_HEIGHT) {
         allocation->y += (allocation->height - DEFAULT_BAR_HEIGHT) / 2;
         allocation->height = DEFAULT_BAR_HEIGHT;
     }
 
-    GTK_WIDGET_CLASS(parent_class)->size_allocate(widget, allocation);
+    GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation);
 
-    if (priv->tbutton && GTK_WIDGET_VISIBLE(priv->tbutton)) {
+    if (priv->tbutton && GTK_WIDGET_VISIBLE (priv->tbutton)) {
 
         /* Allocate space for the mute button */
         if (priv->is_toolbar) {
@@ -255,77 +279,78 @@ hildon_hvolumebar_size_allocate(GtkWidget * widget,
             button_allocation.width = DEFAULT_TBUTTON_WIDTH;
             button_allocation.height = DEFAULT_TBUTTON_HEIGHT;
         }
-        gtk_widget_size_allocate(GTK_WIDGET(priv->tbutton),
-                                 &button_allocation);
+        gtk_widget_size_allocate (GTK_WIDGET (priv->tbutton),
+                &button_allocation);
     }
-    if (priv->volumebar && GTK_WIDGET_VISIBLE(priv->volumebar)) {
+    if (priv->volumebar && GTK_WIDGET_VISIBLE (priv->volumebar)) {
 
         /* Allocate space for the slider */
         range_allocation.y = allocation->y;
-        
-        if (priv->tbutton && GTK_WIDGET_VISIBLE(priv->tbutton))
+
+        if (priv->tbutton && GTK_WIDGET_VISIBLE (priv->tbutton))
         {
-           /* Leave room for the mute button */
+            /* Leave room for the mute button */
             range_allocation.x = button_allocation.x
-                                 + button_allocation.width
-                                 + HORIZONTAL_MUTE_GAP;
-        
+                + button_allocation.width
+                + HORIZONTAL_MUTE_GAP;
+
             if (priv->is_toolbar) 
             {
-               /* In toolbar with mute button */
+                /* In toolbar with mute button */
                 range_allocation.width = MAX(0,
-                                           allocation->width
-                                           - 2 * TOOL_DEFAULT_ENDING_SIZE
-                                           - TOOL_DEFAULT_TBUTTON_WIDTH
-                                           - HORIZONTAL_MUTE_GAP);
-                                         
+                        allocation->width
+                        - 2 * TOOL_DEFAULT_ENDING_SIZE
+                        - TOOL_DEFAULT_TBUTTON_WIDTH
+                        - HORIZONTAL_MUTE_GAP);
+
                 range_allocation.height = TOOL_DEFAULT_BAR_HEIGHT;
-            
+
             } 
-            
+
             else 
             {
-               /* Standalone with mute button */
+                /* Standalone with mute button */
                 range_allocation.width = MAX(0,
-                                             allocation->width
-                                             - 2 * DEFAULT_ENDING_SIZE
-                                             - DEFAULT_TBUTTON_WIDTH
-                                             - HORIZONTAL_MUTE_GAP);
+                        allocation->width
+                        - 2 * DEFAULT_ENDING_SIZE
+                        - DEFAULT_TBUTTON_WIDTH
+                        - HORIZONTAL_MUTE_GAP);
 
                 range_allocation.height = DEFAULT_BAR_HEIGHT;
             }
-        
+
         }
-        
+
         else
         {
             if (priv->is_toolbar) 
             {
                 /* In toolbar without mute button */
                 range_allocation.x = allocation->x;
-                
+
                 range_allocation.width = MAX(0,
-                                        allocation->width
-                                        - 2 * TOOL_DEFAULT_ENDING_SIZE );
-                                         
+                        allocation->width
+                        - 2 * TOOL_DEFAULT_ENDING_SIZE );
+
                 range_allocation.height = TOOL_DEFAULT_BAR_HEIGHT;
-            
+
             } 
-            
+
             else 
             {
                 /* Standalone without mute button */
                 range_allocation.x = allocation->x + DEFAULT_ENDING_SIZE;
-                
+
                 range_allocation.width = MAX(0,
-                                             allocation->width
-                                             - 2 * DEFAULT_ENDING_SIZE );
+                        allocation->width
+                        - 2 * DEFAULT_ENDING_SIZE );
 
                 range_allocation.height = DEFAULT_BAR_HEIGHT;
             }
         }
 
-        gtk_widget_size_allocate(GTK_WIDGET(priv->volumebar),
-                                 &range_allocation);
+        gtk_widget_size_allocate (GTK_WIDGET (priv->volumebar),
+                &range_allocation);
     }
 }
+

diff --git a/src/hildon-hvolumebar.h b/src/hildon-hvolumebar.h
index a8cc5e3..02c82fb 100644 (file)
--- a/src/hildon-hvolumebar.h
+++ b/src/hildon-hvolumebar.h
@@ -22,37 +22,51 @@
  *
  */
 
-#ifndef __HILDON_HVOLUMEBAR_H__
-#define __HILDON_HVOLUMEBAR_H__
+#ifndef                                         __HILDON_HVOLUMEBAR_H__
+#define                                         __HILDON_HVOLUMEBAR_H__
 
-#include "hildon-volumebar.h"
+#include                                        "hildon-volumebar.h"
 
 G_BEGIN_DECLS
 
-#define HILDON_TYPE_HVOLUMEBAR ( hildon_hvolumebar_get_type() )
-#define HILDON_HVOLUMEBAR(obj) (GTK_CHECK_CAST (obj,\
-        HILDON_TYPE_HVOLUMEBAR, HildonHVolumebar))
-#define HILDON_HVOLUMEBAR_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass),\
-        HILDON_TYPE_HVOLUMEBAR, HildonHVolumebarClass))
-#define HILDON_IS_HVOLUMEBAR(obj) (GTK_CHECK_TYPE (obj,\
-        HILDON_TYPE_HVOLUMEBAR))
-#define HILDON_IS_HVOLUMEBAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass),\
-        HILDON_TYPE_HVOLUMEBAR))
-
-typedef struct _HildonHVolumebar HildonHVolumebar;
-typedef struct _HildonHVolumebarClass HildonHVolumebarClass;
-
-struct _HildonHVolumebar {
-    /* This is our parent class */
-    HildonVolumebar volumebar;
+#define                                         HILDON_TYPE_HVOLUMEBAR (hildon_hvolumebar_get_type())
+
+#define                                         HILDON_HVOLUMEBAR(obj) (GTK_CHECK_CAST (obj,\
+                                                HILDON_TYPE_HVOLUMEBAR, HildonHVolumebar))
+
+#define                                         HILDON_HVOLUMEBAR_CLASS(klass) \
+                                                (GTK_CHECK_CLASS_CAST ((klass),\
+                                                HILDON_TYPE_HVOLUMEBAR, HildonHVolumebarClass))
+
+#define                                         HILDON_IS_HVOLUMEBAR(obj) (GTK_CHECK_TYPE (obj,\
+                                                HILDON_TYPE_HVOLUMEBAR))
+
+#define                                         HILDON_IS_HVOLUMEBAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass),\
+                                                HILDON_TYPE_HVOLUMEBAR))
+
+#define                                         HILDON_HVOLUMEBAR_GET_CLASS(obj) \
+                                                ((HildonHVolumebarClass *) G_OBJECT_GET_CLASS(obj))
+
+typedef struct                                  _HildonHVolumebar HildonHVolumebar;
+
+typedef struct                                  _HildonHVolumebarClass HildonHVolumebarClass;
+
+struct                                          _HildonHVolumebar 
+{
+    HildonVolumebar parent;
 };
 
-struct _HildonHVolumebarClass {
+struct                                          _HildonHVolumebarClass 
+{
     HildonVolumebarClass parent_class;
 };
 
-GType hildon_hvolumebar_get_type(void) G_GNUC_CONST;
-GtkWidget *hildon_hvolumebar_new(void);
+GType G_GNUC_CONST 
+hildon_hvolumebar_get_type                      (void);
+
+GtkWidget*
+hildon_hvolumebar_new                           (void);
 
 G_END_DECLS
-#endif /* __HILDON_HVOLUMEBAR_H__ */
+
+#endif                                          /* __HILDON_HVOLUMEBAR_H__ */

diff --git a/src/hildon-vvolumebar.c b/src/hildon-vvolumebar.c
index fa75da0..2154bbe 100644 (file)
--- a/src/hildon-vvolumebar.c
+++ b/src/hildon-vvolumebar.c
@@ -38,17 +38,23 @@
 #include                                        "hildon-volumebar-private.h"
 
 /* Volume bar */
-#define DEFAULT_BAR_WIDTH                       58
-#define MINIMUM_BAR_HEIGHT                      165
+#define                                         DEFAULT_BAR_WIDTH 58
+
+#define                                         MINIMUM_BAR_HEIGHT 165
 
 /* Toggle button */
-#define DEFAULT_VERTICAL_TBUTTON_WIDTH          26
-#define DEFAULT_VERTICAL_TBUTTON_HEIGHT         26
-#define DEFAULT_ENDING_SIZE                     20
+
+#define                                         DEFAULT_VERTICAL_TBUTTON_WIDTH 26
+
+#define                                         DEFAULT_VERTICAL_TBUTTON_HEIGHT 26
+
+#define                                         DEFAULT_ENDING_SIZE 20
 
 /* Gap to leave for mute button */
-#define HORIZONTAL_MUTE_GAP                     16
-#define VERTICAL_MUTE_GAP                       6
+
+#define                                         HORIZONTAL_MUTE_GAP 16
+
+#define                                         VERTICAL_MUTE_GAP 6
 
 static HildonVolumebarClass*                    parent_class;