From 33fdae2001f489c40667797ce3bc50eedb352ee0 Mon Sep 17 00:00:00 2001
From: Calvin Lee <cyrus296@gmail.com>
Date: Tue, 13 Jun 2017 12:42:11 -0700
Subject: [PATCH] Remove Xembed Support

Xembed support is premature in sway and should be postponed. This commit
only removes swaybar starting xembedsniproxy, if users would like, they
can still start xembedsniproxy manually, however there will be no
official support.
---
 include/swaybar/bar.h |  3 ---
 swaybar/bar.c         |  5 -----
 swaybar/tray/tray.c   | 16 ----------------
 3 files changed, 24 deletions(-)

diff --git a/include/swaybar/bar.h b/include/swaybar/bar.h
index 9f5bf400..010e1f84 100644
--- a/include/swaybar/bar.h
+++ b/include/swaybar/bar.h
@@ -15,9 +15,6 @@ struct bar {
 	int ipc_socketfd;
 	int status_read_fd;
 	pid_t status_command_pid;
-#ifdef ENABLE_TRAY
-	pid_t xembed_pid;
-#endif
 };
 
 struct output {
diff --git a/swaybar/bar.c b/swaybar/bar.c
index 5d480b63..5e87eac9 100644
--- a/swaybar/bar.c
+++ b/swaybar/bar.c
@@ -27,9 +27,6 @@ static void bar_init(struct bar *bar) {
 	bar->config = init_config();
 	bar->status = init_status_line();
 	bar->outputs = create_list();
-#ifdef ENABLE_TRAY
-	bar->xembed_pid = 0;
-#endif
 }
 
 static void spawn_status_cmd_proc(struct bar *bar) {
@@ -252,8 +249,6 @@ void bar_run(struct bar *bar) {
 
 		event_loop_poll();
 #ifdef ENABLE_TRAY
-		tray_upkeep(bar);
-
 		dispatch_dbus();
 #endif
 	}
diff --git a/swaybar/tray/tray.c b/swaybar/tray/tray.c
index b2fa647e..00f1a44f 100644
--- a/swaybar/tray/tray.c
+++ b/swaybar/tray/tray.c
@@ -379,19 +379,6 @@ uint32_t tray_render(struct output *output, struct config *config) {
 	return tray_width;
 }
 
-void tray_upkeep(struct bar *bar) {
-	if (!bar->xembed_pid ||
-			(bar->xembed_pid == waitpid(bar->xembed_pid, NULL, WNOHANG))) {
-		pid_t pid = fork();
-		if (pid == 0) {
-			execlp("xembedsniproxy", "xembedsniproxy", NULL);
-			_exit(EXIT_FAILURE);
-		} else {
-			bar->xembed_pid = pid;
-		}
-	}
-}
-
 void init_tray(struct bar *bar) {
 	if (!bar->config->tray_output || strcmp(bar->config->tray_output, "none") != 0) {
 		/* Connect to the D-Bus */
@@ -402,8 +389,5 @@ void init_tray(struct bar *bar) {
 
 		/* Start the SNI host */
 		init_host();
-
-		/* Start xembedsniproxy */
-		tray_upkeep(bar);
 	}
 }