[gtk+] menu: Remove unneeded checks
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] menu: Remove unneeded checks
- Date: Thu, 1 May 2014 13:15:59 +0000 (UTC)
commit 34cfd5cd7869786b57251b0c347b6fe96ffed8c9
Author: Benjamin Otte <otte redhat com>
Date: Wed Apr 30 09:23:04 2014 +0200
menu: Remove unneeded checks
Size vfuncs always get non-null out variables passed, so no need to
check for NULL.
gtk/gtkmenu.c | 14 ++++----------
1 files changed, 4 insertions(+), 10 deletions(-)
---
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 63bc72d..e011e95 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -3252,11 +3252,8 @@ gtk_menu_get_preferred_width (GtkWidget *widget,
priv->toggle_size = max_toggle_size;
priv->accel_size = max_accel_width;
- if (minimum_size)
- *minimum_size = min_width;
-
- if (natural_size)
- *natural_size = nat_width;
+ *minimum_size = min_width;
+ *natural_size = nat_width;
/* Don't resize the tearoff if it is not active,
* because it won't redraw (it is only a background pixmap).
@@ -3335,11 +3332,8 @@ gtk_menu_get_preferred_height_for_width (GtkWidget *widget,
}
}
- if (minimum_size)
- *minimum_size = min_height;
-
- if (natural_size)
- *natural_size = nat_height;
+ *minimum_size = min_height;
+ *natural_size = nat_height;
g_free (min_heights);
g_free (nat_heights);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]