Rebrand to Galaxy, major improvements to Bedrock support, still needs some TLC though
This commit is contained in:
@@ -2,7 +2,7 @@ use std::collections::HashMap;
|
||||
|
||||
use futures_util::FutureExt as _;
|
||||
use itertools::Itertools as _;
|
||||
use warpui::{r#async::executor::BackgroundTask, AppContext, SingletonEntity};
|
||||
use galaxyui::{r#async::executor::BackgroundTask, AppContext, SingletonEntity};
|
||||
use zbus::{interface, proxy, zvariant};
|
||||
|
||||
use crate::channel::ChannelState;
|
||||
@@ -26,13 +26,13 @@ pub fn teardown(ctx: &mut AppContext) {
|
||||
/// Returns Ok if an existing instance exists and was reachable.
|
||||
#[cfg(feature = "release_bundle")]
|
||||
pub fn pass_startup_args_to_existing_instance(
|
||||
args: &warp_cli::AppArgs,
|
||||
args: &galaxy_cli::AppArgs,
|
||||
) -> Result<(), StartupArgsForwardingError> {
|
||||
if args.finish_update {
|
||||
return Err(StartupArgsForwardingError::IgnoredAfterAutoUpdate);
|
||||
}
|
||||
|
||||
warpui::r#async::block_on(async {
|
||||
galaxyui::r#async::block_on(async {
|
||||
let conn = zbus::Connection::session().await?;
|
||||
let proxy = ExistingApplicationProxy::builder(&conn)
|
||||
.destination(DBusServiceHost::well_known_name())?
|
||||
@@ -181,7 +181,7 @@ struct DBusServiceHost {
|
||||
}
|
||||
|
||||
impl DBusServiceHost {
|
||||
fn new(ctx: &mut warpui::ModelContext<Self>) -> Self {
|
||||
fn new(ctx: &mut galaxyui::ModelContext<Self>) -> Self {
|
||||
let (tx, rx) = async_channel::unbounded();
|
||||
|
||||
// Spawn a background task for the D-Bus server.
|
||||
@@ -232,7 +232,7 @@ impl DBusServiceHost {
|
||||
if let Some(server_task) = self.server_task.take() {
|
||||
server_task.abort();
|
||||
// Wait until we've torn down the dbus service.
|
||||
report_if_error!(warpui::r#async::block_on(server_task));
|
||||
report_if_error!(galaxyui::r#async::block_on(server_task));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -248,7 +248,7 @@ impl DBusServiceHost {
|
||||
}
|
||||
}
|
||||
|
||||
impl warpui::Entity for DBusServiceHost {
|
||||
impl galaxyui::Entity for DBusServiceHost {
|
||||
type Event = ();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user