Cleanup volume bars,

* hildon-widgets/hildon-volumebar.h: removed unused #include
        + coding style cleanup

        * hildon-widgets/hildon-volumebar.c
        (_hildon_volumebar_mute_toggled): new function. Sends mute-toggled
        signal to widget.
        (hildon_child_forall): use g_assert instead of g_return_if_fail

        * hildon-widgets/hildon-volumebar-range.h: removed unused #include
        + coding style cleanup

        * hildon-widgets/hildon-volumebar-private.h:
        added missing #include.
        added _hildon_volumebar_mute_toggled.
        (struct _HildonVolumebarPrivate): removed 'orientation' field (unused)

        * hildon-widgets/hildon-vvolumebar.h: removed unused #include
        + coding style cleanup

        * hildon-widgets/hildon-vvolumebar.c
        (hildon_vvolumebar_size_request)
        (hildon_vvolumebar_size_allocate)
        (hildon_vvolumebar_expose): use g_assert instead of g_return_if_fail

        * hildon-widgets/hildon-vvolumebar.c (hildon_vvolumebar_mute): removed (unused).

        * hildon-widgets/hildon-vvolumebar.c: removed unused #include
        (vvolumebar_class_init): renamed to hildon_vvolumebar_class_init
        (vvolumebar_init): renamed to hildon_vvolumebar_init
        (hildon_vvolumebar_init): removed unused 'orientation'
        initialisation. Use _hildon_volumebar_mute_toggled instead of
        removed hildon_vvolumebar_mute.

        * hildon-widgets/hildon-hvolumebar.h: removed unused #include

        * hildon-widgets/hildon-hvolumebar.c (hvolumebar_class_init):
        renamed to hildon_hvolumebar_class_init

        * hildon-widgets/hildon-hvolumebar.c (hvolumebar_init): renamed to
        hildon_hvolumebar_init

        * hildon-widgets/hildon-hvolumebar.c (hildon_hvolumebar_mute):
        removed (unused).

        * hildon-widgets/hildon-hvolumebar.c (hildon_hvolumebar_init):
        removed unused 'orientation' initialisation.

        * hildon-widgets/hildon-hvolumebar.c (hildon_hvolumebar_init): use
        _hildon_volumebar_mute_toggled instead of removed
        hildon_hvolumebar_mute.

diff --git a/ChangeLog b/ChangeLog
index 0d4e69d..3580fd8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -67,6 +67,66 @@
 
 
 2006-03-02  Luc Pionchon  <luc.pionchon@nokia.com>
+       
+        Cleanup volume bars,
+
+       * hildon-widgets/hildon-volumebar.h: removed unused #include
+       + coding style cleanup
+
+       * hildon-widgets/hildon-volumebar.c
+       (_hildon_volumebar_mute_toggled): new function. Sends mute-toggled
+       signal to widget.
+       (hildon_child_forall): use g_assert instead of g_return_if_fail
+
+       * hildon-widgets/hildon-volumebar-range.h: removed unused #include
+       + coding style cleanup
+
+       * hildon-widgets/hildon-volumebar-private.h:
+       added missing #include.
+       added _hildon_volumebar_mute_toggled.
+       (struct _HildonVolumebarPrivate): removed 'orientation' field (unused)
+
+
+       
+       * hildon-widgets/hildon-vvolumebar.h: removed unused #include
+       + coding style cleanup
+
+       * hildon-widgets/hildon-vvolumebar.c
+       (hildon_vvolumebar_size_request)
+       (hildon_vvolumebar_size_allocate)
+       (hildon_vvolumebar_expose): use g_assert instead of g_return_if_fail
+
+       * hildon-widgets/hildon-vvolumebar.c (hildon_vvolumebar_mute): removed (unused).
+       
+       * hildon-widgets/hildon-vvolumebar.c: removed unused #include
+       (vvolumebar_class_init): renamed to hildon_vvolumebar_class_init
+       (vvolumebar_init): renamed to hildon_vvolumebar_init
+       (hildon_vvolumebar_init): removed unused 'orientation'
+       initialisation. Use _hildon_volumebar_mute_toggled instead of
+       removed hildon_vvolumebar_mute.
+
+
+       
+       * hildon-widgets/hildon-hvolumebar.h: removed unused #include
+       
+       * hildon-widgets/hildon-hvolumebar.c (hvolumebar_class_init):
+       renamed to hildon_hvolumebar_class_init
+
+       * hildon-widgets/hildon-hvolumebar.c (hvolumebar_init): renamed to
+       hildon_hvolumebar_init
+
+       * hildon-widgets/hildon-hvolumebar.c (hildon_hvolumebar_mute):
+       removed (unused).
+
+       * hildon-widgets/hildon-hvolumebar.c (hildon_hvolumebar_init):
+       removed unused 'orientation' initialisation.
+
+       * hildon-widgets/hildon-hvolumebar.c (hildon_hvolumebar_init): use
+       _hildon_volumebar_mute_toggled instead of removed
+       hildon_hvolumebar_mute.
+
+
+2006-03-02  Luc Pionchon  <luc.pionchon@nokia.com>
 
         More cleanup,
 

