callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modify the tab-label-destroy fix to not crash epiphany.

Browse Source 
2007-12-04  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtknotebook.c: Modify the tab-label-destroy fix to not
        crash epiphany.


svn path=/trunk/; revision=19107
This commit is contained in:
Matthias Clasen
2007-12-04 18:43:47 +00:00
committed by Matthias Clasen
parent f411b93ca3
commit 2b3c7b70ef
2 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2007-12-04 Matthias Clasen <mclasen@redhat.com>
* gtk/gtknotebook.c: Modify the tab-label-destroy fix to not
crash epiphany.
2007-12-03 Richard Hult <richard@imendio.com> 2007-12-03 Richard Hult <richard@imendio.com>
* gtk/gtkquartz.c: (_gtk_quartz_set_selection_data_for_pasteboard): * gtk/gtkquartz.c: (_gtk_quartz_set_selection_data_for_pasteboard):

24
gtk/gtknotebook.c
View File

@ -1455,7 +1455,6 @@ gtk_notebook_destroy (GtkObject *object)
{ {
GtkNotebook *notebook = GTK_NOTEBOOK (object); GtkNotebook *notebook = GTK_NOTEBOOK (object);
GtkNotebookPrivate *priv = GTK_NOTEBOOK_GET_PRIVATE (notebook); GtkNotebookPrivate *priv = GTK_NOTEBOOK_GET_PRIVATE (notebook);
GList *l;
if (notebook->menu) if (notebook->menu)
gtk_notebook_popup_disable (notebook); gtk_notebook_popup_disable (notebook);
@ -1472,23 +1471,6 @@ gtk_notebook_destroy (GtkObject *object)
priv->switch_tab_timer = 0; priv->switch_tab_timer = 0;
} }
for (l = notebook->children; l; l = l->next)
{
GtkNotebookPage *page = l->data;
GtkWidget *w = page->tab_label;
if (w) {
g_object_ref (w);
gtk_notebook_remove_tab_label (notebook, page);
gtk_widget_destroy (w);
g_object_unref (w);
}
}
/*
* Prevent gtk_notebook_update_labels from doing work. (And from crashing
* since we have NULL tab_labels all over.
*/
notebook->show_tabs = FALSE;
GTK_OBJECT_CLASS (gtk_notebook_parent_class)->destroy (object); GTK_OBJECT_CLASS (gtk_notebook_parent_class)->destroy (object);
} }
@ -4331,6 +4313,7 @@ gtk_notebook_real_remove (GtkNotebook *notebook,
GtkNotebookPage *page; GtkNotebookPage *page;
GList * next_list; GList * next_list;
gint need_resize = FALSE; gint need_resize = FALSE;
GtkWidget *tab_label;
gboolean destroying; gboolean destroying;
@ -4365,7 +4348,12 @@ gtk_notebook_real_remove (GtkNotebook *notebook,
gtk_widget_unparent (page->child); gtk_widget_unparent (page->child);
tab_label = page->tab_label;
g_object_ref (tab_label);
gtk_notebook_remove_tab_label (notebook, page); gtk_notebook_remove_tab_label (notebook, page);
if (destroying)
gtk_widget_destroy (tab_label);
g_object_unref (tab_label);
if (notebook->menu) if (notebook->menu)
{ {