Merge lp:~gue5t/midori/bitesize-leaks into lp:midori

[gue5t gue5t]

Fix a few simple leaks

Fix a few simple leaks. The first is the MidoriApp singleton, whose ownership is never given to a container, but which is also never unreffed after the main loop ends. We should create the app, run our main loop, and then unref the app.

The second is that while a browser unsets its bookmarks when disposing, it doesn't unset its history. History holds a reference on the MidoriApp via midori_history_set_app, so it's important to make sure history is cleaned up properly.

The third is that the MidoriApp is set as the parent of the KatzeArray used to store the session to be restored. This feature doesn't work right now with tabby, and nothing ever stores this session anyhow, so it's safe to unset the parent and unref the array after the last time it's used, to avoid leaking it and its reference to the MidoriApp.

[Cris Dywan (kalikiana)]

Those looks sane… do you by any chance have ideas on how to verify that these stay fixed? Say a ref count check in a test case before and after doing something.

I'll approve and leave it up to you whether to merge now or if you have some ideas.

review: Approve

[gue5t gue5t (gue5t)]

I'll merge now I guess, as I'm going to have some more refcounting patches which will be another opportunity to introduce some refcounting/leak tests.

=== modified file 'midori/main.c'
--- midori/main.c	2013-10-30 00:05:40 +0000
+++ midori/main.c	2014-04-23 03:44:51 +0000
@@ -391,6 +391,7 @@
     g_signal_connect (app, "quit", G_CALLBACK (gtk_main_quit), NULL);
     gtk_main ();
     midori_normal_app_on_quit (app);
+    g_object_unref (app);
     return 0;
 }
 

=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2014-04-16 21:00:49 +0000
+++ midori/midori-browser.c	2014-04-23 03:44:51 +0000
@@ -6187,6 +6187,7 @@
                                           midori_browser_settings_notify,
                                           browser);
     midori_browser_set_bookmarks (browser, NULL);
+    midori_browser_set_history (browser, NULL);
 
     G_OBJECT_CLASS (midori_browser_parent_class)->dispose (object);
 }

=== modified file 'midori/midori-frontend.c'
--- midori/midori-frontend.c	2014-04-06 16:31:06 +0000
+++ midori/midori-frontend.c	2014-04-23 03:44:51 +0000
@@ -585,6 +585,8 @@
             return NULL;
         load_on_startup = response;
     }
+    katze_item_set_parent (KATZE_ITEM (session), NULL);
+    g_object_unref (session);
     g_object_set_data (G_OBJECT (settings), "load-on-startup", GINT_TO_POINTER (load_on_startup));
 
     g_object_set (app, "settings", settings,