62 lines
2.7 KiB
Diff
62 lines
2.7 KiB
Diff
From f3676a5f478fd511a7e21b5343a40411c93e494a Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Corentin=20No=C3=ABl?= <corentin@elementary.io>
|
|
Date: Mon, 13 Apr 2020 21:57:21 +0200
|
|
Subject: [PATCH] switchboard-plugin: Rename the plugins directory and fix type
|
|
in Applications Menu name (#363)
|
|
|
|
---
|
|
meson.build | 2 +-
|
|
src/synapse-plugins/switchboard-plugin.vala | 4 ++--
|
|
src/synapse-plugins/switchboard-plugin/plugin.vala | 4 ++--
|
|
3 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/meson.build b/meson.build
|
|
index 36531343..e8703a2b 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -27,7 +27,7 @@ add_project_arguments(
|
|
language: 'c'
|
|
)
|
|
|
|
-pluginsdir = join_paths(prefix, get_option('libdir'), 'io.elementary.application-menu')
|
|
+pluginsdir = join_paths(prefix, get_option('libdir'), 'io.elementary.wingpanel.applications-menu')
|
|
add_project_arguments(
|
|
'-DPLUGINSDIR="@0@"'.format(pluginsdir),
|
|
language: 'c'
|
|
diff --git a/src/synapse-plugins/switchboard-plugin.vala b/src/synapse-plugins/switchboard-plugin.vala
|
|
index df2968ce..0c2d5512 100644
|
|
--- a/src/synapse-plugins/switchboard-plugin.vala
|
|
+++ b/src/synapse-plugins/switchboard-plugin.vala
|
|
@@ -26,7 +26,7 @@ public struct Synapse.PlugInfo {
|
|
public string[] path;
|
|
}
|
|
|
|
-[DBus (name = "io.elementary.ApplicationMenu.Switchboard")]
|
|
+[DBus (name = "io.elementary.ApplicationsMenu.Switchboard")]
|
|
public class Synapse.SwitchboardExecutablePlugin : Object {
|
|
private Synapse.PlugInfo[] plugs;
|
|
|
|
@@ -86,7 +86,7 @@ public class Synapse.SwitchboardPlugin : Object, Activatable, ItemProvider {
|
|
worker_link = new Synapse.WorkerLink ();
|
|
worker_link.on_connection_accepted.connect ((connection) => {
|
|
try {
|
|
- connection.register_object ("/io/elementary/applicationmenu", executable_plugin);
|
|
+ connection.register_object ("/io/elementary/applicationsmenu", executable_plugin);
|
|
} catch (Error e) {
|
|
critical ("%s", e.message);
|
|
}
|
|
diff --git a/src/synapse-plugins/switchboard-plugin/plugin.vala b/src/synapse-plugins/switchboard-plugin/plugin.vala
|
|
index 07e45f91..e67c78a3 100644
|
|
--- a/src/synapse-plugins/switchboard-plugin/plugin.vala
|
|
+++ b/src/synapse-plugins/switchboard-plugin/plugin.vala
|
|
@@ -37,8 +37,8 @@ public class SwitchboardPlugin : GLib.Object {
|
|
private GLib.MainLoop main_loop;
|
|
private GLib.DBusConnection connection;
|
|
|
|
- const string DBUS_INTERFACE = "io.elementary.ApplicationMenu.Switchboard";
|
|
- const string DBUS_PATH = "/io/elementary/applicationmenu";
|
|
+ const string DBUS_INTERFACE = "io.elementary.ApplicationsMenu.Switchboard";
|
|
+ const string DBUS_PATH = "/io/elementary/applicationsmenu";
|
|
|
|
construct {
|
|
main_loop = new GLib.MainLoop ();
|