From 8a33dd8f794dea46a550498271a37398b50c60fc Mon Sep 17 00:00:00 2001
From: Andrzej <ndrwrdck@gmail.com>
Date: Sun, 19 Mar 2017 21:16:07 +0000
Subject: [PATCH] Re-added exo dep for plugins that still use it
---
configure.ac.in | 2 +-
plugins/applicationsmenu/Makefile.am | 2 ++
plugins/applicationsmenu/applicationsmenu.c | 1 +
plugins/directorymenu/Makefile.am | 2 ++
plugins/directorymenu/directorymenu.c | 3 ++-
plugins/tasklist/Makefile.am | 2 ++
plugins/tasklist/tasklist-widget.c | 1 +
plugins/windowmenu/Makefile.am | 2 ++
plugins/windowmenu/windowmenu.c | 1 +
9 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/configure.ac.in b/configure.ac.in
index fa4b3dd1a..8d10f4056 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -133,7 +133,7 @@ XDT_CHECK_PACKAGE([GARCON_GTK3], [garcon-gtk3-1], [0.5.0])
XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.13.0])
XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.12.0])
XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.16.0])
-XDT_CHECK_PACKAGE([EXO], [exo-1], [0.11.0])
+XDT_CHECK_PACKAGE([EXO], [exo-2], [0.11.2])
XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.24.0])
XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.24.0])
XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [2.24.0])
diff --git a/plugins/applicationsmenu/Makefile.am b/plugins/applicationsmenu/Makefile.am
index 5396e98fc..d66d3eebb 100644
--- a/plugins/applicationsmenu/Makefile.am
+++ b/plugins/applicationsmenu/Makefile.am
@@ -19,6 +19,7 @@ libapplicationsmenu_la_SOURCES = \
libapplicationsmenu_la_CFLAGS = \
$(GTK_CFLAGS) \
+ $(EXO_CFLAGS) \
$(XFCONF_CFLAGS) \
$(LIBXFCE4UTIL_CFLAGS) \
$(LIBXFCE4UI_CFLAGS) \
@@ -37,6 +38,7 @@ libapplicationsmenu_la_LIBADD = \
$(top_builddir)/libxfce4panel/libxfce4panel-$(LIBXFCE4PANEL_VERSION_API).la \
$(top_builddir)/common/libpanel-common.la \
$(GTK_LIBS) \
+ $(EXO_LIBS) \
$(LIBXFCE4UTIL_LIBS) \
$(LIBXFCE4UI_LIBS) \
$(GARCON_LIBS) \
diff --git a/plugins/applicationsmenu/applicationsmenu.c b/plugins/applicationsmenu/applicationsmenu.c
index 90806bd66..29e068818 100644
--- a/plugins/applicationsmenu/applicationsmenu.c
+++ b/plugins/applicationsmenu/applicationsmenu.c
@@ -20,6 +20,7 @@
#include <config.h>
#endif
+#include <exo/exo.h>
#include <garcon/garcon.h>
#include <garcon-gtk/garcon-gtk.h>
#include <libxfce4ui/libxfce4ui.h>
diff --git a/plugins/directorymenu/Makefile.am b/plugins/directorymenu/Makefile.am
index c8208f6c3..b54f7e93f 100644
--- a/plugins/directorymenu/Makefile.am
+++ b/plugins/directorymenu/Makefile.am
@@ -19,6 +19,7 @@ libdirectorymenu_la_SOURCES = \
libdirectorymenu_la_CFLAGS = \
$(GTK_CFLAGS) \
+ $(EXO_CFLAGS) \
$(XFCONF_CFLAGS) \
$(LIBXFCE4UTIL_CFLAGS) \
$(LIBXFCE4UI_CFLAGS) \
@@ -37,6 +38,7 @@ libdirectorymenu_la_LIBADD = \
$(top_builddir)/libxfce4panel/libxfce4panel-$(LIBXFCE4PANEL_VERSION_API).la \
$(top_builddir)/common/libpanel-common.la \
$(GTK_LIBS) \
+ $(EXO_LIBS) \
$(LIBXFCE4UTIL_LIBS) \
$(LIBXFCE4UI_LIBS) \
$(GIO_LIBS) \
diff --git a/plugins/directorymenu/directorymenu.c b/plugins/directorymenu/directorymenu.c
index 78ed2bd01..3564f69db 100644
--- a/plugins/directorymenu/directorymenu.c
+++ b/plugins/directorymenu/directorymenu.c
@@ -20,6 +20,7 @@
#include <config.h>
#endif
+#include <exo/exo.h>
#include <gio/gio.h>
#include <libxfce4ui/libxfce4ui.h>
#include <libxfce4util/libxfce4util.h>
@@ -728,7 +729,7 @@ directory_menu_plugin_menu_open (GtkWidget *mi,
path_as_arg ? working_dir : NULL,
working_dir,
NULL,
- gtk_widget_get_screen (mi), &error))
+ gtk_widget_get_screen (mi), &error)
#endif
)
{
diff --git a/plugins/tasklist/Makefile.am b/plugins/tasklist/Makefile.am
index 34c38abdd..0139d635a 100644
--- a/plugins/tasklist/Makefile.am
+++ b/plugins/tasklist/Makefile.am
@@ -21,6 +21,7 @@ libtasklist_la_SOURCES = \
libtasklist_la_CFLAGS = \
$(GTK_CFLAGS) \
+ $(EXO_CFLAGS) \
$(XFCONF_CFLAGS) \
$(LIBXFCE4UTIL_CFLAGS) \
$(LIBXFCE4UI_CFLAGS) \
@@ -39,6 +40,7 @@ libtasklist_la_LIBADD = \
$(top_builddir)/libxfce4panel/libxfce4panel-$(LIBXFCE4PANEL_VERSION_API).la \
$(top_builddir)/common/libpanel-common.la \
$(GTK_LIBS) \
+ $(EXO_LIBS) \
$(LIBXFCE4UTIL_LIBS) \
$(LIBXFCE4UI_LIBS) \
$(LIBWNCK_LIBS) \
diff --git a/plugins/tasklist/tasklist-widget.c b/plugins/tasklist/tasklist-widget.c
index 47bea47fd..fb9251721 100644
--- a/plugins/tasklist/tasklist-widget.c
+++ b/plugins/tasklist/tasklist-widget.c
@@ -28,6 +28,7 @@
#endif
#include <gtk/gtk.h>
+#include <exo/exo.h>
#include <libxfce4ui/libxfce4ui.h>
#include <libwnck/libwnck.h>
#include <libxfce4panel/libxfce4panel.h>
diff --git a/plugins/windowmenu/Makefile.am b/plugins/windowmenu/Makefile.am
index 029da7b74..95ece2ab6 100644
--- a/plugins/windowmenu/Makefile.am
+++ b/plugins/windowmenu/Makefile.am
@@ -20,6 +20,7 @@ libwindowmenu_la_SOURCES = \
libwindowmenu_la_CFLAGS = \
$(GTK_CFLAGS) \
+ $(EXO_CFLAGS) \
$(XFCONF_CFLAGS) \
$(LIBXFCE4UTIL_CFLAGS) \
$(LIBXFCE4UI_CFLAGS) \
@@ -37,6 +38,7 @@ libwindowmenu_la_LIBADD = \
$(top_builddir)/libxfce4panel/libxfce4panel-$(LIBXFCE4PANEL_VERSION_API).la \
$(top_builddir)/common/libpanel-common.la \
$(GTK_LIBS) \
+ $(EXO_LIBS) \
$(LIBXFCE4UTIL_LIBS) \
$(LIBXFCE4UI_LIBS) \
$(LIBWNCK_LIBS) \
diff --git a/plugins/windowmenu/windowmenu.c b/plugins/windowmenu/windowmenu.c
index 3b833b280..0c7f327f7 100644
--- a/plugins/windowmenu/windowmenu.c
+++ b/plugins/windowmenu/windowmenu.c
@@ -20,6 +20,7 @@
#include <config.h>
#endif
+#include <exo/exo.h>
#include <libxfce4ui/libxfce4ui.h>
#include <libxfce4panel/libxfce4panel.h>
#include <libwnck/libwnck.h>
--
GitLab