diff --git a/hildon-widgets/hildon-hvolumebar.c b/hildon-widgets/hildon-hvolumebar.c
index 51b1856..d916da2 100644 (file)
--- a/hildon-widgets/hildon-hvolumebar.c
+++ b/hildon-widgets/hildon-hvolumebar.c
@@ -61,10 +61,8 @@
 #define TOOL_VERTICAL_MUTE_GAP ((TOOL_DEFAULT_BAR_HEIGHT - TOOL_DEFAULT_TBUTTON_HEIGHT) / 2)
 
 static HildonVolumebarClass *parent_class;
-static void hvolumebar_class_init(HildonHVolumebarClass * klass);
-static void hvolumebar_init(HildonHVolumebar * hvolumebar);
-static void
-hildon_hvolumebar_mute(GtkWidget * widget, HildonHVolumebar * self);
+static void hildon_hvolumebar_class_init(HildonHVolumebarClass * klass);
+static void hildon_hvolumebar_init(HildonHVolumebar * hvolumebar);
 
 static gboolean hildon_hvolumebar_expose(GtkWidget * widget,
                                          GdkEventExpose * event);
@@ -84,12 +82,12 @@ GType hildon_hvolumebar_get_type(void)
             sizeof(HildonHVolumebarClass),
             NULL,       /* base_init */
             NULL,       /* base_finalize */
-            (GClassInitFunc) hvolumebar_class_init,     /* class_init */
+            (GClassInitFunc) hildon_hvolumebar_class_init,     /* class_init */
             NULL,       /* class_finalize */
             NULL,       /* class_data */
             sizeof(HildonHVolumebar),
             0,
-            (GInstanceInitFunc) hvolumebar_init,
+            (GInstanceInitFunc) hildon_hvolumebar_init,
         };
         type = g_type_register_static(HILDON_TYPE_VOLUMEBAR,
                                       "HildonHVolumebar", &info, 0);
@@ -98,7 +96,7 @@ GType hildon_hvolumebar_get_type(void)
 }
 
 
-static void hvolumebar_class_init(HildonHVolumebarClass * klass)
+static void hildon_hvolumebar_class_init(HildonHVolumebarClass * klass)
 {
     GtkWidgetClass *volumebar_class = GTK_WIDGET_CLASS(klass);
 
@@ -111,13 +109,12 @@ static void hvolumebar_class_init(HildonHVolumebarClass * klass)
 }
 
 
-static void hvolumebar_init(HildonHVolumebar * hvolumebar)
+static void hildon_hvolumebar_init(HildonHVolumebar * hvolumebar)
 {
     HildonVolumebarPrivate *priv;
 
     priv = HILDON_VOLUMEBAR_GET_PRIVATE(hvolumebar);
 
-    priv->orientation = GTK_ORIENTATION_HORIZONTAL;
     priv->volumebar =
         HILDON_VOLUMEBAR_RANGE(hildon_volumebar_range_new
                                (GTK_ORIENTATION_HORIZONTAL));
@@ -133,8 +130,8 @@ static void hvolumebar_init(HildonHVolumebar * hvolumebar)
     g_signal_connect_swapped(G_OBJECT(priv->volumebar), "value-changed",
                              G_CALLBACK(hildon_volumebar_level_change),
                              hvolumebar);
-    g_signal_connect(G_OBJECT(priv->tbutton), "toggled",
-                     G_CALLBACK(hildon_hvolumebar_mute), hvolumebar);
+    g_signal_connect_swapped(priv->tbutton, "toggled",
+        G_CALLBACK(_hildon_volumebar_mute_toggled), hvolumebar);
 
     gtk_widget_show(GTK_WIDGET(priv->volumebar));
 }
