Rename conflicting traits names

Fixes #1375

Author: bilelmoussaoui

gdk4/Gir.toml

@@ -224,6 +224,7 @@ status = "generate"
 
 [[object]]
 name = "Gdk.AppLaunchContext"
+trait_name = "GdkAppLaunchContextExt" # Conflicts with GAppLaunchContext
 status = "generate"
 generate_builder = false
 final_type = false

gdk4/src/auto/app_launch_context.rs

@@ -19,7 +19,7 @@ impl AppLaunchContext {
     pub const NONE: Option<&'static AppLaunchContext> = None;
 }
 
-pub trait AppLaunchContextExt: 'static {
+pub trait GdkAppLaunchContextExt: 'static {
     #[doc(alias = "gdk_app_launch_context_get_display")]
     #[doc(alias = "get_display")]
     fn display(&self) -> Display;
@@ -37,7 +37,7 @@ pub trait AppLaunchContextExt: 'static {
     fn set_timestamp(&self, timestamp: u32);
 }
 
-impl<O: IsA<AppLaunchContext>> AppLaunchContextExt for O {
+impl<O: IsA<AppLaunchContext>> GdkAppLaunchContextExt for O {
     fn display(&self) -> Display {
         unsafe {
             from_glib_none(ffi::gdk_app_launch_context_get_display(

gdk4/src/auto/mod.rs

@@ -215,7 +215,7 @@ pub mod functions;
 
 #[doc(hidden)]
 pub mod traits {
-    pub use super::app_launch_context::AppLaunchContextExt;
+    pub use super::app_launch_context::GdkAppLaunchContextExt;
     pub use super::content_provider::ContentProviderExt;
     pub use super::device::DeviceExt;
     pub use super::device_pad::DevicePadExt;

gtk4/Gir.toml

@@ -156,7 +156,6 @@ generate = [
     "Gtk.MediaFile",
     "Gtk.MessageType",
     "Gtk.MnemonicAction",
-    "Gtk.MountOperation",
     "Gtk.MovementStep",
     "Gtk.Native",
     "Gtk.NaturalWrapMode",
@@ -1599,6 +1598,11 @@ name = "Gtk.MnemonicTrigger"
 status = "manual" # to make use of gdk::Key # to make use of gdk::Key
 generate_builder = false
 
+[[object]]
+name = "Gtk.MountOperation"
+status = "generate"
+trait_name = "GtkMountOperationExt" # Conflicts with GMountOperation
+
 [[object]]
 name = "Gtk.MultiFilter"
 status = "generate"

gtk4/src/auto/mod.rs

@@ -1312,7 +1312,7 @@ pub mod traits {
     pub use super::list_item::ListItemExt;
     pub use super::media_file::MediaFileExt;
     pub use super::media_stream::MediaStreamExt;
-    pub use super::mount_operation::MountOperationExt;
+    pub use super::mount_operation::GtkMountOperationExt;
     pub use super::multi_filter::MultiFilterExt;
     pub use super::native::NativeExt;
     pub use super::native_dialog::NativeDialogExt;

gtk4/src/auto/mount_operation.rs

@@ -142,7 +142,7 @@ impl MountOperationBuilder {
     }
 }
 
-pub trait MountOperationExt: 'static {
+pub trait GtkMountOperationExt: 'static {
     #[doc(alias = "gtk_mount_operation_get_display")]
     #[doc(alias = "get_display")]
     fn display(&self) -> gdk::Display;
@@ -170,7 +170,7 @@ pub trait MountOperationExt: 'static {
     fn connect_parent_notify<F: Fn(&Self) + 'static>(&self, f: F) -> SignalHandlerId;
 }
 
-impl<O: IsA<MountOperation>> MountOperationExt for O {
+impl<O: IsA<MountOperation>> GtkMountOperationExt for O {
     fn display(&self) -> gdk::Display {
         unsafe {
             from_glib_none(ffi::gtk_mount_operation_get_display(