Merge lp:~gue5t/midori/resource-ref into lp:midori

[gue5t gue5t]

Fix crash when saving with associated resources

This fixes a crash caused by not reffing resources which we obtain from WebKit when saving them.

[lp:~gue5t/midori/resource-ref]

6742. By gue5t <email address hidden> on 2014-07-30

Merge upstream

[Paweł Forysiuk (tuxator)]

Looks sensible and fixed the crash.

review: Approve

=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2014-07-27 16:50:30 +0000
+++ midori/midori-browser.c	2014-07-30 17:48:41 +0000
@@ -1372,6 +1372,7 @@
         katze_assign (last_dir,
             gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog)));
     }
+    g_list_foreach (resources, (GFunc)g_object_unref, NULL);
     g_list_free (resources);
 #else
     filename = midori_download_clean_filename (title);
 
=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2014-07-27 16:50:30 +0000
+++ midori/midori-view.c	2014-07-30 17:48:41 +0000
@@ -2037,6 +2037,14 @@
     g_free (uri);
 }
 
+/**
+ * midori_view_get_resources:
+ * @view: a #MidoriView
+ *
+ * Obtain a list of the resources loaded by the page shown in the view.
+ *
+ * Return value: (transfer full) (element-type WebKitWebResource): the resources
+ **/
 GList*
 midori_view_get_resources (MidoriView* view)
 {
@@ -2047,7 +2055,9 @@
     WebKitWebFrame* frame = webkit_web_view_get_main_frame (web_view);
     WebKitWebDataSource* data_source = webkit_web_frame_get_data_source (frame);
     GList* resources = webkit_web_data_source_get_subresources (data_source);
-    return g_list_prepend (resources, webkit_web_data_source_get_main_resource (data_source));
+    resources = g_list_prepend (resources, webkit_web_data_source_get_main_resource (data_source));
+    g_list_foreach (resources, (GFunc)g_object_ref, NULL);
+    return resources;
 #else
     return NULL;
 #endif
@@ -2073,6 +2083,7 @@
         }
     }
 #endif
+    g_list_foreach (resources, (GFunc)g_object_unref, NULL);
     g_list_free (resources);
     return result;
 }