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

Don't leak the inspector_view in showing and detaching

Browse source
This commit is contained in:
Christian Dywan 2010-10-05 21:41:19 +02:00
parent a9406ab0ec
commit 579108e4e6
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
midori/midori-view.c
View file

@ -3273,11 +3273,10 @@ static gboolean
midori_view_web_inspector_show_window_cb (gpointer inspector, midori_view_web_inspector_show_window_cb (gpointer inspector,
MidoriView* view) MidoriView* view)
{ {
GtkWidget* inspector_view; GtkWidget* inspector_view = katze_object_get_object (inspector, "web-view");
GtkWidget* window; GtkWidget* window = gtk_widget_get_toplevel (inspector_view);
g_object_unref (inspector_view);
g_object_get (inspector, "web-view", &inspector_view, NULL);
window = gtk_widget_get_toplevel (inspector_view);
if (!window) if (!window)
return FALSE; return FALSE;
gtk_window_present (GTK_WINDOW (window)); gtk_window_present (GTK_WINDOW (window));
@ -3300,13 +3299,13 @@ midori_view_web_inspector_detach_window_cb (gpointer inspector,
{ {
GtkWidget* inspector_view = katze_object_get_object (inspector, "web-view"); GtkWidget* inspector_view = katze_object_get_object (inspector, "web-view");
GtkWidget* parent = gtk_widget_get_parent (inspector_view); GtkWidget* parent = gtk_widget_get_parent (inspector_view);
g_object_unref (inspector_view);
if (GTK_IS_WINDOW (parent)) if (GTK_IS_WINDOW (parent))
return FALSE; return FALSE;
gtk_widget_hide (parent); gtk_widget_hide (parent);
gtk_container_remove (GTK_CONTAINER (parent), inspector_view); gtk_container_remove (GTK_CONTAINER (parent), inspector_view);
midori_view_web_inspector_construct_window (inspector, midori_view_web_inspector_construct_window (inspector,
WEBKIT_WEB_VIEW (view->web_view), inspector_view, view); WEBKIT_WEB_VIEW (view->web_view), inspector_view, view);
g_object_unref (inspector_view);
return TRUE; return TRUE;
} }