eh

Author: DarthGandalf

src/application.rs

@@ -105,7 +105,6 @@ impl ShutterApplication {
 	}
 
 	fn show_about(&self) {
-		let window = self.active_window().unwrap();
 		let about = adw::AboutDialog::builder()
 			.application_name("Shutter")
 			// TODO remove extra icons
@@ -130,6 +129,6 @@ impl ShutterApplication {
 			))
 			.build();
 
-		about.present(Some(&window));
+		about.present(self.active_window().as_ref());
 	}
 }

src/main.rs

@@ -46,8 +46,9 @@ fn main() -> glib::ExitCode {
 	// Create a new GtkApplication. The application manages our main loop,
 	// application windows, integration with the window manager/compositor, and
 	// desktop features such as file opening and single-instance applications.
+	// TODO: remove the Rust suffix. This is for D-Bus to avoid conflict with the perl shutter
 	let app = ShutterApplication::new(
-		"org.shutter-project.Shutter",
+		"org.shutter-project.ShutterRust",
 		&gio::ApplicationFlags::empty(),
 	);
 

src/shutter.gresource.xml

@@ -3,7 +3,18 @@
 	<gresource prefix="/org/shutter-project/Shutter">
 		<file compressed="true" preprocess="xml-stripblanks">window.ui</file>
 		<file compressed="true" preprocess="xml-stripblanks">gtk/help-overlay.ui</file>
-		<file compressed="true" preprocess="xml-stripblanks">gtk/menus.ui</file>
+		<file compressed="true" >gtk/menus.ui</file>
+		<!-- for about dialog -->
+		<file compressed="true" alias="credits/art">../data/credits/art</file>
+		<file compressed="true" alias="credits/dev">../data/credits/dev</file>
+		<file compressed="true" alias="credits/copyright">../data/credits/copyright</file>
+	</gresource>
+
+	<!-- a temporary hack to support the non-conflicting D-Bus name because Gtk uses the same id for both -->
+	<gresource prefix="/org/shutter-project/ShutterRust">
+		<file compressed="true" preprocess="xml-stripblanks">window.ui</file>
+		<file compressed="true" preprocess="xml-stripblanks">gtk/help-overlay.ui</file>
+		<file compressed="true" >gtk/menus.ui</file>
 		<!-- for about dialog -->
 		<file compressed="true" alias="credits/art">../data/credits/art</file>
 		<file compressed="true" alias="credits/dev">../data/credits/dev</file>