[gnome-panel] remove panel-enums.h



commit 89248f3ebbd4b07480966f40055292bda6ec7fde
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sun Apr 19 14:17:24 2020 +0300

    remove panel-enums.h

 gnome-panel/Makefile.am             |  2 --
 gnome-panel/applet.h                |  1 -
 gnome-panel/panel-enums-gsettings.h |  3 +++
 gnome-panel/panel-enums.h           | 36 ------------------------------------
 gnome-panel/panel-layout.h          |  2 +-
 gnome-panel/panel-object-loader.c   |  2 +-
 gnome-panel/panel-run-dialog.c      |  1 -
 gnome-panel/panel-toplevel.h        |  2 +-
 gnome-panel/panel-xutils.h          |  2 +-
 9 files changed, 7 insertions(+), 44 deletions(-)
---
diff --git a/gnome-panel/Makefile.am b/gnome-panel/Makefile.am
index cab705909..6d06b8a84 100644
--- a/gnome-panel/Makefile.am
+++ b/gnome-panel/Makefile.am
@@ -65,7 +65,6 @@ panel_headers =                       \
        panel-multiscreen.h     \
        panel-a11y.h            \
        panel-bindings.h        \
-       panel-enums.h           \
        panel-enums-gsettings.h \
        panel-lockdown.h        \
        panel-icon-names.h      \
@@ -113,7 +112,6 @@ gnome_panel_LDFLAGS = \
        $(NULL)
 
 panel_enum_headers =                                           \
-       $(top_srcdir)/gnome-panel/panel-enums.h                 \
        $(top_srcdir)/gnome-panel/panel-enums-gsettings.h       \
        $(top_srcdir)/gnome-panel/panel-types.h
 
diff --git a/gnome-panel/applet.h b/gnome-panel/applet.h
index 3237cbb4b..d34269a79 100644
--- a/gnome-panel/applet.h
+++ b/gnome-panel/applet.h
@@ -4,7 +4,6 @@
 #include <glib.h>
 #include <gdk/gdk.h>
 
-#include "panel-enums.h"
 #include "panel-widget.h"
 
 G_BEGIN_DECLS
diff --git a/gnome-panel/panel-enums-gsettings.h b/gnome-panel/panel-enums-gsettings.h
index 546eb9f7e..93f9fe3a3 100644
--- a/gnome-panel/panel-enums-gsettings.h
+++ b/gnome-panel/panel-enums-gsettings.h
@@ -40,6 +40,9 @@ typedef enum { /*< flags=0 >*/
        PANEL_ORIENTATION_LEFT   = 1 << 3
 } PanelOrientation;
 
+#define PANEL_HORIZONTAL_MASK (PANEL_ORIENTATION_TOP | PANEL_ORIENTATION_BOTTOM)
+#define PANEL_VERTICAL_MASK (PANEL_ORIENTATION_LEFT | PANEL_ORIENTATION_RIGHT)
+
 typedef enum {
        PANEL_ANIMATION_SLOW   = 0,
        PANEL_ANIMATION_MEDIUM = 1,
diff --git a/gnome-panel/panel-layout.h b/gnome-panel/panel-layout.h
index f751c6677..8841e6bfd 100644
--- a/gnome-panel/panel-layout.h
+++ b/gnome-panel/panel-layout.h
@@ -26,7 +26,7 @@
 #include <glib.h>
 #include <gdk/gdk.h>
 
-#include "panel-enums.h"
+#include "panel-enums-gsettings.h"
 
 G_BEGIN_DECLS
 
diff --git a/gnome-panel/panel-object-loader.c b/gnome-panel/panel-object-loader.c
index a7421df46..7d5295dce 100644
--- a/gnome-panel/panel-object-loader.c
+++ b/gnome-panel/panel-object-loader.c
@@ -31,7 +31,7 @@
 
 #include <libpanel-util/panel-glib.h>
 
-#include "panel-enums.h"
+#include "panel-enums-gsettings.h"
 #include "panel-schemas.h"
 #include "panel-toplevel.h"
 
diff --git a/gnome-panel/panel-run-dialog.c b/gnome-panel/panel-run-dialog.c
index e34d3fc96..7244c82af 100644
--- a/gnome-panel/panel-run-dialog.c
+++ b/gnome-panel/panel-run-dialog.c
@@ -49,7 +49,6 @@
 #include <libpanel-util/panel-xdg.h>
 
 #include "panel-util.h"
-#include "panel-enums.h"
 #include "panel-multiscreen.h"
 #include "panel-lockdown.h"
 #include "panel-xutils.h"
diff --git a/gnome-panel/panel-toplevel.h b/gnome-panel/panel-toplevel.h
index 7487f1601..e2691e8d1 100644
--- a/gnome-panel/panel-toplevel.h
+++ b/gnome-panel/panel-toplevel.h
@@ -25,7 +25,7 @@
 
 #include <gtk/gtk.h>
 
-#include "panel-enums.h"
+#include "panel-enums-gsettings.h"
 
 G_BEGIN_DECLS
 
diff --git a/gnome-panel/panel-xutils.h b/gnome-panel/panel-xutils.h
index 8859eb449..47fbe1e98 100644
--- a/gnome-panel/panel-xutils.h
+++ b/gnome-panel/panel-xutils.h
@@ -26,7 +26,7 @@
 #include <glib.h>
 #include <gdk/gdk.h>
 
-#include "panel-enums.h"
+#include "panel-enums-gsettings.h"
 
 G_BEGIN_DECLS
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]