forked from AuroraMiddleware/gtk
TreeViewCol: Don’t try to disconnect null treeview
https://bugzilla.gnome.org/show_bug.cgi?id=788614
This commit is contained in:
parent
161b063909
commit
af28c031fc
@ -1331,10 +1331,11 @@ _gtk_tree_view_column_unset_tree_view (GtkTreeViewColumn *column)
|
|||||||
{
|
{
|
||||||
GtkTreeViewColumnPrivate *priv = column->priv;
|
GtkTreeViewColumnPrivate *priv = column->priv;
|
||||||
|
|
||||||
if (priv->tree_view)
|
if (priv->tree_view == NULL)
|
||||||
{
|
return;
|
||||||
gtk_container_remove (GTK_CONTAINER (priv->tree_view), priv->button);
|
|
||||||
}
|
gtk_container_remove (GTK_CONTAINER (priv->tree_view), priv->button);
|
||||||
|
|
||||||
if (priv->property_changed_signal)
|
if (priv->property_changed_signal)
|
||||||
{
|
{
|
||||||
g_signal_handler_disconnect (priv->tree_view, priv->property_changed_signal);
|
g_signal_handler_disconnect (priv->tree_view, priv->property_changed_signal);
|
||||||
@ -1344,7 +1345,7 @@ _gtk_tree_view_column_unset_tree_view (GtkTreeViewColumn *column)
|
|||||||
if (priv->sort_column_changed_signal)
|
if (priv->sort_column_changed_signal)
|
||||||
{
|
{
|
||||||
g_signal_handler_disconnect (gtk_tree_view_get_model (GTK_TREE_VIEW (priv->tree_view)),
|
g_signal_handler_disconnect (gtk_tree_view_get_model (GTK_TREE_VIEW (priv->tree_view)),
|
||||||
priv->sort_column_changed_signal);
|
priv->sort_column_changed_signal);
|
||||||
priv->sort_column_changed_signal = 0;
|
priv->sort_column_changed_signal = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user