mirror of
https://github.com/transmission/transmission.git
synced 2026-02-15 07:26:49 +00:00
fix: support Glib::ustring in Converters (#8418)
fixes regression introduced in 64a53a8
This commit is contained in:
19
gtk/main.cc
19
gtk/main.cc
@@ -11,6 +11,7 @@
|
|||||||
#include <libtransmission-app/app.h>
|
#include <libtransmission-app/app.h>
|
||||||
|
|
||||||
#include <libtransmission/transmission.h>
|
#include <libtransmission/transmission.h>
|
||||||
|
#include <libtransmission/serializer.h>
|
||||||
#include <libtransmission/utils.h>
|
#include <libtransmission/utils.h>
|
||||||
#include <libtransmission/version.h>
|
#include <libtransmission/version.h>
|
||||||
|
|
||||||
@@ -46,11 +47,29 @@ Glib::OptionEntry create_option_entry(Glib::ustring const& long_name, gchar shor
|
|||||||
entry.set_description(description);
|
entry.set_description(description);
|
||||||
return entry;
|
return entry;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool to_ustring(tr_variant const& src, Glib::ustring* tgt)
|
||||||
|
{
|
||||||
|
if (auto str = tr::serializer::to_value<std::string>(src))
|
||||||
|
{
|
||||||
|
*tgt = Glib::ustring{ std::move(*str) };
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
tr_variant from_ustring(Glib::ustring const& ustr)
|
||||||
|
{
|
||||||
|
return tr::serializer::to_variant(ustr.raw());
|
||||||
|
}
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
||||||
int main(int argc, char** argv)
|
int main(int argc, char** argv)
|
||||||
{
|
{
|
||||||
tr::app::init();
|
tr::app::init();
|
||||||
|
tr::serializer::Converters::add(to_ustring, from_ustring);
|
||||||
|
|
||||||
/* init i18n */
|
/* init i18n */
|
||||||
bindtextdomain(AppTranslationDomainName, TRANSMISSIONLOCALEDIR);
|
bindtextdomain(AppTranslationDomainName, TRANSMISSIONLOCALEDIR);
|
||||||
|
|||||||
Reference in New Issue
Block a user