[evince] gimpcellrenderertoggle: Simplify build



commit 827f15121b51d3059ea076135b40fb3dbc6eb147
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Jul 12 16:19:34 2017 +0200

    gimpcellrenderertoggle: Simplify build
    
    By removing glib-genmarshal usage, seeing as the generic marshaller via
    libffi works just as well.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=784852

 cut-n-paste/gimpcellrenderertoggle/Makefile.am     |   18 -------------
 .../gimpcellrenderertoggle.c                       |    3 +-
 .../gimpcellrenderertoggle/gimpwidgetsmarshal.list |   26 --------------------
 3 files changed, 1 insertions(+), 46 deletions(-)
---
diff --git a/cut-n-paste/gimpcellrenderertoggle/Makefile.am b/cut-n-paste/gimpcellrenderertoggle/Makefile.am
index a594660..c950bec 100644
--- a/cut-n-paste/gimpcellrenderertoggle/Makefile.am
+++ b/cut-n-paste/gimpcellrenderertoggle/Makefile.am
@@ -16,22 +16,4 @@ libgimpcellrenderertoggle_la_SOURCES =                       \
        $(libgimpcellrenderertoggle_la_built_sources)   \
        $(libgimpcellrenderertoggle_la_sources)
 
-libgimpcellrenderertoggle_la_extra_sources = gimpwidgetsmarshal.list
-
-gimpwidgetsmarshal.h: $(srcdir)/gimpwidgetsmarshal.list
-       $(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=_gimp_widgets_marshal $(srcdir)/gimpwidgetsmarshal.list 
--header >> xgen-wmh \
-        && (cmp -s xgen-wmh $(@F) || cp xgen-wmh $(@F)) \
-        && rm -f xgen-wmh xgen-wmh~
-
-gimpwidgetsmarshal.c: gimpwidgetsmarshal.h
-       $(AM_V_GEN)echo "#include \"gimpwidgetsmarshal.h\"" >> xgen-wmc \
-        && $(GLIB_GENMARSHAL) --prefix=_gimp_widgets_marshal $(srcdir)/gimpwidgetsmarshal.list --body >> 
xgen-wmc \
-        && cp xgen-wmc $(@F) \
-        && rm -f xgen-wmc xgen-wmc~
-
-gen_sources = xgen-wmh xgen-wmc $(libgimpcellrenderertoggle_la_built_sources)
-CLEANFILES = $(gen_sources)
-
-EXTRA_DIST = $(libgimpcellrenderertoggle_la_extra_sources)
-
 -include $(top_srcdir)/git.mk
diff --git a/cut-n-paste/gimpcellrenderertoggle/gimpcellrenderertoggle.c 
b/cut-n-paste/gimpcellrenderertoggle/gimpcellrenderertoggle.c
index 8ef02bd..e71cafc 100644
--- a/cut-n-paste/gimpcellrenderertoggle/gimpcellrenderertoggle.c
+++ b/cut-n-paste/gimpcellrenderertoggle/gimpcellrenderertoggle.c
@@ -22,7 +22,6 @@
 
 #include <config.h>
 
-#include "gimpwidgetsmarshal.h"
 #include "gimpcellrenderertoggle.h"
 
 
@@ -96,7 +95,7 @@ gimp_cell_renderer_toggle_class_init (GimpCellRendererToggleClass *klass)
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GimpCellRendererToggleClass, clicked),
                   NULL, NULL,
-                  _gimp_widgets_marshal_VOID__STRING_FLAGS,
+                  g_cclosure_marshal_generic,
                   G_TYPE_NONE, 2,
                   G_TYPE_STRING,
                   GDK_TYPE_MODIFIER_TYPE);


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