Fit widget better in area

diff --git a/src/simple-brightness-applet.c b/src/simple-brightness-applet.c
index c97b812..3300127 100644 (file)
--- a/src/simple-brightness-applet.c
+++ b/src/simple-brightness-applet.c
@@ -216,10 +216,10 @@ static void simple_brightness_applet_setup (SimpleBrightnessApplet *plugin)
    GdkPixbuf *pixbuf = NULL;
    SimpleBrightnessAppletPrivate *priv = SIMPLE_BRIGHTNESS_APPLET_GET_PRIVATE (plugin);
 
-   priv->applet_contents = GTK_HBOX (gtk_hbox_new (FALSE, HILDON_MARGIN_DEFAULT));
+   priv->applet_contents = GTK_HBOX (gtk_hbox_new (FALSE, 0));
 
-   priv->applet_button = hildon_gtk_button_new(HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH);
-   gtk_box_pack_start (GTK_BOX (priv->applet_contents), priv->applet_button, FALSE, FALSE, 0);
+   priv->applet_button = hildon_gtk_button_new(HILDON_SIZE_FINGER_HEIGHT);
+   gtk_box_pack_start (GTK_BOX (priv->applet_contents), priv->applet_button, FALSE, TRUE, 0);
    g_signal_connect (priv->applet_button, "clicked", G_CALLBACK(simple_brightness_applet_on_button_clicked), plugin);
    pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default(), "general_brightness", 64, 0, NULL);
    if (pixbuf)
@@ -236,7 +236,7 @@ static void simple_brightness_applet_setup (SimpleBrightnessApplet *plugin)
    hildon_controlbar_set_range (priv->brightness_ctrlbar, gconf_client_get_int(priv->gconf_client, "/system/osso/dsm/display/display_brightness_level_step", NULL), gconf_client_get_int(priv->gconf_client, "/system/osso/dsm/display/max_display_brightness_levels", NULL));
    hildon_controlbar_set_value (priv->brightness_ctrlbar, gconf_client_get_int(priv->gconf_client, BRIGHTNESS_KEY, NULL));
    priv->brightness_ctrlbar_valchanged_id = g_signal_connect (priv->brightness_ctrlbar, "value-changed", G_CALLBACK(simple_brightness_applet_on_value_changed), plugin);
-   gtk_box_pack_start (GTK_BOX (priv->applet_contents), GTK_WIDGET (priv->brightness_ctrlbar), TRUE, TRUE, 0);
+   gtk_box_pack_start (GTK_BOX (priv->applet_contents), GTK_WIDGET (priv->brightness_ctrlbar), FALSE, TRUE, 0);
 
    gconf_client_add_dir (priv->gconf_client, SIMPLE_BRIGHTNESS_GCONF_PATH, GCONF_CLIENT_PRELOAD_NONE, NULL);
    priv->gconfnotify_id = gconf_client_notify_add (priv->gconf_client, BRIGHTNESS_KEY, (GConfClientNotifyFunc)simple_brightness_applet_on_gconf_value_changed, plugin, NULL, NULL);
@@ -263,7 +263,6 @@ static void simple_brightness_applet_init (SimpleBrightnessApplet *plugin)
 
    priv->dispchkbtn_active = FALSE;
    priv->osso_context = osso_initialize(PACKAGE, PACKAGE_VERSION, TRUE, NULL);
-   priv->brightness_ctrlbar_valchanged_id = priv->dispchkbtn_toggled_id = priv->gconfnotify_id = priv->display_keepalive_timeout = 0;
    priv->gconf_client = gconf_client_get_default ();
 
    simple_brightness_applet_setup (plugin);