[librsvg: 39/45] Pass a session to UserLanguage::new()
- From: Marge Bot <marge-bot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg: 39/45] Pass a session to UserLanguage::new()
- Date: Wed, 24 Aug 2022 01:56:39 +0000 (UTC)
commit f0c8de531e5d007696f293411e3e446e9d31abc3
Author: Federico Mena Quintero <federico gnome org>
Date: Tue Aug 23 18:05:42 2022 -0500
Pass a session to UserLanguage::new()
Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/731>
src/api.rs | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/src/api.rs b/src/api.rs
index 7feada13f..44057a207 100644
--- a/src/api.rs
+++ b/src/api.rs
@@ -221,7 +221,7 @@ impl Loader {
stream.as_ref(),
cancellable.map(|c| c.as_ref()),
)?,
- _session: self.session,
+ session: self.session,
})
}
}
@@ -235,7 +235,7 @@ fn url_from_file(file: &gio::File) -> Result<Url, LoadingError> {
/// You can create this from one of the `read` methods in
/// [`Loader`].
pub struct SvgHandle {
- _session: Session,
+ session: Session,
pub(crate) handle: Handle,
}
@@ -334,12 +334,16 @@ fn locale_from_environment() -> Locale {
}
impl UserLanguage {
- fn new(language: &Language) -> UserLanguage {
+ fn new(language: &Language, session: &Session) -> UserLanguage {
match *language {
Language::FromEnvironment => UserLanguage::LanguageTags(
LanguageTags::from_locale(&locale_from_environment())
.map_err(|s| {
- rsvg_log!("could not convert locale to language tags: {}", s);
+ rsvg_log_session!(
+ session,
+ "could not convert locale to language tags: {}",
+ s
+ );
})
.unwrap_or_else(|_| LanguageTags::empty()),
),
@@ -357,10 +361,12 @@ impl<'a> CairoRenderer<'a> {
///
/// [`with_dpi`]: #method.with_dpi
pub fn new(handle: &'a SvgHandle) -> Self {
+ let session = &handle.session;
+
CairoRenderer {
handle,
dpi: Dpi::new(DEFAULT_DPI_X, DEFAULT_DPI_Y),
- user_language: UserLanguage::new(&Language::FromEnvironment),
+ user_language: UserLanguage::new(&Language::FromEnvironment, session),
is_testing: false,
}
}
@@ -391,7 +397,7 @@ impl<'a> CairoRenderer<'a> {
/// be obtained from the program's environment. To set an explicit list of languages,
/// you can use `Language::AcceptLanguage` instead.
pub fn with_language(self, language: &Language) -> Self {
- let user_language = UserLanguage::new(language);
+ let user_language = UserLanguage::new(language, &self.handle.session);
CairoRenderer {
user_language,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]