Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

RDNN dbus #2046

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

RDNN dbus #2046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions daemon-gtk3/DBus.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: GPL-3.0-or-later
*/

[DBus (name = "org.pantheon.gala")]
[DBus (name = "io.elementary.gala")]
public interface Gala.WMDBus : GLib.Object {
public abstract void perform_action (Gala.ActionType type) throws DBusError, IOError;
}
Expand All @@ -17,13 +17,13 @@ public struct Gala.Daemon.MonitorLabelInfo {
public int y;
}

[DBus (name = "org.pantheon.gala.daemon")]
[DBus (name = "io.elementary.gala.daemon")]
public class Gala.Daemon.DBus : GLib.Object {
private const string DBUS_NAME = "org.pantheon.gala";
private const string DBUS_OBJECT_PATH = "/org/pantheon/gala";
private const string DBUS_NAME = "io.elementary.gala";
private const string DBUS_OBJECT_PATH = "/io/elementary/gala";

private const string DAEMON_DBUS_NAME = "org.pantheon.gala.daemon";
private const string DAEMON_DBUS_OBJECT_PATH = "/org/pantheon/gala/daemon";
private const string DAEMON_DBUS_NAME = "io.elementary.gala.daemon";
private const string DAEMON_DBUS_OBJECT_PATH = "/io/elementary/gala/daemon";

private WMDBus? wm_proxy = null;

Expand Down
2 changes: 1 addition & 1 deletion daemon-gtk3/Main.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

public class Gala.Daemon.Application : Gtk.Application {
public Application () {
Object (application_id: "org.pantheon.gala.daemon");
Object (application_id: "io.elementary.gala.daemon");
}

public override void startup () {
Expand Down
12 changes: 6 additions & 6 deletions daemon/DBus.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public enum Gala.WindowFlags {
IS_TILED
}

[DBus (name = "org.pantheon.gala")]
[DBus (name = "io.elementary.gala")]
public interface Gala.WMDBus : GLib.Object {
public abstract void perform_action (Gala.ActionType type) throws DBusError, IOError;
}
Expand All @@ -53,13 +53,13 @@ public struct Gala.Daemon.MonitorLabelInfo {
public int y;
}

[DBus (name = "org.pantheon.gala.daemon")]
[DBus (name = "io.elementary.gala.daemon")]
public class Gala.Daemon.DBus : GLib.Object {
private const string DBUS_NAME = "org.pantheon.gala";
private const string DBUS_OBJECT_PATH = "/org/pantheon/gala";
private const string DBUS_NAME = "io.elementary.gala";
private const string DBUS_OBJECT_PATH = "/io/elementary/gala";

private const string DAEMON_DBUS_NAME = "org.pantheon.gala.daemon";
private const string DAEMON_DBUS_OBJECT_PATH = "/org/pantheon/gala/daemon";
private const string DAEMON_DBUS_NAME = "io.elementary.gala.daemon";
private const string DAEMON_DBUS_OBJECT_PATH = "/io/elementary/gala/daemon";

private const string BG_MENU_ACTION_GROUP_PREFIX = "background-menu";
private const string BG_MENU_ACTION_PREFIX = BG_MENU_ACTION_GROUP_PREFIX + ".";
Expand Down
2 changes: 1 addition & 1 deletion daemon/Main.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

public class Gala.Daemon.Application : Gtk.Application {
public Application () {
Object (application_id: "org.pantheon.gala.daemon");
Object (application_id: "io.elementary.gala.daemon");
}

public override void startup () {
Expand Down
2 changes: 1 addition & 1 deletion data/gala-multitaskingview.desktop.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ GenericName=Multitasking View
Icon=preferences-desktop-workspaces
Terminal=false
Categories=GNOME;GTK;System;
Exec=dbus-send --session --dest=org.pantheon.gala --print-reply /org/pantheon/gala org.pantheon.gala.PerformAction int32:1
Exec=dbus-send --session --dest=io.elementary.gala --print-reply /io/elementary/gala io.elementary.gala.PerformAction int32:1
X-AppStream-Ignore=true
OnlyShowIn=Pantheon;
10 changes: 5 additions & 5 deletions src/DBus.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2012-2014 Jacob Parker
*/

[DBus (name="org.pantheon.gala")]
[DBus (name="io.elementary.gala")]
public class Gala.DBus {
private static DBus? instance;
private static WindowManagerGala wm;
Expand All @@ -14,21 +14,21 @@ public class Gala.DBus {
public static void init (WindowManagerGala _wm) {
wm = _wm;

Bus.own_name (BusType.SESSION, "org.pantheon.gala", BusNameOwnerFlags.NONE,
Bus.own_name (BusType.SESSION, "io.elementary.gala", BusNameOwnerFlags.NONE,
(connection) => {
if (instance == null)
instance = new DBus ();

try {
connection.register_object ("/org/pantheon/gala", instance);
connection.register_object ("/io/elementary/gala", instance);
} catch (Error e) { warning (e.message); }

try {
connection.register_object ("/org/pantheon/gala/DesktopInterface", new DesktopIntegration (wm));
connection.register_object ("/io/elementary/gala/DesktopInterface", new DesktopIntegration (wm));
} catch (Error e) { warning (e.message); }
},
() => {},
() => warning ("Could not acquire name\n") );
() => warning ("Could not acquire name") );

Bus.own_name (BusType.SESSION, "org.gnome.Shell", BusNameOwnerFlags.NONE,
(connection) => {
Expand Down
6 changes: 3 additions & 3 deletions src/DaemonManager.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
*/

public class Gala.DaemonManager : GLib.Object {
private const string DAEMON_DBUS_NAME = "org.pantheon.gala.daemon";
private const string DAEMON_DBUS_OBJECT_PATH = "/org/pantheon/gala/daemon";
private const string DAEMON_DBUS_NAME = "io.elementary.gala.daemon";
private const string DAEMON_DBUS_OBJECT_PATH = "/io/elementary/gala/daemon";
private const int SPACING = 12;

[DBus (name = "org.pantheon.gala.daemon")]
[DBus (name = "io.elementary.gala.daemon")]
public interface Daemon: GLib.Object {
public abstract async void show_window_menu (WindowFlags flags, int width, int height, int x, int y) throws Error;
public abstract async void show_desktop_menu (int display_width, int display_height, int x, int y) throws Error;
Expand Down
2 changes: 1 addition & 1 deletion src/DesktopIntegration.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-or-later
*/

[DBus (name="org.pantheon.gala.DesktopIntegration")]
[DBus (name="io.elementary.gala.DesktopIntegration")]
public class Gala.DesktopIntegration : GLib.Object {
public struct RunningApplication {
string app_id;
Expand Down
2 changes: 1 addition & 1 deletion src/Widgets/MultitaskingView.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ namespace Gala {
*/
public class MultitaskingView : Clutter.Actor, ActivatableComponent {
public const int ANIMATION_DURATION = 250;
private const string OPEN_MULTITASKING_VIEW = "dbus-send --session --dest=org.pantheon.gala --print-reply /org/pantheon/gala org.pantheon.gala.PerformAction int32:1";
private const string OPEN_MULTITASKING_VIEW = "dbus-send --session --dest=io.elementary.gala --print-reply /io/elementary/gala io.elementary.gala.PerformAction int32:1";

private GestureTracker multitasking_gesture_tracker;
private GestureTracker workspace_gesture_tracker;
Expand Down
Loading