Merge lp:~khurshid-alam/unity-control-center/fix-image-preview into lp:unity-control-center

[Khurshid Alam]

Fix image preview in GtkFileChooser

g_file_info_get_content_type() returns an internal string, and we were
freeing the file_info we got it from in the next line, so it's a miracle
that the mime_type was ever not garbage.

See https://bugzilla.gnome.org/show_bug.cgi?id=778424

[Sebastien Bacher (seb128)]

Thank you for your work

The corresponding upstream change for the user panel is
https://gitlab.gnome.org/GNOME/gnome-control-center/commit/5c5d6087

Why didn't you take the other parts of the change? The "non-const" seems needed since now mime_type is the return of a g_strdup. The free call is also needed otherwise you leak the dup-ed string

The appareance capplet code is in the same case

review: Needs Fixing

[lp:~khurshid-alam/unity-control-center/fix-image-preview]

12916. By Khurshid Alam on 2018-12-03

Use non-const for mime_type and free it as well

[Khurshid Alam (khurshid-alam)]

Right, now Fixed.

[Sebastien Bacher (seb128)]

that's better, thanks

review: Approve

=== modified file 'panels/appearance/cc-appearance-panel.c'
--- panels/appearance/cc-appearance-panel.c	2017-07-18 16:31:27 +0000
+++ panels/appearance/cc-appearance-panel.c	2018-12-03 16:12:45 +0000
@@ -1285,7 +1285,7 @@
   if (uri)
     {
       GdkPixbuf *pixbuf = NULL;
-      const gchar *mime_type = NULL;
+      char *mime_type = NULL;
       GFile *file;
       GFileInfo *file_info;
       GtkWidget *preview;
@@ -1300,7 +1300,7 @@
       g_object_unref (file);
 
       if (file_info != NULL) {
-	      mime_type = g_file_info_get_content_type (file_info);
+	      mime_type = g_strdup (g_file_info_get_content_type (file_info));
 	      g_object_unref (file_info);
       }
 
@@ -1309,6 +1309,7 @@
         pixbuf = gnome_desktop_thumbnail_factory_generate_thumbnail (thumb_factory,
 								     uri,
 								     mime_type);
+		g_free (mime_type);
 	}
 
       gtk_dialog_set_response_sensitive (GTK_DIALOG (chooser),
 
=== modified file 'panels/user-accounts/um-photo-dialog.c'
--- panels/user-accounts/um-photo-dialog.c	2014-02-21 15:48:18 +0000
+++ panels/user-accounts/um-photo-dialog.c	2018-12-03 16:12:45 +0000
@@ -163,7 +163,7 @@
 
         if (uri) {
                 GdkPixbuf *pixbuf = NULL;
-                const gchar *mime_type = NULL;
+                char *mime_type = NULL;
                 GFile *file;
                 GFileInfo *file_info;
                 GtkWidget *preview;
@@ -178,7 +178,7 @@
                 g_object_unref (file);
 
                 if (file_info != NULL) {
-                        mime_type = g_file_info_get_content_type (file_info);
+                        mime_type = g_strdup (g_file_info_get_content_type (file_info));
                         g_object_unref (file_info);
                 }
 
@@ -186,6 +186,7 @@
                         pixbuf = gnome_desktop_thumbnail_factory_generate_thumbnail (thumb_factory,
                                                                                      uri,
                                                                                      mime_type);
+                        g_free (mime_type);
                 }
 
                 gtk_dialog_set_response_sensitive (GTK_DIALOG (chooser),