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

Don't use the deprecated GTK_IN_DESTRUCTION flag

Browse source 
As a workaround, the browser now sets its own flag.
This commit is contained in:
Christian Dywan 2010-10-04 23:05:21 +02:00
parent d141086b24
commit 5a0fc37d2f
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
extensions/tab-panel.c
View file

@ -462,7 +462,7 @@ tab_panel_browser_remove_tab_cb (MidoriBrowser* browser,
{ {
gboolean minimized = katze_object_get_boolean (view, "minimized"); gboolean minimized = katze_object_get_boolean (view, "minimized");
if (!(GTK_OBJECT_FLAGS (browser) & GTK_IN_DESTRUCTION)) if (g_object_get_data (G_OBJECT (browser), "midori-browser-destroyed"))
tab_panel_remove_view (browser, view, minimized); tab_panel_remove_view (browser, view, minimized);
} }
@ -475,7 +475,7 @@ tab_panel_browser_notify_tab_cb (MidoriBrowser* browser,
GtkTreeIter iter; GtkTreeIter iter;
GtkWidget* view; GtkWidget* view;
if (GTK_OBJECT_FLAGS (browser) & GTK_IN_DESTRUCTION) if (g_object_get_data (G_OBJECT (browser), "midori-browser-destroyed"))
return; return;
view = midori_browser_get_current_tab (browser); view = midori_browser_get_current_tab (browser);

2
midori/midori-browser.c
View file

@ -5196,6 +5196,8 @@ midori_browser_size_allocate_cb (MidoriBrowser* browser,
static void static void
midori_browser_destroy_cb (MidoriBrowser* browser) midori_browser_destroy_cb (MidoriBrowser* browser)
{ {
g_object_set_data (G_OBJECT (browser), "midori-browser-destroyed", (void*)1);
if (G_UNLIKELY (browser->panel_timeout)) if (G_UNLIKELY (browser->panel_timeout))
g_source_remove (browser->panel_timeout); g_source_remove (browser->panel_timeout);
if (G_UNLIKELY (browser->alloc_timeout)) if (G_UNLIKELY (browser->alloc_timeout))