Merge lp://staging/~khurshid-alam/unity-control-center/fix-image-preview into lp://staging/unity-control-center
Proposed by
Khurshid Alam
| Status: | Merged |
|---|---|
| Merged at revision: | 12917 |
| Proposed branch: | lp://staging/~khurshid-alam/unity-control-center/fix-image-preview |
| Merge into: | lp://staging/unity-control-center |
| Diff against target: |
59 lines (+6/-4) 2 files modified
panels/appearance/cc-appearance-panel.c (+3/-2) panels/user-accounts/um-photo-dialog.c (+3/-2) |
| To merge this branch: | bzr merge lp://staging/~khurshid-alam/unity-control-center/fix-image-preview |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Sebastien Bacher | Approve | ||
|
Review via email:
|
|||
Commit message
Fix image preview in GtkFileChooser
g_file_
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.
To post a comment you must log in.
Revision history for this message
| Khurshid Alam (khurshid-alam) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thank you for your work
The corresponding upstream change for the user panel is
https:/
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