[gtk+/gtk-3-20] label: minimum/natural size parameters are not nullable
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-3-20] label: minimum/natural size parameters are not nullable
- Date: Thu, 5 May 2016 19:24:15 +0000 (UTC)
commit 200ed52e92e47f3da080194341a50fcf4a357d89
Author: Timm Bäder <mail baedert org>
Date: Tue May 3 16:07:50 2016 -0400
label: minimum/natural size parameters are not nullable
Stop comparing them to NULL.
gtk/gtklabel.c | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 278349c..6cb5331 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -3641,11 +3641,8 @@ get_size_for_allocation (GtkLabel *label,
pango_layout_get_pixel_size (layout, NULL, &text_height);
- if (minimum_size)
- *minimum_size = text_height;
-
- if (natural_size)
- *natural_size = text_height;
+ *minimum_size = text_height;
+ *natural_size = text_height;
if (minimum_baseline || natural_baseline)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]