[gnome-control-center] wacom: Fix excessive top padding

[Bastien Nocera <hadess src gnome org>]

commit 87005e3f75211a1a20c0b8214676c23a766b2bdc
Author: Bastien Nocera <hadess hadess net>
Date:   Mon Jan 30 15:23:28 2012 +0000

    wacom: Fix excessive top padding
    
    https://bugzilla.gnome.org/show_bug.cgi?id=668881

 panels/wacom/cc-wacom-nav-button.c |    5 -----
 panels/wacom/cc-wacom-panel.c      |    8 +++++++-
 2 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/panels/wacom/cc-wacom-nav-button.c b/panels/wacom/cc-wacom-nav-button.c
index abcba52..6b7d876 100644
--- a/panels/wacom/cc-wacom-nav-button.c
+++ b/panels/wacom/cc-wacom-nav-button.c
@@ -218,11 +218,6 @@ cc_wacom_nav_button_init (CcWacomNavButton *self)
 	/* Label */
 	priv->label = gtk_label_new (NULL);
 	gtk_style_context_add_class (gtk_widget_get_style_context (priv->label), "dim-label");
-	g_object_set (priv->label,
-		      "margin-top", 16,
-		      "margin-bottom", 16,
-		      NULL);
-
 	gtk_box_pack_start (GTK_BOX (self), priv->label,
 			    FALSE, FALSE, 8);
 
diff --git a/panels/wacom/cc-wacom-panel.c b/panels/wacom/cc-wacom-panel.c
index 4dfd390..e21be1e 100644
--- a/panels/wacom/cc-wacom-panel.c
+++ b/panels/wacom/cc-wacom-panel.c
@@ -344,7 +344,13 @@ cc_wacom_panel_init (CcWacomPanel *self)
 
 	gtk_notebook_set_show_tabs (notebook, FALSE);
 	gtk_widget_set_vexpand (GTK_WIDGET (notebook), TRUE);
-	gtk_container_set_border_width (GTK_CONTAINER (notebook), 24);
+	gtk_container_set_border_width (GTK_CONTAINER (notebook), 0);
+	g_object_set (G_OBJECT (notebook),
+		      "margin-top", 0,
+		      "margin-right", 24,
+		      "margin-left", 24,
+		      "margin-bottom", 24,
+		      NULL);
 
 	gtk_container_add (GTK_CONTAINER (self), GTK_WIDGET (notebook));
 	gtk_widget_show (priv->notebook);