[gtk+] combobox: Remove unneeded checks
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] combobox: Remove unneeded checks
- Date: Thu, 1 May 2014 13:14:28 +0000 (UTC)
commit 7455ab72f8681cff908526985f8e4f7ff924aec6
Author: Benjamin Otte <otte redhat com>
Date: Wed Apr 30 08:39:06 2014 +0200
combobox: Remove unneeded checks
Size vfuncs always get non-null out variables passed, so no need to
check for NULL.
gtk/gtkcombobox.c | 14 ++++----------
1 files changed, 4 insertions(+), 10 deletions(-)
---
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 10b6575..c67912f 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -5593,11 +5593,8 @@ gtk_combo_box_get_preferred_width (GtkWidget *widget,
minimum_width += padding.left + padding.right;
natural_width += padding.left + padding.right;
- if (minimum_size)
- *minimum_size = minimum_width;
-
- if (natural_size)
- *natural_size = natural_width;
+ *minimum_size = minimum_width;
+ *natural_size = natural_width;
}
static void
@@ -5732,11 +5729,8 @@ gtk_combo_box_get_preferred_height_for_width (GtkWidget *widget,
min_height += padding.top + padding.bottom;
nat_height += padding.top + padding.bottom;
- if (minimum_size)
- *minimum_size = min_height;
-
- if (natural_size)
- *natural_size = nat_height;
+ *minimum_size = min_height;
+ *natural_size = nat_height;
}
/**
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]