gtk: rename s/spice-channel-enums/spice-glib-enums

6 files changed, 26 insertions, 12 deletions

diff --git a/doc/reference/spice-gtk.types b/doc/reference/spice-gtk.types
index e0e96f6..189650e 100644
--- a/doc/reference/spice-gtk.types
+++ b/doc/reference/spice-gtk.types
@@ -3,7 +3,7 @@
 #include "spice-types.h"
 #include "spice-session.h"
 #include "spice-channel.h"
-#include "spice-channel-enums.h"
+#include "spice-glib-enums.h"
 #include "spice-util.h"
 #include "channel-main.h"
 #include "channel-display.h"
diff --git a/gtk/.gitignore b/gtk/.gitignore
index 3298652..673f528 100644
--- a/gtk/.gitignore
+++ b/gtk/.gitignore
@@ -31,9 +31,9 @@
 /libspice-client-gtk-2.0.la
 /snappy
 /so_locations
-/spice-channel-enums.c
-/spice-channel-enums.h
 /spice-client-gtk-module.defs.c
+/spice-glib-enums.c
+/spice-glib-enums.h
 /spice-marshal.c
 /spice-marshal.h
 /spice-widget-enums.c
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 0d117ec..eb99440 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -151,8 +151,8 @@ libspice_client_glib_2_0_la_SOURCES =	\
 	spice-channel.c			\
 	spice-channel.h			\
 	spice-channel-cache.h		\
-	spice-channel-enums.h		\
-	spice-channel-enums.c		\
+	spice-glib-enums.h		\
+	spice-glib-enums.c		\
 	spice-channel-priv.h		\
 	spice-marshal.c			\
 	spice-marshal.h			\
@@ -240,6 +240,7 @@ libspice_client_glibinclude_HEADERS =	\
 	spice-session.h			\
 	spice-channel.h			\
 	spice-channel-enums.h		\
+	spice-glib-enums.h		\
 	spice-util.h			\
 	channel-main.h			\
 	channel-display.h		\
@@ -282,9 +283,10 @@ spice-marshal.c: spice-marshal.txt
 spice-marshal.h: spice-marshal.txt
 	$(AM_V_GEN)glib-genmarshal --header $< > $@ || (rm -f $@ && exit 1)
 
-spice-channel-enums.c: spice-channel.h channel-inputs.h
+spice-glib-enums.c: spice-channel.h channel-inputs.h spice-session.h
 	$(AM_V_GEN)glib-mkenums --fhead "#include <glib-object.h>\n" \
-			--fhead "#include \"spice-channel-enums.h\"\n\n" \
+			--fhead "#include \"spice-glib-enums.h\"\n\n" \
+			--fprod "\n#include \"spice-session.h\"\n" \
 			--fprod "\n#include \"spice-channel.h\"\n" \
 			--fprod "\n#include \"channel-inputs.h\"\n" \
 			--vhead "static const G@Type@Value _@enum_name@_values[] = {" \
@@ -297,9 +299,9 @@ spice-channel-enums.c: spice-channel.h channel-inputs.h
 			--vtail "  return type;\n}\n\n" \
 		$^ > $@
 
-spice-channel-enums.h: spice-channel.h channel-inputs.h
-	$(AM_V_GEN)glib-mkenums --fhead "#ifndef SPICE_CHANNEL_ENUMS_H\n" \
-			--fhead "#define SPICE_CHANNEL_ENUMS_H\n\n" \
+spice-glib-enums.h: spice-channel.h channel-inputs.h spice-session.h
+	$(AM_V_GEN)glib-mkenums --fhead "#ifndef SPICE_GLIB_ENUMS_H\n" \
+			--fhead "#define SPICE_GLIB_ENUMS_H\n\n" \
 			--fhead "G_BEGIN_DECLS\n\n" \
 			--ftail "G_END_DECLS\n\n" \
 			--ftail "#endif /* SPICE_CHANNEL_ENUMS_H */\n" \
@@ -369,7 +371,7 @@ vncdisplaykeymap_win322xtkbd.c:
 BUILT_SOURCES = spice-marshal.c spice-marshal.h \
 	generated_demarshallers.c generated_demarshallers1.c \
 	generated_marshallers.c generated_marshallers1.c \
-	spice-channel-enums.c spice-channel-enums.h \
+	spice-glib-enums.c spice-glib-enums.h \
 	spice-widget-enums.c spice-widget-enums.h \
 	$(KEYMAPS)
 
diff --git a/gtk/spice-channel-enums.h b/gtk/spice-channel-enums.h
new file mode 100644
index 0000000..0ba0f78
--- /dev/null
+++ b/gtk/spice-channel-enums.h
@@ -0,0 +1,11 @@
+#ifndef SPICE_CHANNEL_ENUMS_H
+#define SPICE_CHANNEL_ENUMS_H
+
+#warning "deprecated: please include spice-glib.enums.h"
+#include "spice-glib-enums.h"
+
+#endif /* SPICE_CHANNEL_ENUMS_H */
+
+
+
+
diff --git a/gtk/spice-channel.h b/gtk/spice-channel.h
index a3b9faa..1ed1e49 100644
--- a/gtk/spice-channel.h
+++ b/gtk/spice-channel.h
@@ -21,7 +21,7 @@
 G_BEGIN_DECLS
 
 #include "spice-types.h"
-#include "spice-channel-enums.h"
+#include "spice-glib-enums.h"
 #include "spice-util.h"
 
 #define SPICE_TYPE_CHANNEL            (spice_channel_get_type ())
diff --git a/gtk/spice-session.h b/gtk/spice-session.h
index 364667e..16c52d2 100644
--- a/gtk/spice-session.h
+++ b/gtk/spice-session.h
@@ -20,6 +20,7 @@
 
 #include <glib-object.h>
 #include "spice-types.h"
+#include "spice-glib-enums.h"
 #include "spice-util.h"
 
 G_BEGIN_DECLS