cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash with GTK+ 2 in wxMimeTypesManager code

Browse Source 
Fix the crash introduced by 4dfde501df: we can't
use g_object_unref() to free GtkIconInfo with GTK+ 2.

See https://github.com/wxWidgets/wxWidgets/pull/293
This commit is contained in:
Vadim Zeitlin 2016-06-08 15:34:44 +02:00
parent 54e6f6e7b8
commit 3c4f51df70
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/gtk/mimetype.cpp
View File

@ -31,17 +31,30 @@ wxString wxGTKMimeTypesManagerImpl::GetIconFromMimeType(const wxString& mime)
if ( !theme )
return wxString();
wxGtkObject<GtkIconInfo> giconinfo(gtk_icon_theme_lookup_by_gicon
(
theme,
gicon,
256,
GTK_ICON_LOOKUP_NO_SVG
));
if ( !giconinfo )
return wxString();
// Notice that we can't use wxGtkObject here because a special function
// needs to be used for freeing this object in GTK+ 2. We should switch to
// using wxGtkObject when support for GTK+ 2 is dropped.
GtkIconInfo* const giconinfo = gtk_icon_theme_lookup_by_gicon
(
theme,
gicon,
256,
GTK_ICON_LOOKUP_NO_SVG
);
return wxString::FromUTF8(gtk_icon_info_get_filename(giconinfo));
wxString icon;
if ( giconinfo )
{
icon = wxString::FromUTF8(gtk_icon_info_get_filename(giconinfo));
#ifdef __WXGTK3__
g_object_unref(giconinfo);
#else
gtk_icon_info_free(giconinfo);
#endif
}
return icon;
}
wxMimeTypesManagerImpl *wxGTKMimeTypesManagerFactory::CreateMimeTypesManagerImpl()