@@ -156,7 +153,7 @@ static void hildon_hvolumebar_map(GtkWidget * widget)
     HildonVolumebarPrivate *priv;
     GtkWidget *parent;
 
-    g_return_if_fail(HILDON_IS_HVOLUMEBAR(widget));
+    g_assert(HILDON_IS_HVOLUMEBAR(widget));
 
     priv = HILDON_VOLUMEBAR_GET_PRIVATE(widget);
     parent = gtk_widget_get_ancestor(GTK_WIDGET(widget), GTK_TYPE_TOOLBAR);
@@ -173,7 +170,7 @@ static gboolean hildon_hvolumebar_expose(GtkWidget * widget,
 {
     HildonVolumebarPrivate *priv;
 
-    g_return_val_if_fail(HILDON_IS_HVOLUMEBAR(widget), FALSE);
+    g_assert(HILDON_IS_HVOLUMEBAR(widget));
 
     priv = HILDON_VOLUMEBAR_GET_PRIVATE(HILDON_VOLUMEBAR(widget));
 
@@ -200,7 +197,7 @@ hildon_hvolumebar_size_request(GtkWidget * widget,
 {
     HildonVolumebarPrivate *priv;
 
-    g_return_if_fail(HILDON_IS_HVOLUMEBAR(widget));
+    g_assert(HILDON_IS_HVOLUMEBAR(widget));
 
     priv = HILDON_VOLUMEBAR_GET_PRIVATE(HILDON_VOLUMEBAR(widget));
 
@@ -220,7 +217,7 @@ hildon_hvolumebar_size_allocate(GtkWidget * widget,
     HildonVolumebarPrivate *priv;
     GtkAllocation button_allocation, range_allocation;
 
-    g_return_if_fail(HILDON_IS_HVOLUMEBAR(widget));
+    g_assert(HILDON_IS_HVOLUMEBAR(widget));
 
     priv = HILDON_VOLUMEBAR_GET_PRIVATE(widget);
     
@@ -327,9 +324,3 @@ hildon_hvolumebar_size_allocate(GtkWidget * widget,
                                  &range_allocation);
     }
 }
-
-static void
-hildon_hvolumebar_mute(GtkWidget * widget, HildonHVolumebar * self)
-{
-    g_signal_emit_by_name(GTK_WIDGET(self), "mute_toggled");
-}

diff --git a/hildon-widgets/hildon-hvolumebar.h b/hildon-widgets/hildon-hvolumebar.h
index 21d3718..1521d9b 100644 (file)
--- a/hildon-widgets/hildon-hvolumebar.h
+++ b/hildon-widgets/hildon-hvolumebar.h
@@ -22,17 +22,13 @@
  *
  */
 
-#ifndef HILDON_HVOLUMEBAR_H
-#define HILDON_HVOLUMEBAR_H
-
-#include <glib.h>
-#include <glib-object.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtktogglebutton.h>
+#ifndef __HILDON_HVOLUMEBAR_H__
+#define __HILDON_HVOLUMEBAR_H__
+
 #include <hildon-widgets/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))
@@ -42,6 +38,7 @@ G_BEGIN_DECLS
         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;
 
@@ -58,4 +55,4 @@ GType hildon_hvolumebar_get_type(void) G_GNUC_CONST;
 GtkWidget *hildon_hvolumebar_new(void);
 
 G_END_DECLS
-#endif /* HILDON_HVOLUMEBAR */
+#endif /* __HILDON_HVOLUMEBAR_H__ */

diff --git a/hildon-widgets/hildon-volumebar-private.h b/hildon-widgets/hildon-volumebar-private.h
index 04e6c3f..af053a0 100644 (file)
--- a/hildon-widgets/hildon-volumebar-private.h
+++ b/hildon-widgets/hildon-volumebar-private.h
@@ -24,6 +24,9 @@
 #ifndef __HILDON_VOLUMEBAR_PRIVATE__
 #define __HILDON_VOLUMEBAR_PRIVATE__
 
+#include <gtk/gtktogglebutton.h>
+#include <hildon-widgets/hildon-volumebar-range.h>
+
 G_BEGIN_DECLS
 #define HILDON_VOLUMEBAR_GET_PRIVATE(obj) \
         (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
@@ -33,12 +36,11 @@ typedef struct _HildonVolumebarPrivate HildonVolumebarPrivate;
 
 struct _HildonVolumebarPrivate {
   HildonVolumebarRange *volumebar;
-
-  GtkOrientation orientation;
-  GtkToggleButton *tbutton;
-
-  gboolean is_toolbar;/* Is inside toolbar (for horizontal volumebar) */
+  GtkToggleButton      *tbutton;
+  gboolean              is_toolbar; /* is inside toolbar (for horizontal volumebar) */
 };
 
+void _hildon_volumebar_mute_toggled(HildonVolumebar * self);
+
 G_END_DECLS
 #endif /* __HILDON_VOLUMEBAR_PRIVATE__ */

diff --git a/hildon-widgets/hildon-volumebar-range.h b/hildon-widgets/hildon-volumebar-range.h
index 5c84438..c6c7d27 100644 (file)
--- a/hildon-widgets/hildon-volumebar-range.h
+++ b/hildon-widgets/hildon-volumebar-range.h
@@ -22,14 +22,13 @@
  *
  */
 
-#ifndef HILDON_VOLUMEBAR_RANGE_H
-#define HILDON_VOLUMEBAR_RANGE_H
+#ifndef __HILDON_VOLUMEBAR_RANGE_H__
+#define __HILDON_VOLUMEBAR_RANGE_H__
 
-#include <glib.h>
-#include <glib-object.h>
 #include <gtk/gtkscale.h>
 
 G_BEGIN_DECLS
+
 #define HILDON_VOLUMEBAR_RANGE_TYPE ( hildon_volumebar_range_get_type() )
 #define HILDON_VOLUMEBAR_RANGE(obj) (GTK_CHECK_CAST (obj,\
         HILDON_VOLUMEBAR_RANGE_TYPE, HildonVolumebarRange))
@@ -51,12 +50,13 @@ struct _HildonVolumebarRangeClass {
     GtkScaleClass parent_class;
 };
 
-GType hildon_volumebar_range_get_type(void) G_GNUC_CONST;
-GtkWidget *hildon_volumebar_range_new(GtkOrientation orientation);
-gdouble hildon_volumebar_range_get_level(HildonVolumebarRange * self);
-void hildon_volumebar_range_set_level(HildonVolumebarRange * self,
-                                      gdouble level);
+GType       hildon_volumebar_range_get_type  (void) G_GNUC_CONST;
+GtkWidget * hildon_volumebar_range_new       (GtkOrientation orientation);
+gdouble     hildon_volumebar_range_get_level (HildonVolumebarRange *self);
+void        hildon_volumebar_range_set_level (HildonVolumebarRange *self,
+                                              gdouble               level);
 
 
 G_END_DECLS
-#endif
+
+#endif /* __HILDON_VOLUMEBAR_RANGE_H__ */

diff --git a/hildon-widgets/hildon-volumebar.c b/hildon-widgets/hildon-volumebar.c
index fd208d1..625c6d3 100644 (file)
--- a/hildon-widgets/hildon-volumebar.c
+++ b/hildon-widgets/hildon-volumebar.c
@@ -217,8 +217,8 @@ hildon_child_forall(GtkContainer * container,
 {
     HildonVolumebarPrivate *priv;
 
-    g_return_if_fail(HILDON_IS_VOLUMEBAR(container));
-    g_return_if_fail(callback != NULL);
+    g_assert(HILDON_IS_VOLUMEBAR(container));
+    g_assert(callback != NULL);
 
     priv = HILDON_VOLUMEBAR_GET_PRIVATE(container);
 
@@ -469,6 +469,9 @@ hildon_volumebar_get_adjustment (HildonVolumebar * self)
 static void
 mute_toggled (HildonVolumebar *self)
 {
+  /* This looks like no-op, but it still does something meaningfull!
+     set_mute also updates the ui to match new state that
+     is already reported by get_mute */
   hildon_volumebar_set_mute (self, hildon_volumebar_get_mute(self));
 }
 
@@ -489,3 +492,12 @@ hildon_volumebar_key_press (GtkWidget * widget,
 
     return GTK_WIDGET_CLASS(parent_class)->key_press_event(widget, event);
 }
+
+/* Sends mute-toggled signal to widget, used as a callback in derived classes
+   Just keep this "protected" in order to avoid introducing new API. */
+void
+_hildon_volumebar_mute_toggled(HildonVolumebar * self)
+{
+    g_return_if_fail(HILDON_IS_VOLUMEBAR(self));
+    g_signal_emit_by_name(self, "mute_toggled");
+}

diff --git a/hildon-widgets/hildon-volumebar.h b/hildon-widgets/hildon-volumebar.h
index 6def557..2dbc449 100644 (file)
--- a/hildon-widgets/hildon-volumebar.h
+++ b/hildon-widgets/hildon-volumebar.h
@@ -24,17 +24,11 @@
 #ifndef __HILDON_VOLUMEBAR_H__
 #define __HILDON_VOLUMEBAR_H__
 
-#include <glib.h>
-#include <glib-object.h>
 #include <gtk/gtkcontainer.h>
-/*#include <gtk/gtkframe.h>*/
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
 #include <gtk/gtkadjustment.h>
 
 G_BEGIN_DECLS
+
 #define HILDON_TYPE_VOLUMEBAR ( hildon_volumebar_get_type() )
 #define HILDON_VOLUMEBAR(obj) (GTK_CHECK_CAST (obj,\
         HILDON_TYPE_VOLUMEBAR, HildonVolumebar))
@@ -44,7 +38,8 @@ G_BEGIN_DECLS
         HILDON_TYPE_VOLUMEBAR))
 #define HILDON_IS_VOLUMEBAR_CLASS(klass) \
         (GTK_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_VOLUMEBAR))
