use gst::glib where applicable

audio/audiofx/Cargo.toml

@@ -8,7 +8,6 @@ description = "Rust AudioFx Plugin"
 edition = "2018"
 
 [dependencies]
-glib = { git = "https://github.com/gtk-rs/gtk-rs-core" }
 gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_16"] }
 gst-base = { package = "gstreamer-base", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_16"] }
 gst-audio = { package = "gstreamer-audio", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_16"] }

audio/audiofx/src/audioecho/imp.rs

@@ -6,7 +6,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use glib::subclass::prelude::*;
+use gst::glib;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 use gst_base::subclass::prelude::*;

audio/audiofx/src/audioecho/mod.rs

@@ -6,7 +6,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use glib::prelude::*;
+use gst::glib;
+use gst::prelude::*;
 
 mod imp;
 mod ring_buffer;

audio/audiofx/src/audioloudnorm/imp.rs

@@ -18,7 +18,7 @@
 // License along with FFmpeg; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-use glib::subclass::prelude::*;
+use gst::glib;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 use gst::{gst_debug, gst_error, gst_info, gst_log};

audio/audiofx/src/audioloudnorm/mod.rs

@@ -18,7 +18,8 @@
 // License along with FFmpeg; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-use glib::prelude::*;
+use gst::glib;
+use gst::prelude::*;
 
 mod imp;
 

audio/audiofx/src/audiornnoise/imp.rs

@@ -7,7 +7,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use glib::subclass::prelude::*;
+use gst::glib;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 use gst::{gst_debug, gst_error};

audio/audiofx/src/audiornnoise/mod.rs

@@ -7,7 +7,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use glib::prelude::*;
+use gst::glib;
+use gst::prelude::*;
 
 mod imp;
 

audio/audiofx/src/ebur128level/imp.rs

@@ -6,7 +6,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use glib::subclass::prelude::*;
+use gst::glib;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 use gst::{gst_debug, gst_error, gst_info};

audio/audiofx/src/ebur128level/mod.rs

@@ -6,7 +6,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use glib::prelude::*;
+use gst::glib;
+use gst::prelude::*;
 
 mod imp;
 

audio/audiofx/src/lib.rs

@@ -6,6 +6,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use gst::glib;
+
 mod audioecho;
 mod audioloudnorm;
 mod audiornnoise;

audio/audiofx/tests/audioloudnorm.rs

@@ -14,7 +14,7 @@
 // License along with this library; if not, write to the
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
-use glib::prelude::*;
+
 use gst::prelude::*;
 
 use byte_slice_cast::*;

audio/audiofx/tests/ebur128level.rs

@@ -6,6 +6,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use gst::glib;
 use gst::prelude::*;
 
 fn init() {

audio/claxon/Cargo.toml

@@ -8,7 +8,6 @@ description = "Claxon FLAC Decoder Plugin"
 edition = "2018"
 
 [dependencies]
-glib = { git = "https://github.com/gtk-rs/gtk-rs-core" }
 gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" }
 gst-audio = { package = "gstreamer-audio", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" }
 claxon = { version = "0.4" }

audio/claxon/src/claxondec/imp.rs

@@ -6,7 +6,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use glib::subclass::prelude::*;
+use gst::glib;
 use gst::subclass::prelude::*;
 use gst::{gst_debug, gst_error};
 use gst_audio::prelude::*;

audio/claxon/src/claxondec/mod.rs

@@ -6,7 +6,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use glib::prelude::*;
+use gst::glib;
+use gst::prelude::*;
 
 mod imp;
 

audio/claxon/src/lib.rs

@@ -6,6 +6,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use gst::glib;
+
 mod claxondec;
 
 fn plugin_init(plugin: &gst::Plugin) -> Result<(), glib::BoolError> {

audio/csound/Cargo.toml

@@ -8,7 +8,6 @@ edition = "2018"
 description = "An Audio filter plugin based on Csound"
 
 [dependencies]
-glib = { git = "https://github.com/gtk-rs/gtk-rs-core" }
 gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" }
 gst-base = { package = "gstreamer-base", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" }
 gst-audio = { package = "gstreamer-audio", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" }

audio/csound/examples/effect_example.rs

@@ -15,7 +15,6 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::prelude::*;
 use gst::prelude::*;
 
 use std::error::Error;
@@ -40,25 +39,25 @@ const CSD: &str = "
     sr = 44100
     ksmps = 7
 
-    nchnls_i = 1 
-    nchnls = 2   
+    nchnls_i = 1
+    nchnls = 2
 
     gasig  init 0
-    gidel  = 1	
+    gidel  = 1
 
     instr 1
 
         ain in
             outs ain, ain
 
-        vincr gasig, ain	
+        vincr gasig, ain
     endin
 
     instr 2
 
         ifeedback = p4
 
-        aseg linseg 1., p3, 0.0 
+        aseg linseg 1., p3, 0.0
 
         abuf2	delayr	gidel
         adelL 	deltap	.4

audio/csound/src/filter/imp.rs

@@ -15,7 +15,7 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::subclass::prelude::*;
+use gst::glib;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 use gst::{

audio/csound/src/filter/mod.rs

@@ -15,7 +15,8 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::prelude::*;
+use gst::glib;
+use gst::prelude::*;
 
 mod imp;
 

audio/csound/src/lib.rs

@@ -15,6 +15,8 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
+use gst::glib;
+
 mod filter;
 
 fn plugin_init(plugin: &gst::Plugin) -> Result<(), glib::BoolError> {

audio/csound/tests/csound_filter.rs

@@ -14,7 +14,6 @@
 // License along with this library; if not, write to the
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
-use glib::prelude::*;
 use gst::prelude::*;
 
 use byte_slice_cast::*;
@@ -33,13 +32,13 @@ macro_rules! CSD {
             <CsInstruments>
             sr = 44100 ; default sample rate
             ksmps = {}
-            nchnls_i = {} 
+            nchnls_i = {}
             nchnls = {}
             0dbfs  = 1
 
-            instr 1 
+            instr 1
 
-            {} ;input	
+            {} ;input
                 {}	; csound output
 
             endin

audio/lewton/Cargo.toml

@@ -8,7 +8,6 @@ description = "lewton Vorbis Decoder Plugin"
 edition = "2018"
 
 [dependencies]
-glib = { git = "https://github.com/gtk-rs/gtk-rs-core" }
 gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" }
 gst-audio = { package = "gstreamer-audio", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" }
 lewton = { version = "0.10", default-features = false }

audio/lewton/src/lewtondec/imp.rs

@@ -6,7 +6,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use glib::subclass::prelude::*;
+use gst::glib;
 use gst::subclass::prelude::*;
 use gst::{gst_debug, gst_error, gst_warning};
 use gst_audio::audio_decoder_error;

audio/lewton/src/lewtondec/mod.rs

@@ -6,7 +6,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use glib::prelude::*;
+use gst::glib;
+use gst::prelude::*;
 
 mod imp;
 

audio/lewton/src/lib.rs

@@ -6,6 +6,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use gst::glib;
+
 mod lewtondec;
 
 fn plugin_init(plugin: &gst::Plugin) -> Result<(), glib::BoolError> {

generic/file/Cargo.toml

@@ -9,7 +9,6 @@ edition = "2018"
 
 [dependencies]
 url = "2"
-glib = { git = "https://github.com/gtk-rs/gtk-rs-core" }
 gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" }
 gst-base = { package = "gstreamer-base", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" }
 once_cell = "1.0"

generic/file/src/file_location.rs

@@ -1,3 +1,4 @@
+use gst::glib;
 use url::Url;
 
 use std::convert::AsRef;

generic/file/src/filesink/imp.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use glib::subclass::prelude::*;
+use gst::glib;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 use gst::{gst_debug, gst_error, gst_info, gst_trace};

generic/file/src/filesink/mod.rs

@@ -8,7 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use glib::prelude::*;
+use gst::glib;
+use gst::prelude::*;
 
 mod imp;
 

generic/file/src/filesrc/imp.rs

@@ -7,7 +7,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use glib::subclass::prelude::*;
+use gst::glib;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 use gst::{gst_debug, gst_error, gst_info};

generic/file/src/filesrc/mod.rs

@@ -7,7 +7,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use glib::prelude::*;
+use gst::glib;
+use gst::prelude::*;
 
 mod imp;
 

generic/file/src/lib.rs

@@ -6,6 +6,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use gst::glib;
+
 mod file_location;
 mod filesink;
 mod filesrc;

generic/sodium/Cargo.toml

@@ -8,7 +8,6 @@ license = "MIT"
 edition = "2018"
 
 [dependencies]
-glib = { git = "https://github.com/gtk-rs/gtk-rs-core" }
 gst = { git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_14"], package="gstreamer" }
 gst-base = { git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_14"], package = "gstreamer-base" }
 sodiumoxide = "0.2.1"

generic/sodium/examples/decrypt_example.rs

@@ -22,7 +22,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-use glib::prelude::*;
+use gst::glib;
 use gst::prelude::*;
 use sodiumoxide::crypto::box_;
 

generic/sodium/examples/encrypt_example.rs

@@ -22,7 +22,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-use glib::prelude::*;
+use gst::glib;
 use gst::prelude::*;
 use sodiumoxide::crypto::box_;
 

generic/sodium/src/decrypter/imp.rs

@@ -22,8 +22,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-use glib::prelude::*;
-use glib::subclass::prelude::*;
+use gst::glib;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 use gst::{gst_debug, gst_error, gst_log};

generic/sodium/src/decrypter/mod.rs

@@ -22,7 +22,8 @@
 //
 // SPDX-License-Identifier: MIT
 
-use glib::prelude::*;
+use gst::glib;
+use gst::prelude::*;
 
 mod imp;
 

generic/sodium/src/encrypter/imp.rs

@@ -22,8 +22,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-use glib::prelude::*;
-use glib::subclass::prelude::*;
+use gst::glib;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 use gst::{gst_debug, gst_error, gst_log};

generic/sodium/src/encrypter/mod.rs

@@ -22,7 +22,8 @@
 //
 // SPDX-License-Identifier: MIT
 
-use glib::prelude::*;
+use gst::glib;
+use gst::prelude::*;
 
 mod imp;
 

generic/sodium/src/lib.rs

@@ -20,6 +20,8 @@
 //
 // SPDX-License-Identifier: MIT
 
+use gst::glib;
+
 const TYPEFIND_HEADER: &[u8; 12] = b"gst-sodium10";
 // `core::slice::<impl [T]>::len` is not yet stable as a const fn
 // const TYPEFIND_HEADER_SIZE: usize = TYPEFIND_HEADER.len();

generic/sodium/tests/decrypter.rs

@@ -22,7 +22,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-use glib::prelude::*;
+use gst::glib;
 use gst::prelude::*;
 
 use std::sync::{Arc, Mutex};

generic/sodium/tests/encrypter.rs

@@ -22,7 +22,7 @@
 //
 // SPDX-License-Identifier: MIT
 
-use glib::prelude::*;
+use gst::glib;
 use gst::prelude::*;
 
 use once_cell::sync::Lazy;

generic/threadshare/Cargo.toml

@@ -9,7 +9,6 @@ edition = "2018"
 
 [dependencies]
 libc = "0.2"
-glib = { git = "https://github.com/gtk-rs/gtk-rs-core" }
 gio = { git = "https://github.com/gtk-rs/gtk-rs-core" }
 gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features=["v1_10"] }
 gst-net = { package = "gstreamer-net", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs" }

generic/threadshare/examples/benchmark.rs

@@ -15,7 +15,7 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::prelude::*;
+use gst::glib;
 use gst::prelude::*;
 
 use std::env;

generic/threadshare/src/appsrc/imp.rs

@@ -21,9 +21,7 @@ use futures::future::BoxFuture;
 use futures::lock::Mutex as FutMutex;
 use futures::prelude::*;
 
-use glib::prelude::*;
-use glib::subclass::prelude::*;
-
+use gst::glib;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 use gst::{gst_debug, gst_error, gst_log, gst_trace};

generic/threadshare/src/appsrc/mod.rs

@@ -16,7 +16,8 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::prelude::*;
+use gst::glib;
+use gst::prelude::*;
 
 mod imp;
 

generic/threadshare/src/inputselector/imp.rs

@@ -19,9 +19,7 @@ use futures::future::BoxFuture;
 use futures::future::{abortable, AbortHandle};
 use futures::prelude::*;
 
-use glib::prelude::*;
-use glib::subclass::prelude::*;
-
+use gst::glib;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 use gst::{gst_debug, gst_log, gst_trace};

generic/threadshare/src/inputselector/mod.rs

@@ -15,7 +15,8 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::prelude::*;
+use gst::glib;
+use gst::prelude::*;
 
 mod imp;
 

generic/threadshare/src/jitterbuffer/ffi.rs

@@ -16,6 +16,7 @@
 // Boston, MA 02110-1335, USA.
 
 use glib::ffi::{gboolean, gpointer, GList, GType};
+use gst::glib;
 
 use gst::ffi::GstClockTime;
 use libc::{c_int, c_uint, c_ulonglong, c_ushort, c_void};

generic/threadshare/src/jitterbuffer/imp.rs

@@ -19,9 +19,7 @@ use futures::future::BoxFuture;
 use futures::future::{abortable, AbortHandle, Aborted};
 use futures::prelude::*;
 
-use glib::prelude::*;
-use glib::subclass::prelude::*;
-
+use gst::glib;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 use gst::{gst_debug, gst_error, gst_info, gst_log, gst_trace};

generic/threadshare/src/jitterbuffer/jitterbuffer.rs

@@ -19,8 +19,9 @@ use super::ffi;
 
 use std::ptr;
 
-use glib::prelude::*;
 use glib::translate::*;
+use gst::glib;
+use gst::prelude::*;
 
 use std::mem;
 

generic/threadshare/src/jitterbuffer/mod.rs

@@ -15,7 +15,8 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::prelude::*;
+use gst::glib;
+use gst::prelude::*;
 
 mod ffi;
 mod imp;

generic/threadshare/src/lib.rs

@@ -41,6 +41,7 @@ mod proxy;
 mod queue;
 
 use glib::translate::*;
+use gst::glib;
 
 fn plugin_init(plugin: &gst::Plugin) -> Result<(), glib::BoolError> {
     udpsrc::register(plugin)?;

generic/threadshare/src/proxy/imp.rs

@@ -19,9 +19,7 @@ use futures::channel::oneshot;
 use futures::future::BoxFuture;
 use futures::prelude::*;
 
-use glib::prelude::*;
-use glib::subclass::prelude::*;
-
+use gst::glib;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 use gst::{gst_debug, gst_error, gst_log, gst_trace};

generic/threadshare/src/proxy/mod.rs

@@ -15,7 +15,8 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::prelude::*;
+use gst::glib;
+use gst::prelude::*;
 
 mod imp;
 

generic/threadshare/src/queue/imp.rs

@@ -19,9 +19,7 @@ use futures::channel::oneshot;
 use futures::future::BoxFuture;
 use futures::prelude::*;
 
-use glib::prelude::*;
-use glib::subclass::prelude::*;
-
+use gst::glib;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 use gst::{gst_debug, gst_error, gst_log, gst_trace};

generic/threadshare/src/queue/mod.rs

@@ -15,7 +15,8 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::prelude::*;
+use gst::glib;
+use gst::prelude::*;
 
 mod imp;
 

generic/threadshare/src/socket.rs

@@ -18,6 +18,7 @@
 
 use futures::future::BoxFuture;
 
+use gst::glib;
 use gst::prelude::*;
 use gst::{gst_debug, gst_error, gst_log};
 

generic/threadshare/src/tcpclientsrc/imp.rs

@@ -20,9 +20,7 @@ use futures::future::BoxFuture;
 use futures::lock::Mutex as FutMutex;
 use futures::prelude::*;
 
-use glib::prelude::*;
-use glib::subclass::prelude::*;
-
+use gst::glib;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 use gst::{gst_debug, gst_error, gst_log, gst_trace};

generic/threadshare/src/tcpclientsrc/mod.rs

@@ -16,7 +16,8 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::prelude::*;
+use gst::glib;
+use gst::prelude::*;
 
 mod imp;
 

generic/threadshare/src/udpsink/imp.rs

@@ -20,9 +20,7 @@ use futures::future::BoxFuture;
 use futures::lock::Mutex;
 use futures::prelude::*;
 
-use glib::prelude::*;
-use glib::subclass::prelude::*;
-
+use gst::glib;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 use gst::EventView;

generic/threadshare/src/udpsink/mod.rs

@@ -15,7 +15,8 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::prelude::*;
+use gst::glib;
+use gst::prelude::*;
 
 mod imp;
 

generic/threadshare/src/udpsrc/imp.rs

@@ -19,9 +19,7 @@ use futures::future::BoxFuture;
 use futures::lock::Mutex as FutMutex;
 use futures::prelude::*;
 
-use glib::prelude::*;
-use glib::subclass::prelude::*;
-
+use gst::glib;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 use gst::{gst_debug, gst_error, gst_log, gst_trace};

generic/threadshare/src/udpsrc/mod.rs

@@ -15,7 +15,8 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::prelude::*;
+use gst::glib;
+use gst::prelude::*;
 
 mod imp;
 

generic/threadshare/tests/appsrc.rs

@@ -15,7 +15,6 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::prelude::*;
 use gst::prelude::*;
 
 fn init() {

generic/threadshare/tests/inputselector.rs

@@ -15,7 +15,6 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::prelude::*;
 use gst::prelude::*;
 
 fn init() {

generic/threadshare/tests/pad.rs

@@ -22,6 +22,7 @@ use futures::lock::Mutex as FutMutex;
 use futures::prelude::*;
 
 use glib::GBoxed;
+use gst::glib;
 
 use gst::prelude::*;
 use gst::subclass::prelude::*;

generic/threadshare/tests/pipeline.rs

@@ -15,6 +15,7 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
+use gst::glib;
 use gst::prelude::*;
 use gst::{gst_debug, gst_error};
 

generic/threadshare/tests/proxy.rs

@@ -15,7 +15,6 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::prelude::*;
 use gst::prelude::*;
 
 use std::sync::{Arc, Mutex};

generic/threadshare/tests/queue.rs

@@ -15,7 +15,6 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::prelude::*;
 use gst::prelude::*;
 
 use std::sync::{Arc, Mutex};

generic/threadshare/tests/tcpclientsrc.rs

@@ -16,7 +16,6 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::prelude::*;
 use gst::prelude::*;
 
 use std::io::Write;

generic/threadshare/tests/udpsink.rs

@@ -17,7 +17,7 @@
 
 use std::thread;
 
-use glib::prelude::*;
+use gst::prelude::*;
 
 fn init() {
     use std::sync::Once;

generic/threadshare/tests/udpsrc.rs

@@ -15,7 +15,7 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::prelude::*;
+use gst::prelude::*;
 
 use std::thread;
 

net/reqwest/Cargo.toml

@@ -9,7 +9,6 @@ edition = "2018"
 
 [dependencies]
 url = "2.1"
-glib = { git = "https://github.com/gtk-rs/gtk-rs-core" }
 reqwest = { version = "0.11", features = ["cookies", "gzip"] }
 futures = "0.3"
 hyperx = "1.0"

net/reqwest/src/lib.rs

@@ -6,6 +6,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use gst::glib;
+
 mod reqwesthttpsrc;
 
 fn plugin_init(plugin: &gst::Plugin) -> Result<(), glib::BoolError> {

net/reqwest/src/reqwesthttpsrc/imp.rs

@@ -17,7 +17,7 @@ use url::Url;
 
 use once_cell::sync::Lazy;
 
-use glib::subclass::prelude::*;
+use gst::glib;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 use gst::{gst_debug, gst_error, gst_trace, gst_warning};

net/reqwest/src/reqwesthttpsrc/mod.rs

@@ -6,7 +6,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use glib::prelude::*;
+use gst::glib;
+use gst::prelude::*;
 
 mod imp;
 

net/reqwest/tests/reqwesthttpsrc.rs

@@ -6,6 +6,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use gst::glib;
 use gst::prelude::*;
 
 use std::sync::mpsc;

net/rusoto/Cargo.toml

@@ -12,7 +12,6 @@ edition = "2018"
 [dependencies]
 bytes = "1.0"
 futures = "0.3"
-glib = { git = "https://github.com/gtk-rs/gtk-rs-core" }
 gst = { package = "gstreamer", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_12"] }
 gst-base = { package = "gstreamer-base", git = "https://gitlab.freedesktop.org/gstreamer/gstreamer-rs", features = ["v1_12"] }
 rusoto_core = "0.46"

net/rusoto/src/aws_transcriber/imp.rs

@@ -15,8 +15,7 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::prelude::*;
-use glib::subclass::prelude::*;
+use gst::glib;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 use gst::{

net/rusoto/src/aws_transcriber/mod.rs

@@ -15,7 +15,8 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::prelude::*;
+use gst::glib;
+use gst::prelude::*;
 
 mod imp;
 mod packet;

net/rusoto/src/lib.rs

@@ -6,6 +6,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use gst::glib;
+
 mod aws_transcriber;
 mod s3sink;
 mod s3src;

net/rusoto/src/s3sink/imp.rs

@@ -6,9 +6,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use glib::prelude::*;
-use glib::subclass::prelude::*;
-
+use gst::glib;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 use gst::{gst_error, gst_info, gst_trace};

net/rusoto/src/s3sink/mod.rs

@@ -6,7 +6,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use glib::prelude::*;
+use gst::glib;
+use gst::prelude::*;
 
 mod imp;
 

net/rusoto/src/s3src/imp.rs

@@ -13,9 +13,8 @@ use futures::future;
 use once_cell::sync::Lazy;
 use rusoto_s3::*;
 
-use glib::prelude::*;
-use glib::subclass::prelude::*;
-
+use gst::glib;
+use gst::prelude::*;
 use gst::subclass::prelude::*;
 use gst::{gst_debug, gst_error, gst_info};
 

net/rusoto/src/s3src/mod.rs

@@ -6,7 +6,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use glib::prelude::*;
+use gst::glib;
+use gst::prelude::*;
 
 mod imp;
 

text/json/Cargo.toml

@@ -8,7 +8,6 @@ description = "Rust JSON Plugin"
 repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"
 
 [dependencies]
-glib = { git = "https://github.com/gtk-rs/gtk-rs-core" }
 once_cell = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0", features = ["raw_value"] }

text/json/src/jsongstenc/imp.rs

@@ -15,7 +15,7 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::subclass::prelude::*;
+use gst::glib;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 use gst::{gst_log, gst_trace};

text/json/src/jsongstenc/mod.rs

@@ -15,7 +15,8 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::prelude::*;
+use gst::glib;
+use gst::prelude::*;
 
 mod imp;
 

text/json/src/jsongstparse/imp.rs

@@ -15,8 +15,7 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::prelude::*;
-use glib::subclass::prelude::*;
+use gst::glib;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 use gst::{gst_debug, gst_error, gst_info, gst_log, gst_trace, gst_warning};

text/json/src/jsongstparse/mod.rs

@@ -15,7 +15,8 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::prelude::*;
+use gst::glib;
+use gst::prelude::*;
 
 mod imp;
 

text/json/src/lib.rs

@@ -17,6 +17,8 @@
 
 #![recursion_limit = "128"]
 
+use gst::glib;
+
 mod jsongstenc;
 mod jsongstparse;
 mod line_reader;

text/regex/Cargo.toml

@@ -8,7 +8,6 @@ description = "Rust Regular Expression Plugin"
 repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"
 
 [dependencies]
-glib = { git = "https://github.com/gtk-rs/gtk-rs-core" }
 once_cell = "1.0"
 regex = "1"
 

text/regex/src/gstregex/imp.rs

@@ -15,8 +15,7 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::prelude::*;
-use glib::subclass::prelude::*;
+use gst::glib;
 use gst::gst_error;
 use gst::prelude::*;
 use gst::subclass::prelude::*;

text/regex/src/gstregex/mod.rs

@@ -15,7 +15,8 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::prelude::*;
+use gst::glib;
+use gst::prelude::*;
 
 mod imp;
 

text/regex/src/lib.rs

@@ -17,6 +17,8 @@
 
 #![recursion_limit = "128"]
 
+use gst::glib;
+
 mod gstregex;
 
 fn plugin_init(plugin: &gst::Plugin) -> Result<(), glib::BoolError> {

text/regex/tests/regex.rs

@@ -15,7 +15,7 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::prelude::*;
+use gst::prelude::*;
 
 fn init() {
     use std::sync::Once;

text/wrap/Cargo.toml

@@ -8,7 +8,6 @@ description = "Rust Text Wrap Plugin"
 repository = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs"
 
 [dependencies]
-glib = { git = "https://github.com/gtk-rs/gtk-rs-core" }
 once_cell = "1.0"
 textwrap = { version = "0.13.2", features = ["hyphenation"] }
 hyphenation = "0.8"

text/wrap/src/gsttextwrap/imp.rs

@@ -15,8 +15,7 @@
 // Free Software Foundation, Inc., 51 Franklin Street, Suite 500,
 // Boston, MA 02110-1335, USA.
 
-use glib::prelude::*;
-use glib::subclass::prelude::*;
+use gst::glib;
 use gst::prelude::*;
 use gst::subclass::prelude::*;
 use gst::{gst_debug, gst_error, gst_info, gst_log};