Commit cd0ab93c authored by Christopher Davis's avatar Christopher Davis

general: Clean up warnings

We've had a few warnings sticking around for unused pieces of code, or things that needed some form of error handling.
parent b5412aae
use crate::config; use crate::config;
use crate::utils; use crate::utils;
use crate::widgets::Window; use crate::widgets::Window;
use gtk::gdk;
use gtk::gio::{self, prelude::*}; use gtk::gio::{self, prelude::*};
use gtk::glib::{self, clone}; use gtk::glib::{self, clone};
use gtk::prelude::*; use gtk::prelude::*;
......
...@@ -14,8 +14,14 @@ fn main() { ...@@ -14,8 +14,14 @@ fn main() {
pretty_env_logger::init(); pretty_env_logger::init();
// Prepare i18n // Prepare i18n
setlocale(LocaleCategory::LcAll, ""); setlocale(LocaleCategory::LcAll, "");
bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR); bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR).expect(&format!(
textdomain(GETTEXT_PACKAGE); "Unable to bind text domain for {}",
GETTEXT_PACKAGE
));
textdomain(GETTEXT_PACKAGE).expect(&format!(
"Unable to switch to text domain {}",
GETTEXT_PACKAGE
));
glib::set_application_name(&gettext("Tour")); glib::set_application_name(&gettext("Tour"));
glib::set_prgname(Some("Tour")); glib::set_prgname(Some("Tour"));
......
use crate::utils::i18n_f;
use gettextrs::gettext; use gettextrs::gettext;
use gtk::glib; use gtk::glib;
use gtk::prelude::*; use gtk::prelude::*;
...@@ -96,8 +95,6 @@ impl Window { ...@@ -96,8 +95,6 @@ impl Window {
.upcast::<gtk::Widget>(), .upcast::<gtk::Widget>(),
); );
let name = glib::os_info("NAME").unwrap_or_else(|| "GNOME".into());
let version = glib::os_info("VERSION").unwrap_or_else(|| "".into());
let last_page = ImagePageWidget::new( let last_page = ImagePageWidget::new(
"/org/gnome/Tour/ready-to-go.svg", "/org/gnome/Tour/ready-to-go.svg",
gettext("That's it. Have a nice day!"), gettext("That's it. Have a nice day!"),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment