debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Correct handling of settings in MidoriView

Browse source
This commit is contained in:
Christian Dywan 2009-01-04 21:50:07 +01:00
parent ee9e8d77e5
commit 167af26029
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
midori/midori-view.c
View file

@ -1210,8 +1210,9 @@ midori_view_finalize (GObject* object)
view = MIDORI_VIEW (object); view = MIDORI_VIEW (object);
g_signal_handlers_disconnect_by_func (view->settings, if (view->settings)
midori_view_settings_notify_cb, view); g_signal_handlers_disconnect_by_func (view->settings,
midori_view_settings_notify_cb, view);
katze_assign (view->uri, NULL); katze_assign (view->uri, NULL);
katze_assign (view->title, NULL); katze_assign (view->title, NULL);
@ -1401,14 +1402,17 @@ 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, 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", view->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");
} }