callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GtkActionHelper: Remove unnecessary NULL check

Browse Source 
This NULL check has existed since commit 652f16dd98, when
GtkActionHelper was first introduced, but so has the assertion at the
top to ensure the validity of 'widget'.

https://bugzilla.gnome.org/show_bug.cgi?id=783587
This commit is contained in:
Debarshi Ray
2017-06-13 11:06:50 +02:00
parent aed628f100
commit d1f53b1e07
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gtk/gtkactionhelper.c
View File

@ -387,22 +387,17 @@ GtkActionHelper *
gtk_action_helper_new (GtkActionable *widget)
{
GtkActionHelper *helper;
GParamSpec *pspec;
g_return_val_if_fail (GTK_IS_ACTIONABLE (widget), NULL);
helper = g_object_new (GTK_TYPE_ACTION_HELPER, NULL);
helper->widget = GTK_WIDGET (widget);
helper->enabled = gtk_widget_get_sensitive (GTK_WIDGET (helper->widget));
if (helper->widget)
{
GParamSpec *pspec;
helper->enabled = gtk_widget_get_sensitive (GTK_WIDGET (helper->widget));
pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (helper->widget), "active");
if (pspec && G_PARAM_SPEC_VALUE_TYPE (pspec) == G_TYPE_BOOLEAN)
g_object_get (G_OBJECT (helper->widget), "active", &helper->active, NULL);
}
pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (helper->widget), "active");
if (pspec && G_PARAM_SPEC_VALUE_TYPE (pspec) == G_TYPE_BOOLEAN)
g_object_get (G_OBJECT (helper->widget), "active", &helper->active, NULL);
helper->action_context = _gtk_widget_get_action_muxer (GTK_WIDGET (widget), TRUE);