Commit ed27186d authored by Alejandro Domínguez's avatar Alejandro Domínguez Committed by Daniel Garcia Moreno

fractal-gtk: Depend on url crate through fractal-matrix-api

parent 313f5cf6
Pipeline #152128 passed with stages
in 37 minutes
......@@ -580,7 +580,6 @@ dependencies = [
"serde 1.0.98 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
"sourceview4 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
......
......@@ -32,7 +32,6 @@ regex = "1.1.0"
secret-service = "1.0.0"
serde_json = "1.0.33"
sourceview4 = "0.1.0"
url = "1.7.2"
[dependencies.gst]
version = "0.14.0"
......
use crate::i18n::i18n;
use fractal_api::r0::AccessToken;
use fractal_api::url::Url;
use gio::prelude::*;
use gio::SimpleAction;
use gio::SimpleActionGroup;
use gtk;
use gtk::prelude::*;
use std::sync::mpsc::Sender;
use url::Url;
use crate::backend::BKCommand;
......
......@@ -12,12 +12,12 @@ use crate::i18n::i18n;
use crate::types::Message;
use crate::uibuilder::UI;
use crate::App;
use fractal_api::url::Url;
use gio::ActionMapExt;
use gio::SimpleAction;
use gio::SimpleActionGroup;
use gtk;
use gtk::prelude::*;
use url::Url;
use crate::widgets::ErrorDialog;
use crate::widgets::FileDialog::save;
......
use fractal_api::r0::AccessToken;
use fractal_api::url::Url;
use gio::prelude::*;
use gio::SimpleAction;
use gio::SimpleActionGroup;
......@@ -6,7 +7,6 @@ use glib;
use gtk;
use gtk::prelude::*;
use std::sync::mpsc::Sender;
use url::Url;
use crate::backend::BKCommand;
use crate::i18n::i18n;
......
......@@ -2,7 +2,7 @@ use log::error;
use fractal_api::r0::AccessToken;
use url::Url;
use fractal_api::url::Url;
use crate::appop::AppOp;
......
......@@ -8,7 +8,7 @@ use fractal_api::r0::AccessToken;
use gtk;
use gtk::prelude::*;
use url::Url;
use fractal_api::url::Url;
use crate::backend;
use crate::backend::BKCommand;
......
use crate::i18n::{i18n, i18n_k, ni18n_f};
use fractal_api::url::Url;
use log::{error, warn};
use std::fs::remove_file;
use std::os::unix::fs;
use url::Url;
use gtk;
use gtk::prelude::*;
......
use fractal_api::url::Url;
use gtk;
use gtk::LabelExt;
use serde::{Deserialize, Serialize};
use url::Url;
use crate::types::Room;
use crate::types::RoomList;
......
use fractal_api::url::Url;
use lazy_static::lazy_static;
use url::Url;
pub static CACHE_SIZE: usize = 40;
pub static MSG_ICON_SIZE: i32 = 40;
......
use fractal_api::derror;
use fractal_api::r0::AccessToken;
use fractal_api::url::ParseError;
use fractal_api::url::Url;
use secret_service;
use url::ParseError;
use url::Url;
#[derive(Debug)]
pub enum Error {
......@@ -49,7 +49,7 @@ pub trait PasswordStorage {
mod ss_storage {
use super::Error;
use fractal_api::r0::AccessToken;
use url::Url;
use fractal_api::url::Url;
use super::secret_service::EncryptionType;
use super::secret_service::SecretService;
......
use fractal_api::r0::AccessToken;
use fractal_api::r0::Medium;
use fractal_api::url::Url;
use glib::signal;
use gtk;
use gtk::prelude::*;
use rand::distributions::Alphanumeric;
use rand::{thread_rng, Rng};
use std::sync::mpsc::Sender;
use url::Url;
use crate::appop::AppOp;
use crate::backend::BKCommand;
......
use fractal_api::url::Url;
use gdk::ContextExt;
use gdk_pixbuf;
use gdk_pixbuf::Pixbuf;
......@@ -13,7 +14,6 @@ use std::path::Path;
use std::sync::mpsc::channel;
use std::sync::mpsc::{Receiver, Sender};
use std::sync::{Arc, Mutex};
use url::Url;
use crate::backend::BKCommand;
use crate::error::Error;
......
......@@ -42,7 +42,7 @@ use std::sync::mpsc::channel;
use std::sync::mpsc::TryRecvError;
use std::sync::mpsc::{Receiver, Sender};
use url::Url;
use fractal_api::url::Url;
use crate::app::App;
use crate::backend::BKCommand;
......
use fractal_api::url::Url;
use gio::prelude::*;
use gtk::prelude::*;
use log::info;
use url::Url;
use crate::actions;
use crate::actions::global::AppState;
......
......@@ -8,6 +8,7 @@ use std::rc::Rc;
use crate::i18n::i18n;
use dirs;
use fractal_api::url::Url;
use gdk::*;
use glib;
use glib::signal;
......@@ -15,7 +16,6 @@ use gtk;
use gtk::prelude::*;
use gtk::Overlay;
use gtk::ResponseType;
use url::Url;
use crate::types::Message;
use crate::types::Room;
......
......@@ -2,6 +2,7 @@ use crate::i18n::i18n;
use itertools::Itertools;
use chrono::prelude::*;
use fractal_api::url::Url;
use glib;
use gtk;
use gtk::{prelude::*, ButtonExt, ContainerExt, Overlay, WidgetExt};
......@@ -9,7 +10,6 @@ use pango;
use std::cmp::max;
use std::rc::Rc;
use std::sync::mpsc::Sender;
use url::Url;
use crate::backend::BKCommand;
......
......@@ -18,6 +18,7 @@ use crate::uitypes::RowType;
use crate::globals;
use crate::widgets;
use crate::widgets::{PlayerExt, VideoPlayerWidget};
use fractal_api::url::Url;
use gio::ActionMapExt;
use gio::SimpleActionGroup;
use glib::source;
......@@ -25,7 +26,6 @@ use glib::SignalHandlerId;
use glib::Source;
use gtk;
use gtk::prelude::*;
use url::Url;
struct List {
list: VecDeque<Element>,
......
......@@ -5,10 +5,10 @@ use std::rc::Rc;
use std::sync::mpsc::Sender;
use crate::i18n::ni18n_f;
use fractal_api::url::Url;
use gio::prelude::*;
use gtk;
use gtk::prelude::*;
use url::Url;
use crate::actions;
use crate::actions::{ButtonState, StateExt};
......
......@@ -5,10 +5,10 @@ use gdk;
use glib;
use pango;
use fractal_api::url::Url;
use gtk;
use gtk::prelude::*;
use std::collections::HashMap;
use url::Url;
use crate::globals;
use crate::types::{Room, RoomTag};
......
......@@ -13,6 +13,7 @@ mod serde;
pub mod types;
pub use ruma_identifiers as identifiers;
pub use url;
#[cfg(test)]
mod tests {
......
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