GNOME.org
 

[gnome-shell] st: Use generic marshaller

commit 78fb10200239f70b7a6acce12cc54fc3b1dba18c
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Tue Oct 18 18:17:49 2011 -0400

    st: Use generic marshaller
    
    https://bugzilla.gnome.org/show_bug.cgi?id=662152

 src/Makefile-st.am                |   27 ++-------------------------
 src/st/st-adjustment.c            |    4 +---
 src/st/st-button.c                |    4 +---
 src/st/st-drawing-area.c          |    3 +--
 src/st/st-entry.c                 |    7 ++-----
 src/st/st-marshal.list            |   13 -------------
 src/st/st-scroll-bar.c            |    7 ++-----
 src/st/st-scroll-view.c           |    1 -
 src/st/st-table.c                 |    1 -
 src/st/st-texture-cache.c         |    3 +--
 src/st/st-theme-context.c         |    3 +--
 src/st/st-theme-node-transition.c |    6 ++----
 src/st/st-widget.c                |    7 ++-----
 13 files changed, 15 insertions(+), 71 deletions(-)
---
diff --git a/src/Makefile-st.am b/src/Makefile-st.am
index e9ad239..377d3c0 100644
--- a/src/Makefile-st.am
+++ b/src/Makefile-st.am
@@ -11,39 +11,16 @@ st_cflags =					\
 
 st_built_sources =				\
 	st-enum-types.h				\
-	st-enum-types.c				\
-	st-marshal.h				\
-	st-marshal.c
+	st-enum-types.c
 
 BUILT_SOURCES += $(st_built_sources)
 
 EXTRA_DIST +=					\
 	st/test-theme.css			\
-	st/st-marshal.list			\
 	st/st-enum-types.h.in			\
 	st/st-enum-types.c.in
 
-CLEANFILES += stamp-st-marshal.h stamp-st-enum-types.h
-
-st-marshal.h: stamp-st-marshal.h
-	@true
-stamp-st-marshal.h: Makefile st/st-marshal.list
-	$(AM_V_GEN) $(GLIB_GENMARSHAL)					\
-		--prefix=_st_marshal					\
-		--header						\
-	$(srcdir)/st/st-marshal.list > $  tmp &&			\
-	(cmp -s $  tmp st-marshal.h || cp -f $  tmp st-marshal.h) &&	\
-	rm -f $  tmp &&							\
-	echo timestamp > $(@F)
-
-st-marshal.c: Makefile st/st-marshal.list
-	$(AM_V_GEN) (echo "#include \"st-marshal.h\"" ;	\
-	 $(GLIB_GENMARSHAL)				\
-		--prefix=_st_marshal			\
-		--body					\
-	 $(srcdir)/st/st-marshal.list ) > $  tmp &&	\
-	cp -f $  tmp st-marshal.c &&			\
-	rm -f $  tmp
+CLEANFILES += stamp-st-enum-types.h
 
 st-enum-types.h: stamp-st-enum-types.h Makefile
 	@true
diff --git a/src/st/st-adjustment.c b/src/st/st-adjustment.c
index 9ac9734..e2ef9b2 100644
--- a/src/st/st-adjustment.c
+++ b/src/st/st-adjustment.c
@@ -34,7 +34,6 @@
 #include <clutter/clutter.h>
 
 #include "st-adjustment.h"
-#include "st-marshal.h"
 #include "st-private.h"
 
 G_DEFINE_TYPE (StAdjustment, st_adjustment, G_TYPE_OBJECT)
@@ -267,8 +266,7 @@ st_adjustment_class_init (StAdjustmentClass *klass)
                   G_TYPE_FROM_CLASS (klass),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (StAdjustmentClass, changed),
-                  NULL, NULL,
-                  _st_marshal_VOID__VOID,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
 }
 
diff --git a/src/st/st-button.c b/src/st/st-button.c
index 67d7b55..4d146ef 100644
--- a/src/st/st-button.c
+++ b/src/st/st-button.c
@@ -41,7 +41,6 @@
 #include "st-button.h"
 
 #include "st-enum-types.h"
-#include "st-marshal.h"
 #include "st-texture-cache.h"
 #include "st-private.h"
 
@@ -444,8 +443,7 @@ st_button_class_init (StButtonClass *klass)
                   G_TYPE_FROM_CLASS (klass),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (StButtonClass, clicked),
-                  NULL, NULL,
-                  _st_marshal_VOID__INT,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 1,
                   G_TYPE_INT);
 }
diff --git a/src/st/st-drawing-area.c b/src/st/st-drawing-area.c
index 2b904e2..daa7e25 100644
--- a/src/st/st-drawing-area.c
+++ b/src/st/st-drawing-area.c
@@ -184,8 +184,7 @@ st_drawing_area_class_init (StDrawingAreaClass *klass)
                   G_TYPE_FROM_CLASS (klass),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (StDrawingAreaClass, repaint),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__OBJECT,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
 
   g_type_class_add_private (gobject_class, sizeof (StDrawingAreaPrivate));
diff --git a/src/st/st-entry.c b/src/st/st-entry.c
index 72a32e5..28f1b1c 100644
--- a/src/st/st-entry.c
+++ b/src/st/st-entry.c
@@ -62,7 +62,6 @@
 #include "st-icon.h"
 #include "st-widget.h"
 #include "st-texture-cache.h"
