[vlc-commits] XCB: remove xembed.h file

[Jean-Baptiste Kempf]

npapi-vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Dec 13 17:21:57 2012 +0100| [56a341bcc640842f324ce9757d36cbdd05503b1a] | committer: Jean-Baptiste Kempf

XCB: remove xembed.h file

> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=56a341bcc640842f324ce9757d36cbdd05503b1a
---

 npapi/Makefile.am       |    1 -
 npapi/vlcplugin_xcb.cpp |    7 +++++++
 npapi/vlcplugin_xcb.h   |    1 -
 npapi/xembed.h          |   38 --------------------------------------
 4 files changed, 7 insertions(+), 40 deletions(-)

diff --git a/npapi/Makefile.am b/npapi/Makefile.am
index 7963afe..7e0d161 100644
--- a/npapi/Makefile.am
+++ b/npapi/Makefile.am
@@ -62,7 +62,6 @@ AM_CPPFLAGS += $(XCB_CFLAGS)
 libvlcplugin_la_LIBADD += $(XCB_LIBS)
 SOURCES_support = \
 	support/npunix.cpp \
-	xembed.h \
 	vlcplugin_xcb.cpp \
 	vlcplugin_xcb.h
 endif # !USE_GTK
diff --git a/npapi/vlcplugin_xcb.cpp b/npapi/vlcplugin_xcb.cpp
index 63cb7f5..904e6de 100644
--- a/npapi/vlcplugin_xcb.cpp
+++ b/npapi/vlcplugin_xcb.cpp
@@ -29,6 +29,13 @@
 #include <cstring>
 #include <cstdlib>
 
+/* the latest version of XEmbed that we support */
+#define PLUGIN_XEMBED_PROTOCOL_VERSION 1
+
+/* Flags for _XEMBED_INFO */
+#define XEMBED_MAPPED                   (1 << 0)
+
+
 VlcPluginXcb::VlcPluginXcb(NPP instance, NPuint16_t mode) :
     VlcPluginBase(instance, mode)
 {
diff --git a/npapi/vlcplugin_xcb.h b/npapi/vlcplugin_xcb.h
index 9bae89c..f9ec92a 100644
--- a/npapi/vlcplugin_xcb.h
+++ b/npapi/vlcplugin_xcb.h
@@ -29,7 +29,6 @@
 
 #include "vlcplugin_base.h"
 #include <xcb/xcb.h>
-#include "xembed.h"
 
 class VlcPluginXcb : public VlcPluginBase
 {
diff --git a/npapi/xembed.h b/npapi/xembed.h
deleted file mode 100644
index 25d5521..0000000
--- a/npapi/xembed.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef __XEMBED_H__
-#define __XEMBED_H__
-
-/* the latest version of XEmbed that we support */
-#define PLUGIN_XEMBED_PROTOCOL_VERSION 1
-
-/* XEMBED messages */
-typedef enum {
-  XEMBED_EMBEDDED_NOTIFY        = 0,
-  XEMBED_WINDOW_ACTIVATE        = 1,
-  XEMBED_WINDOW_DEACTIVATE      = 2,
-  XEMBED_REQUEST_FOCUS          = 3,
-  XEMBED_FOCUS_IN               = 4,
-  XEMBED_FOCUS_OUT              = 5,
-  XEMBED_FOCUS_NEXT             = 6,
-  XEMBED_FOCUS_PREV             = 7,
-  XEMBED_GRAB_KEY               = 8,
-  XEMBED_UNGRAB_KEY             = 9,
-  XEMBED_MODALITY_ON            = 10,
-  XEMBED_MODALITY_OFF           = 11,
-
-/* Non standard messages*/
-  XEMBED_GTK_GRAB_KEY           = 108,
-  XEMBED_GTK_UNGRAB_KEY         = 109
-} XEmbedMessageType;
-
-/* Details for  XEMBED_FOCUS_IN: */
-#define XEMBED_FOCUS_CURRENT             0
-#define XEMBED_FOCUS_FIRST               1
-#define XEMBED_FOCUS_LAST                2
-
-/* Flags for XEMBED_FOCUS_IN, XEMBED_FOCUS_NEXT, XEMBED_FOCUS_PREV */
-#define XEMBED_FOCUS_WRAPAROUND         (1 << 0)
-
-/* Flags for _XEMBED_INFO */
-#define XEMBED_MAPPED                   (1 << 0)
-
-#endif /* __XEMBED_H__ */