Change application id to org.pipewire.Helvum

.gitlab-ci.yml

@@ -10,7 +10,7 @@ stages:
   - extras
 
 variables:
-  FDO_UPSTREAM_REPO: 'ryuukyu/helvum'
+  FDO_UPSTREAM_REPO: 'pipewire/helvum'
 
 # Version and tag for our current container
 .fedora:

Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 rust-version = "1.56"
 license = "GPL-3.0-only"
 description = "A GTK patchbay for pipewire"
-repository = "https://gitlab.freedesktop.org/ryuukyu/helvum"
+repository = "https://gitlab.freedesktop.org/pipewire/helvum"
 readme = "README.md"
 keywords = ["pipewire", "gtk", "patchbay", "gui", "utility"]
 categories = ["gui", "multimedia"]

README.md

@@ -14,9 +14,7 @@ More suggestions are welcome!
 
 # Building
 
-## Via flatpak (recommended)
+## Via flatpak
-The recommended way to build is using flatpak, which will take care of all dependencies and avoid any problems that may come from different system configurations.
-
 If you don't have the flathub repo in your remote-list for flatpak you will need to add that first:
 ```shell
 $ flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
@@ -29,12 +27,12 @@ $ flatpak install org.gnome.{Platform,Sdk}//41 org.freedesktop.Sdk.Extension.rus
 
 To compile and install as a flatpak, clone the project, change to the project directory, and run:
 ```shell
-$ flatpak-builder --install flatpak-build/ build-aux/org.freedesktop.ryuukyu.Helvum.json
+$ flatpak-builder --install flatpak-build/ build-aux/org.pipewire.Helvum.json
 ```
 
 You can then run the app via
 ```shell
-$ flatpak run org.freedesktop.ryuukyu.Helvum
+$ flatpak run org.pipewire.Helvum
 ```
 
 ## Manually

build-aux/org.pipewire.Helvum.json

@@ -1,5 +1,5 @@
 {
-    "app-id": "org.freedesktop.ryuukyu.Helvum",
+    "app-id": "org.pipewire.Helvum",
     "runtime": "org.gnome.Platform",
     "runtime-version": "41",
     "sdk": "org.gnome.Sdk",

data/icons/org.pipewire.Helvum.Source.svg

@@ -10,7 +10,7 @@
    id="svg11300"
    sodipodi:version="0.32"
    inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
-   sodipodi:docname="org.freedesktop.ryuukyu.Helvum.Source.svg"
+   sodipodi:docname="org.pipewire.Helvum.Source.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.0"
    style="display:inline;enable-background:new"

data/org.pipewire.Helvum.metainfo.xml.in

@@ -15,12 +15,12 @@
     </description>
     <screenshots>
         <screenshot type="default">
-            <image>https://gitlab.freedesktop.org/ryuukyu/helvum/-/raw/main/docs/screenshot.png</image>
+            <image>https://gitlab.freedesktop.org/pipewire/helvum/-/raw/main/docs/screenshot.png</image>
         </screenshot>
     </screenshots>
     <launchable type="desktop-id">@app-id@.desktop</launchable>
-    <url type="homepage">https://gitlab.freedesktop.org/ryuukyu/helvum</url>
+    <url type="homepage">https://gitlab.freedesktop.org/pipewire/helvum</url>
-    <url type="bugtracker">https://gitlab.freedesktop.org/ryuukyu/helvum/-/issues</url>
+    <url type="bugtracker">https://gitlab.freedesktop.org/pipewire/helvum/-/issues</url>
     <content_rating type="oars-1.0" />
     <releases>
         <release version="0.3.2" date="2021-11-30" />

docs/making_a_release.md

@@ -2,7 +2,7 @@
 
 The following describes the process of making a new release:
 
-1. In `data/org.freedesktop.ryuukyu.Helvum.metainfo.xml.in`,
+1. In `data/org.pipewire.Helvum.metainfo.xml.in`,
    add a new `<release>` tag to the releases section with the appropriate version and date.
 
 2. In `meson.build` and `Cargo.toml`, bumb the projects version to the new version.

meson.build

@@ -6,7 +6,7 @@ project(
   meson_version: '>=0.50.0'
 )
 
-base_id = 'org.freedesktop.ryuukyu.Helvum'
+base_id = 'org.pipewire.Helvum'
 
 dependency('glib-2.0', version: '>= 2.66')
 dependency('gtk4',     version: '>= 4.4.0')

src/application.rs

@@ -101,9 +101,8 @@ impl Application {
         gtk_receiver: Receiver<PipewireMessage>,
         pw_sender: Sender<GtkMessage>,
     ) -> Self {
-        let app: Application =
+        let app: Application = glib::Object::new(&[("application-id", &"org.pipewire.Helvum")])
-            glib::Object::new(&[("application-id", &"org.freedesktop.ryuukyu.Helvum")])
+            .expect("Failed to create new Application");
-                .expect("Failed to create new Application");
 
         let imp = imp::Application::from_instance(&app);
         imp.pw_sender