Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-26 13:21:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: update dependency versions (#3853)

Browse Source 
* build: rename GTK_MINIMUM, etc as GTKMM_MINIMUM in CMakeLists

* build: bump glibmm depdency min version to 2.60.0

https://github.com/transmission/transmission/issues/3846\#issuecomment-1263782526

for extraclassinit.h

* build: fix duplicated version number for deflate dependency

* build: sort dependency list in CMakeLists.txt

no functional changes, just housekeeping

* refactor: remove gtr_get_ptr()
This commit is contained in:
Charles Kerr
2022-09-30 17:15:21 -05:00
committed by GitHub
parent 1cd6c0464c
commit 3f44076e23
7 changed files with 33 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/IconCache.cc
View File

@@ -103,12 +103,12 @@ Glib::RefPtr<Gdk::Pixbuf> _get_icon_pixbuf(Glib::RefPtr<Gio::Icon> const& icon,
return {};
}
if (auto* const ticon = dynamic_cast<Gio::ThemedIcon*>(gtr_get_ptr(icon)); ticon != nullptr)
if (auto* const ticon = dynamic_cast<Gio::ThemedIcon*>(icon.get()); ticon != nullptr)
{
return get_themed_icon_pixbuf(*ticon, size, theme);
}
if (auto* const ficon = dynamic_cast<Gio::FileIcon*>(gtr_get_ptr(icon)); ficon != nullptr)
if (auto* const ficon = dynamic_cast<Gio::FileIcon*>(icon.get()); ficon != nullptr)
{
return get_file_icon_pixbuf(*ficon, size);
}
@@ -127,7 +127,7 @@ Glib::RefPtr<Gdk::Pixbuf> icon_cache_get_mime_type_icon(IconCache& icons, std::s
auto mime_type_str = std::string{ mime_type };
auto icon = Gio::content_type_get_icon(mime_type_str);
auto pixbuf = _get_icon_pixbuf(icon, icons.icon_size, *gtr_get_ptr(icons.icon_theme));
auto pixbuf = _get_icon_pixbuf(icon, icons.icon_size, *icons.icon_theme.get());
if (pixbuf != nullptr)
{
cache.try_emplace(std::move(mime_type_str), pixbuf);