-#include "st-marshal.h"
 #include "st-clipboard.h"
 #include "st-private.h"
 
@@ -735,8 +734,7 @@ st_entry_class_init (StEntryClass *klass)
                   G_TYPE_FROM_CLASS (klass),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (StEntryClass, primary_icon_clicked),
-                  NULL, NULL,
-                  _st_marshal_VOID__VOID,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
   /**
    * StEntry::secondary-icon-clicked:
@@ -748,8 +746,7 @@ st_entry_class_init (StEntryClass *klass)
                   G_TYPE_FROM_CLASS (klass),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (StEntryClass, secondary_icon_clicked),
-                  NULL, NULL,
-                  _st_marshal_VOID__VOID,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
 }
 
diff --git a/src/st/st-scroll-bar.c b/src/st/st-scroll-bar.c
index 1eb0791..ce0c3c5 100644
--- a/src/st/st-scroll-bar.c
+++ b/src/st/st-scroll-bar.c
@@ -36,7 +36,6 @@
 
 #include "st-scroll-bar.h"
 #include "st-bin.h"
-#include "st-marshal.h"
 #include "st-enum-types.h"
 #include "st-private.h"
 #include "st-button.h"
@@ -714,8 +713,7 @@ st_scroll_bar_class_init (StScrollBarClass *klass)
                   G_TYPE_FROM_CLASS (klass),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (StScrollBarClass, scroll_start),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
 
   signals[SCROLL_STOP] =
@@ -723,8 +721,7 @@ st_scroll_bar_class_init (StScrollBarClass *klass)
                   G_TYPE_FROM_CLASS (klass),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (StScrollBarClass, scroll_stop),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
 }
 
diff --git a/src/st/st-scroll-view.c b/src/st/st-scroll-view.c
index 6f6beb2..e5de8c8 100644
--- a/src/st/st-scroll-view.c
+++ b/src/st/st-scroll-view.c
@@ -59,7 +59,6 @@
  */
 
 #include "st-scroll-view.h"
-#include "st-marshal.h"
 #include "st-scroll-bar.h"
 #include "st-scrollable.h"
 #include "st-scroll-view-fade.h"
diff --git a/src/st/st-table.c b/src/st/st-table.c
index 33590b2..7d1e100 100644
--- a/src/st/st-table.c
+++ b/src/st/st-table.c
@@ -41,7 +41,6 @@
 #include <clutter/clutter.h>
 
 #include "st-enum-types.h"
-#include "st-marshal.h"
 #include "st-private.h"
 #include "st-table-child.h"
 #include "st-table-private.h"
diff --git a/src/st/st-texture-cache.c b/src/st/st-texture-cache.c
index 011512c..813c0fe 100644
--- a/src/st/st-texture-cache.c
+++ b/src/st/st-texture-cache.c
@@ -95,8 +95,7 @@ st_texture_cache_class_init (StTextureCacheClass *klass)
                   G_TYPE_FROM_CLASS (klass),
                   G_SIGNAL_RUN_LAST,
                   0, /* no default handler slot */
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
 }
 
diff --git a/src/st/st-theme-context.c b/src/st/st-theme-context.c
index 80a00e5..6fe5fb7 100644
--- a/src/st/st-theme-context.c
+++ b/src/st/st-theme-context.c
@@ -86,8 +86,7 @@ st_theme_context_class_init (StThemeContextClass *klass)
                   G_TYPE_FROM_CLASS (klass),
                   G_SIGNAL_RUN_LAST,
                   0, /* no default handler slot */
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
 }
 
diff --git a/src/st/st-theme-node-transition.c b/src/st/st-theme-node-transition.c
index 7bb83cd..26a6347 100644
--- a/src/st/st-theme-node-transition.c
+++ b/src/st/st-theme-node-transition.c
@@ -454,8 +454,7 @@ st_theme_node_transition_class_init (StThemeNodeTransitionClass *klass)
                   G_TYPE_FROM_CLASS (klass),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (StThemeNodeTransitionClass, completed),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
 
   signals[NEW_FRAME] =
@@ -463,7 +462,6 @@ st_theme_node_transition_class_init (StThemeNodeTransitionClass *klass)
                   G_TYPE_FROM_CLASS (klass),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (StThemeNodeTransitionClass, new_frame),
-                  NULL, NULL,
-                  g_cclosure_marshal_VOID__VOID,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
 }
diff --git a/src/st/st-widget.c b/src/st/st-widget.c
index 8681651..0fc225c 100644
--- a/src/st/st-widget.c
+++ b/src/st/st-widget.c
@@ -35,7 +35,6 @@
 #include "st-widget.h"
 
 #include "st-label.h"
-#include "st-marshal.h"
 #include "st-private.h"
 #include "st-texture-cache.h"
 #include "st-theme-context.h"
@@ -995,8 +994,7 @@ st_widget_class_init (StWidgetClass *klass)
                   G_TYPE_FROM_CLASS (klass),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (StWidgetClass, style_changed),
-                  NULL, NULL,
-                  _st_marshal_VOID__VOID,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
 
   /**
@@ -1011,8 +1009,7 @@ st_widget_class_init (StWidgetClass *klass)
                   G_TYPE_FROM_CLASS (klass),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (StWidgetClass, popup_menu),
-                  NULL, NULL,
-                  _st_marshal_VOID__VOID,
+                  NULL, NULL, NULL,
                   G_TYPE_NONE, 0);
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]