[Xfce4-commits] <xfce4-panel:devel> Remove panel marshal.

[Nick Schermer]

Updating branch refs/heads/devel
         to e4887b4c6255c4f183c225a3ebe5c21ee0d3aba7 (commit)
       from 71d8c9f6f5f4f7ce44a8e8be07f1e5381cd051c6 (commit)

commit e4887b4c6255c4f183c225a3ebe5c21ee0d3aba7
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Nov 22 20:17:43 2009 +0100

    Remove panel marshal.

 panel/Makefile.am                |   16 +++++++---------
 panel/panel-dbus-service.c       |    1 -
 panel/panel-marshal.list         |    1 -
 panel/panel-plugin-external-46.c |    5 ++---
 panel/panel-plugin-external.c    |    3 +--
 wrapper/Makefile.am              |   16 +++++++---------
 wrapper/main.c                   |    2 --
 7 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/panel/Makefile.am b/panel/Makefile.am
index 2c60281..095a360 100644
--- a/panel/Makefile.am
+++ b/panel/Makefile.am
@@ -15,8 +15,6 @@ bin_PROGRAMS = \
 xfce4_panel_built_sources = \
 	panel-dbus-service-infos.h \
 	panel-dbus-client-infos.h \
-	panel-marshal.h \
-	panel-marshal.c \
 	panel-plugin-external-infos.h \
 	panel-preferences-dialog-ui.h
 
@@ -93,12 +91,12 @@ panel-plugin-external-infos.h: $(srcdir)/panel-plugin-external-infos.xml Makefil
 panel-preferences-dialog-ui.h: $(srcdir)/panel-preferences-dialog.ui Makefile
 	$(AM_V_GEN) exo-csource --static --strip-comments --strip-content --name=panel_preferences_dialog_ui $< >$@
 
-panel-marshal.h: $(srcdir)/panel-marshal.list Makefile
-	$(AM_V_GEN) glib-genmarshal --header --prefix=panel_marshal $< > $@
-
-panel-marshal.c: $(srcdir)/panel-marshal.list Makefile
-	$(AM_V_GEN) echo "#include <panel/panel-marshal.h>" > $@ \
-	&& glib-genmarshal --body --prefix=panel_marshal $< >> $@
+#panel-marshal.h: $(srcdir)/panel-marshal.list Makefile
+#	$(AM_V_GEN) glib-genmarshal --header --prefix=panel_marshal $< > $@
+#
+#panel-marshal.c: $(srcdir)/panel-marshal.list Makefile
+#	$(AM_V_GEN) echo "#include <panel/panel-marshal.h>" > $@ \
+#	&& glib-genmarshal --body --prefix=panel_marshal $< >> $@
 
 DISTCLEANFILES = \
 	$(xfce4_panel_built_sources)
@@ -110,7 +108,7 @@ endif
 
 EXTRA_DIST = \
 	panel-dbus-service-infos.xml \
-	panel-marshal.list \
+	panel-plugin-external-infos.xml \
 	panel-preferences-dialog.ui
 
 # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/panel/panel-dbus-service.c b/panel/panel-dbus-service.c
index deafd22..32ae188 100644
--- a/panel/panel-dbus-service.c
+++ b/panel/panel-dbus-service.c
@@ -38,7 +38,6 @@
 #include <panel/panel-preferences-dialog.h>
 #include <panel/panel-item-dialog.h>
 #include <panel/panel-module-factory.h>
-#include <panel/panel-marshal.h>
 
 
 
diff --git a/panel/panel-marshal.list b/panel/panel-marshal.list
deleted file mode 100644
index 8b13789..0000000
--- a/panel/panel-marshal.list
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/panel/panel-plugin-external-46.c b/panel/panel-plugin-external-46.c
index 1c3fe50..5aaf957 100644
--- a/panel/panel-plugin-external-46.c
+++ b/panel/panel-plugin-external-46.c
@@ -40,7 +40,6 @@
 #include <libxfce4panel/libxfce4panel.h>
 #include <libxfce4panel/xfce-panel-plugin-provider.h>
 