-typedef struct _HildonVolumebar HildonVolumebar;
+
+typedef struct _HildonVolumebar      HildonVolumebar;
 typedef struct _HildonVolumebarClass HildonVolumebarClass;
 
 struct _HildonVolumebar {
@@ -54,19 +49,26 @@ struct _HildonVolumebar {
 struct _HildonVolumebarClass {
     GtkContainerClass parent_class;
 
-    /* signal */
-    void (*mute_toggled) (HildonVolumebar * self);
+    /* signals */
+    void (*mute_toggled)  (HildonVolumebar * self);
     void (*level_changed) (HildonVolumebar * self);
 };
 
-GType hildon_volumebar_get_type(void) G_GNUC_CONST;
 
-void hildon_volumebar_set_level(HildonVolumebar * self, gdouble level);
-double hildon_volumebar_get_level(HildonVolumebar * self);
-void hildon_volumebar_set_mute(HildonVolumebar * self, gboolean mute);
-gboolean hildon_volumebar_get_mute(HildonVolumebar * self);
-void hildon_volumebar_level_change(HildonVolumebar * self);
-GtkAdjustment * hildon_volumebar_get_adjustment (HildonVolumebar * self);
+GType           hildon_volumebar_get_type       (void) G_GNUC_CONST;
+
+double          hildon_volumebar_get_level      (HildonVolumebar *self);
+void            hildon_volumebar_set_level      (HildonVolumebar *self,
+                                                 gdouble          level);
+
+gboolean        hildon_volumebar_get_mute       (HildonVolumebar *self);
+void            hildon_volumebar_set_mute       (HildonVolumebar *self,
+                                                 gboolean         mute);
+
+void            hildon_volumebar_level_change   (HildonVolumebar *self);
+
+GtkAdjustment * hildon_volumebar_get_adjustment (HildonVolumebar *self);
+
 
 G_END_DECLS
-#endif
+#endif /* __HILDON_VOLUMEBAR_H__ */

diff --git a/hildon-widgets/hildon-vvolumebar.c b/hildon-widgets/hildon-vvolumebar.c
index db07bd8..35491d1 100644 (file)
--- a/hildon-widgets/hildon-vvolumebar.c
+++ b/hildon-widgets/hildon-vvolumebar.c
@@ -36,7 +36,6 @@
 
 #include <gtk/gtk.h>
 #include "hildon-vvolumebar.h"
-#include "hildon-volumebar.h"
 #include "hildon-volumebar-range.h"
 #include "hildon-volumebar-private.h"
 
@@ -52,10 +51,8 @@
 #define VERTICAL_MUTE_GAP                6
 
 static HildonVolumebarClass *parent_class;
-static void vvolumebar_class_init(HildonVVolumebarClass * klass);
-static void vvolumebar_init(HildonVVolumebar * vvolumebar);
-static void hildon_vvolumebar_mute(GtkWidget * widget,
-                                   HildonVVolumebar * self);
+static void hildon_vvolumebar_class_init(HildonVVolumebarClass * klass);
+static void hildon_vvolumebar_init(HildonVVolumebar * vvolumebar);
 static gboolean hildon_vvolumebar_expose(GtkWidget * widget,
                                          GdkEventExpose * event);
 static void hildon_vvolumebar_size_request(GtkWidget * widget,
@@ -72,12 +69,12 @@ GType hildon_vvolumebar_get_type(void)
             sizeof(HildonVVolumebarClass),
             NULL,       /* base_init */
             NULL,       /* base_finalize */
-            (GClassInitFunc) vvolumebar_class_init,     /* class_init */
+            (GClassInitFunc) hildon_vvolumebar_class_init,     /* class_init */
             NULL,       /* class_finalize */
             NULL,       /* class_data */
             sizeof(HildonVVolumebar),
             0,
-            (GInstanceInitFunc) vvolumebar_init,
+            (GInstanceInitFunc) hildon_vvolumebar_init,
         };
         type =
             g_type_register_static(HILDON_TYPE_VOLUMEBAR,
@@ -86,7 +83,7 @@ GType hildon_vvolumebar_get_type(void)
     return type;
 }
 
-static void vvolumebar_class_init(HildonVVolumebarClass * klass)
+static void hildon_vvolumebar_class_init(HildonVVolumebarClass * klass)
 {
     GtkWidgetClass *volumebar_class = GTK_WIDGET_CLASS(klass);
 
@@ -97,13 +94,12 @@ static void vvolumebar_class_init(HildonVVolumebarClass * klass)
     volumebar_class->expose_event = hildon_vvolumebar_expose;
 }
 
-static void vvolumebar_init(HildonVVolumebar * vvolumebar)
+static void hildon_vvolumebar_init(HildonVVolumebar * vvolumebar)
 {
     HildonVolumebarPrivate *priv;
 
     priv = HILDON_VOLUMEBAR_GET_PRIVATE(vvolumebar);
 
-    priv->orientation = GTK_ORIENTATION_VERTICAL;
     priv->volumebar =
         HILDON_VOLUMEBAR_RANGE(hildon_volumebar_range_new
                                (GTK_ORIENTATION_VERTICAL));
@@ -119,8 +115,8 @@ static void vvolumebar_init(HildonVVolumebar * vvolumebar)
     g_signal_connect_swapped(G_OBJECT(priv->volumebar), "value-changed",
                              G_CALLBACK(hildon_volumebar_level_change),
                              vvolumebar);
-    g_signal_connect(G_OBJECT(priv->tbutton), "toggled",
-                     G_CALLBACK(hildon_vvolumebar_mute), vvolumebar);
+    g_signal_connect_swapped(priv->tbutton, "toggled",
+        G_CALLBACK(_hildon_volumebar_mute_toggled), vvolumebar);
 
     gtk_widget_show(GTK_WIDGET(priv->volumebar));
 }
@@ -142,7 +138,7 @@ static gboolean hildon_vvolumebar_expose(GtkWidget * widget,
 {
     HildonVolumebarPrivate *priv;
 
-    g_return_val_if_fail(HILDON_IS_VVOLUMEBAR(widget), FALSE);
+    g_assert(HILDON_IS_VVOLUMEBAR(widget));
 
     priv = HILDON_VOLUMEBAR_GET_PRIVATE(HILDON_VOLUMEBAR(widget));
     
@@ -167,7 +163,7 @@ static void
 hildon_vvolumebar_size_request(GtkWidget * widget,
                                GtkRequisition * requisition)
 {
-    g_return_if_fail(HILDON_IS_VVOLUMEBAR(widget));
+    g_assert(HILDON_IS_VVOLUMEBAR(widget));
 
     requisition->height = MINIMUM_BAR_HEIGHT;
     requisition->width = DEFAULT_BAR_WIDTH;
@@ -181,7 +177,7 @@ hildon_vvolumebar_size_allocate(GtkWidget * widget,
 
     GtkAllocation range_allocation, button_allocation;
 
-    g_return_if_fail(HILDON_IS_VVOLUMEBAR(widget));
+    g_assert(HILDON_IS_VVOLUMEBAR(widget));
 
     priv = HILDON_VOLUMEBAR_GET_PRIVATE(widget);
 
@@ -233,9 +229,3 @@ hildon_vvolumebar_size_allocate(GtkWidget * widget,
                                  &button_allocation);
     }
 }
-
-static void
-hildon_vvolumebar_mute(GtkWidget * widget, HildonVVolumebar * self)
-{
-    g_signal_emit_by_name(GTK_WIDGET(self), "mute_toggled");
-}

diff --git a/hildon-widgets/hildon-vvolumebar.h b/hildon-widgets/hildon-vvolumebar.h
index 10ab893..abadf73 100644 (file)
--- a/hildon-widgets/hildon-vvolumebar.h
+++ b/hildon-widgets/hildon-vvolumebar.h
@@ -22,40 +22,39 @@
  *
  */
 
-#ifndef HILDON_VVOLUMEBAR_H
-#define HILDON_VVOLUMEBAR_H
-
-#include <glib.h>
-#include <glib-object.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtktogglebutton.h>
+#ifndef __HILDON_VVOLUMEBAR_H__
+#define __HILDON_VVOLUMEBAR_H__
+
 #include <hildon-widgets/hildon-volumebar.h>
 
 G_BEGIN_DECLS
+
 #define HILDON_TYPE_VVOLUMEBAR ( hildon_vvolumebar_get_type() )
-#define HILDON_VVOLUMEBAR(obj) (GTK_CHECK_CAST (obj,\
-        HILDON_TYPE_VVOLUMEBAR, HildonVVolumebar))
+
+#define HILDON_VVOLUMEBAR(obj) (GTK_CHECK_CAST (obj, HILDON_TYPE_VVOLUMEBAR, HildonVVolumebar))
+
 #define HILDON_VVOLUMEBAR_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass),\
-        HILDON_TYPE_VVOLUMEBAR, HildonVVolumebarClass))
-#define HILDON_IS_VVOLUMEBAR(obj) (GTK_CHECK_TYPE (obj,\
-        HILDON_TYPE_VVOLUMEBAR))
-#define HILDON_IS_VVOLUMEBAR_CLASS(klass) \
-        (GTK_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_VVOLUMEBAR))
-typedef struct _HildonVVolumebar HildonVVolumebar;
+                                           HILDON_TYPE_VVOLUMEBAR, HildonVVolumebarClass))
+
+#define HILDON_IS_VVOLUMEBAR(obj) (GTK_CHECK_TYPE (obj, HILDON_TYPE_VVOLUMEBAR))
+
+#define HILDON_IS_VVOLUMEBAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), HILDON_TYPE_VVOLUMEBAR))
+
+
+typedef struct _HildonVVolumebar      HildonVVolumebar;
 typedef struct _HildonVVolumebarClass HildonVVolumebarClass;
 
 struct _HildonVVolumebar {
-    /* This is our parent class */
-    HildonVolumebar volumebar;
+    HildonVolumebar volumebar; /* this is our parent class */
 };
 
 struct _HildonVVolumebarClass {
     HildonVolumebarClass parent_class;
 };
 
-GType hildon_vvolumebar_get_type(void) G_GNUC_CONST;
-GtkWidget *hildon_vvolumebar_new(void);
+GType       hildon_vvolumebar_get_type (void) G_GNUC_CONST;
+GtkWidget * hildon_vvolumebar_new      (void);
+
 
 G_END_DECLS
-#endif /* HILDON_VVOLUMEBAR */
+#endif /* __HILDON_VVOLUMEBAR_H__ */