summaryrefslogtreecommitdiff
path: root/applets
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-11-23 14:47:35 +0100
committerinfirit <[email protected]>2014-11-23 14:56:13 +0100
commitc3763a0b869a8a77d1ecbb5b3689e0399cbf1d49 (patch)
treefad453b4762af297138dbcac5559f45ba27d28ec /applets
parentc354cea0424964e496601074a7678995750fa275 (diff)
downloadmate-panel-c3763a0b869a8a77d1ecbb5b3689e0399cbf1d49.tar.bz2
mate-panel-c3763a0b869a8a77d1ecbb5b3689e0399cbf1d49.tar.xz
Gtk3: panel, clock: Synchronize calculate_minimum_height() code
Also change the panel version to use the padding instead of the border. We're interested in the padding here. I believe. Taken from gnome-panel commit: 0b5d9e57451dff3a25b3fbcc8dec671cac469cb From: Vincent Untz <[email protected]>
Diffstat (limited to 'applets')
-rw-r--r--applets/clock/clock.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/applets/clock/clock.c b/applets/clock/clock.c
index 4e56192d..cdc17f01 100644
--- a/applets/clock/clock.c
+++ b/applets/clock/clock.c
@@ -392,10 +392,10 @@ calculate_minimum_height (GtkWidget *widget,
MatePanelAppletOrient orientation)
{
#if GTK_CHECK_VERSION (3, 0, 0)
- GtkStyleContext *style_context;
GtkStateFlags state;
- GtkBorder padding;
+ GtkStyleContext *style_context;
const PangoFontDescription *font_desc;
+ GtkBorder padding;
#else
GtkStyle *style;
#endif