-#include <panel/panel-marshal.h>
 #include <panel/panel-module.h>
 #include <panel/panel-plugin-external-46.h>
 #include <panel/panel-window.h>
@@ -112,10 +111,10 @@ struct _PanelPluginExternal46
   /* whether the plug is embedded */
   guint             plug_embedded : 1;
 
-  /* dbus message queue */
+  /* client-event queue */
   GSList           *queue;
 
-  /* counter to count the number of restarts */
+  /* number of automatic restarts restarts */
   guint             n_restarts;
 
   /* some info we store here */
diff --git a/panel/panel-plugin-external.c b/panel/panel-plugin-external.c
index 699cdc7..9b748dc 100644
--- a/panel/panel-plugin-external.c
+++ b/panel/panel-plugin-external.c
@@ -38,7 +38,6 @@
 #include <libxfce4panel/libxfce4panel.h>
 #include <libxfce4panel/xfce-panel-plugin-provider.h>
 
-#include <panel/panel-marshal.h>
 #include <panel/panel-module.h>
 #include <panel/panel-plugin-external.h>
 #include <panel/panel-window.h>
@@ -136,7 +135,7 @@ struct _PanelPluginExternal
   /* dbus message queue */
   GPtrArray        *queue;
 
-  /* counter to count the number of restarts */
+  /* number of automatic restarts restarts */
   guint             n_restarts;
 
   /* some info we store here */
diff --git a/wrapper/Makefile.am b/wrapper/Makefile.am
index 663d693..b90b97e 100644
--- a/wrapper/Makefile.am
+++ b/wrapper/Makefile.am
@@ -11,9 +11,7 @@ wrapper_PROGRAMS = \
 	wrapper
 
 wrapper_built_sources = \
-	wrapper-dbus-client-infos.h \
-	wrapper-marshal.h \
-	wrapper-marshal.c
+	wrapper-dbus-client-infos.h
 
 wrapper_SOURCES = \
 	$(wrapper_built_sources) \
@@ -49,12 +47,12 @@ if MAINTAINER_MODE
 wrapper-dbus-client-infos.h: $(top_builddir)/panel/panel-plugin-external-infos.xml Makefile
 	$(AM_V_GEN) dbus-binding-tool --mode=glib-client $< > $@
 
-wrapper-marshal.h: $(top_builddir)/panel/panel-marshal.list Makefile
-	$(AM_V_GEN)glib-genmarshal --header --prefix=wrapper_marshal $< > $@
-
-wrapper-marshal.c: $(top_builddir)/panel/panel-marshal.list Makefile
-	$(AM_V_GEN) echo "#include <wrapper/wrapper-marshal.h>" > $@ \
-	&& glib-genmarshal --body --prefix=wrapper_marshal $< >> $@
+#wrapper-marshal.h: $(top_builddir)/panel/panel-marshal.list Makefile
+#	$(AM_V_GEN)glib-genmarshal --header --prefix=wrapper_marshal $< > $@
+#
+#wrapper-marshal.c: $(top_builddir)/panel/panel-marshal.list Makefile
+#	$(AM_V_GEN) echo "#include <wrapper/wrapper-marshal.h>" > $@ \
+#	&& glib-genmarshal --body --prefix=wrapper_marshal $< >> $@
 
 BUILT_SOURCES = \
 	$(wrapper_built_sources)
diff --git a/wrapper/main.c b/wrapper/main.c
index 856285b..d1adc0b 100644
--- a/wrapper/main.c
+++ b/wrapper/main.c
@@ -45,9 +45,7 @@
 #include <libxfce4panel/xfce-panel-plugin-provider.h>
 
 #include <wrapper/wrapper-plug.h>
-#include <wrapper/wrapper-marshal.h>
 #include <wrapper/wrapper-module.h>
-
 #include <wrapper/wrapper-dbus-client-infos.h>