diff options
| author | Benjamin Otte <otte@redhat.com> | 2014-04-30 08:39:06 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2014-05-01 14:51:27 +0200 |
| commit | 7455ab72f8681cff908526985f8e4f7ff924aec6 (patch) | |
| tree | 690b14a2a6a5d9c77ff5ee1cefd51da2532fec38 /gtk/gtkcombobox.c | |
| parent | 3914bc9ce61df97063c9a371eb752e198ff7f214 (diff) | |
| download | gtk+-7455ab72f8681cff908526985f8e4f7ff924aec6.tar.gz | |
combobox: Remove unneeded checks
Size vfuncs always get non-null out variables passed, so no need to
check for NULL.
Diffstat (limited to 'gtk/gtkcombobox.c')
| -rw-r--r-- | gtk/gtkcombobox.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index 10b6575da2..c67912f611 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; } /** |