Skip to content

panel: fix ipc error detection #551

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

Open
muchnameless wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −10
Open

panel: fix ipc error detection #551

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
3 changes: 1 addition & 2 deletions src/panel/widgets/language.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@ void WayfireLanguage::init(Gtk::Box *container)
ipc_client->subscribe(this, {"keyboard-modifier-state-changed"});
ipc_client->send("{\"method\":\"wayfire/get-keyboard-state\"}", [=] (wf::json_t data)
{
if (data.serialize().find(
"error") != std::string::npos)
if (data.has_member("error"))
{
std::cerr << "Error getting keyboard state for language widget. Is wayfire ipc-rules plugin enabled?" << std::endl;
return;
Expand Down
16 changes: 8 additions & 8 deletions src/panel/widgets/workspace-switcher.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ void WayfireWorkspaceSwitcher::get_wsets()
{
ipc_client->send("{\"method\":\"window-rules/list-wsets\"}", [=] (wf::json_t data)
{
if (data.serialize().find("error") != std::string::npos)
if (data.has_member("error"))
{
std::cerr << data.serialize() << std::endl;
std::cerr << "Error getting wsets list for workspace-switcher widget!" << std::endl;
Expand Down Expand Up @@ -228,7 +228,7 @@ void WayfireWorkspaceBox::on_switch_grid_clicked(int count, double x, double y)
workspace_switch_request["data"] = workspace;
this->switcher->ipc_client->send(workspace_switch_request.serialize(), [=] (wf::json_t data)
{
if (data.serialize().find("error") != std::string::npos)
if (data.has_member("error"))
{
std::cerr << data.serialize() << std::endl;
std::cerr << "Error switching workspaces. Is vswitch plugin enabled?" << std::endl;
Expand Down Expand Up @@ -260,7 +260,7 @@ void WayfireWorkspaceBox::on_workspace_clicked(int count, double x, double y)
workspace_switch_request["data"] = workspace;
this->switcher->ipc_client->send(workspace_switch_request.serialize(), [=] (wf::json_t data)
{
if (data.serialize().find("error") != std::string::npos)
if (data.has_member("error"))
{
std::cerr << data.serialize() << std::endl;
std::cerr << "Error switching workspaces. Is vswitch plugin enabled?" << std::endl;
Expand Down Expand Up @@ -334,7 +334,7 @@ bool WayfireWorkspaceBox::on_workspace_scrolled(double x, double y)
workspace_switch_request["data"] = workspace;
this->switcher->ipc_client->send(workspace_switch_request.serialize(), [=] (wf::json_t data)
{
if (data.serialize().find("error") != std::string::npos)
if (data.has_member("error"))
{
std::cerr << data.serialize() << std::endl;
std::cerr << "Error switching workspaces. Is vswitch plugin enabled?" << std::endl;
Expand Down Expand Up @@ -398,7 +398,7 @@ void WayfireWorkspaceSwitcher::render_workspace(wf::json_t workspace, int j, int
{
ipc_client->send("{\"method\":\"window-rules/list-views\"}", [=] (wf::json_t data)
{
if (data.serialize().find("error") != std::string::npos)
if (data.has_member("error"))
{
std::cerr << data.serialize() << std::endl;
std::cerr << "Error getting views list for workspace-switcher widget!" << std::endl;
Expand Down Expand Up @@ -426,7 +426,7 @@ void WayfireWorkspaceSwitcher::process_workspaces(wf::json_t workspace_data)
output_info_request["data"] = output_id;
ipc_client->send(output_info_request.serialize(), [=] (wf::json_t output_data)
{
if (output_data.serialize().find("error") != std::string::npos)
if (output_data.has_member("error"))
{
std::cerr << output_data.serialize() << std::endl;
std::cerr << "Error getting output information!" << std::endl;
Expand Down Expand Up @@ -481,7 +481,7 @@ void WayfireWorkspaceSwitcher::grid_process_workspaces(wf::json_t workspace_data
output_info_request["data"] = output_id;
ipc_client->send(output_info_request.serialize(), [=] (wf::json_t output_data)
{
if (output_data.serialize().find("error") != std::string::npos)
if (output_data.has_member("error"))
{
std::cerr << output_data.serialize() << std::endl;
std::cerr << "Error getting output information!" << std::endl;
Expand Down Expand Up @@ -570,7 +570,7 @@ void WayfireWorkspaceSwitcher::grid_process_workspaces(wf::json_t workspace_data
{
ipc_client->send("{\"method\":\"window-rules/list-views\"}", [=] (wf::json_t data)
{
if (data.serialize().find("error") != std::string::npos)
if (data.has_member("error"))
{
std::cerr << data.serialize() << std::endl;
std::cerr << "Error getting views list for workspace-switcher widget!" <<
Expand Down