Merge pull request #739 from GuillaumeGomez/rename-socket-trait

Rename socket trait

Gir.toml

@@ -1408,6 +1408,7 @@ version = "3.20"
 name = "Gtk.Socket"
 status = "generate"
 cfg_condition = "not(windows)"
+trait_name = "GtkSocketExt"
 
 [[object]]
 name = "Gtk.SpinButton"

src/auto/mod.rs

@@ -694,7 +694,7 @@ mod socket;
 #[cfg(any(not(windows), feature = "dox"))]
 pub use self::socket::Socket;
 #[cfg(any(not(windows), feature = "dox"))]
-pub use self::socket::SocketExt;
+pub use self::socket::GtkSocketExt;
 
 mod spin_button;
 pub use self::spin_button::SpinButton;
@@ -1476,7 +1476,7 @@ pub mod traits {
     pub use super::ShortcutsWindowExt;
     pub use super::SizeGroupExt;
     #[cfg(any(not(windows), feature = "dox"))]
-    pub use super::SocketExt;
+    pub use super::GtkSocketExt;
     pub use super::SpinButtonExt;
     pub use super::SpinnerExt;
     #[cfg(any(feature = "v3_10", feature = "dox"))]

src/auto/socket.rs

@@ -44,7 +44,7 @@ impl Default for Socket {
     }
 }
 
-pub trait SocketExt {
+pub trait GtkSocketExt {
     fn add_id(&self, window: xlib::Window);
 
     fn get_id(&self) -> xlib::Window;
@@ -56,7 +56,7 @@ pub trait SocketExt {
     fn connect_plug_removed<F: Fn(&Self) -> bool + 'static>(&self, f: F) -> SignalHandlerId;
 }
 
-impl<O: IsA<Socket> + IsA<glib::object::Object>> SocketExt for O {
+impl<O: IsA<Socket> + IsA<glib::object::Object>> GtkSocketExt for O {
     fn add_id(&self, window: xlib::Window) {
         unsafe {
             ffi::gtk_socket_add_id(self.to_glib_none().0, window);