Revisit the failed attempt to correct MidoriView
This commit is contained in:
parent
167af26029
commit
001945d86b
1 changed files with 5 additions and 3 deletions
|
@ -1402,17 +1402,19 @@ midori_view_set_settings (MidoriView* view,
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (view->settings)
|
if (view->settings)
|
||||||
{
|
|
||||||
g_signal_handlers_disconnect_by_func (view->settings,
|
g_signal_handlers_disconnect_by_func (view->settings,
|
||||||
midori_view_settings_notify_cb, view);
|
midori_view_settings_notify_cb, view);
|
||||||
|
|
||||||
|
katze_object_assign (view->settings, settings);
|
||||||
|
if (settings)
|
||||||
|
{
|
||||||
g_object_ref (settings);
|
g_object_ref (settings);
|
||||||
if (view->web_view)
|
if (view->web_view)
|
||||||
g_object_set (view->web_view, "settings", view->settings, NULL);
|
g_object_set (view->web_view, "settings", settings, NULL);
|
||||||
_midori_view_update_settings (view);
|
_midori_view_update_settings (view);
|
||||||
g_signal_connect (settings, "notify",
|
g_signal_connect (settings, "notify",
|
||||||
G_CALLBACK (midori_view_settings_notify_cb), view);
|
G_CALLBACK (midori_view_settings_notify_cb), view);
|
||||||
}
|
}
|
||||||
katze_object_assign (view->settings, settings);
|
|
||||||
g_object_notify (G_OBJECT (view), "settings");
|
g_object_notify (G_OBJECT (view), "settings");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue