Correct handling of settings in MidoriView
This commit is contained in:
parent
ee9e8d77e5
commit
167af26029
1 changed files with 12 additions and 8 deletions
|
@ -1210,6 +1210,7 @@ midori_view_finalize (GObject* object)
|
|||
|
||||
view = MIDORI_VIEW (object);
|
||||
|
||||
if (view->settings)
|
||||
g_signal_handlers_disconnect_by_func (view->settings,
|
||||
midori_view_settings_notify_cb, view);
|
||||
|
||||
|
@ -1401,14 +1402,17 @@ midori_view_set_settings (MidoriView* view,
|
|||
return;
|
||||
|
||||
if (view->settings)
|
||||
{
|
||||
g_signal_handlers_disconnect_by_func (view->settings,
|
||||
midori_view_settings_notify_cb, view);
|
||||
katze_object_assign (view->settings, g_object_ref (settings));
|
||||
g_object_ref (settings);
|
||||
if (view->web_view)
|
||||
g_object_set (view->web_view, "settings", view->settings, NULL);
|
||||
_midori_view_update_settings (view);
|
||||
g_signal_connect (settings, "notify",
|
||||
G_CALLBACK (midori_view_settings_notify_cb), view);
|
||||
}
|
||||
katze_object_assign (view->settings, settings);
|
||||
g_object_notify (G_OBJECT (view), "settings");
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue