From 983dd287da4b00baedbd04ce0f777c043d93f5b0 Mon Sep 17 00:00:00 2001
From: Kjell Ahlstedt <kjell.ahlstedt@bredband.net>
Date: Thu, 20 Nov 2014 16:54:58 +0100
Subject: Add Glib::Binding

* .gitignore: Ignore binding.[h|cc].
* glib/glibmm/objectbase.h: Add a comment.
* glib/src/filelist.am: Add glib_signals.defs and binding.hg.
* glib/src/glib.defs:  Add glib_signals.defs.
* glib/glibmm.h: Add binding.h.
* tools/extra_defs_gen/generate_defs_glib.cc: Add get_defs(G_TYPE_BINDING).
* tools/m4/convert_glib.m4: Add conversion for BindingFlags.
* tools/generate_wrap_init.pl.in: Define GLIBMM_INCLUDED_FROM_WRAP_INIT_CC.
* glib/src/binding.[hg|ccg]: New files with enum BindingFlags and class Binding.
* glib/src/glib_signals.defs: New file with info about GBinding's properties.
Bug #738663.
---
 tools/generate_wrap_init.pl.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tools/generate_wrap_init.pl.in')

diff --git a/tools/generate_wrap_init.pl.in b/tools/generate_wrap_init.pl.in
index 59cd6540..1381dfe3 100644
--- a/tools/generate_wrap_init.pl.in
+++ b/tools/generate_wrap_init.pl.in
@@ -192,7 +192,7 @@ while ($ARGV[0])
     elsif (/\b_NO_WRAP_INIT_REGISTRATION\b/)
     {
       $exclude_from_wrap_init{$filename_header} = 1;
-    } 
+    }
   }
 
   shift @ARGV;
@@ -205,6 +205,7 @@ while ($ARGV[0])
 print << "EOF";
 // Generated by generate_wrap_init.pl -- DO NOT MODIFY!
 
+#define GLIBMM_INCLUDED_FROM_WRAP_INIT_CC
 #include <glibmm.h>
 
 // Disable the 'const' function attribute of the get_type() functions.
-- 
cgit v1.2.1


From 0162a65ffc82c377ec5a4c78a3fe8092d62154f8 Mon Sep 17 00:00:00 2001
From: Marcin Kolny <marcin.kolny@flytronic.pl>
Date: Wed, 29 Jul 2015 13:06:43 +0200
Subject: generate_wrap_init.pl: Allow to use nested namespaces for whole
 module.

https://bugzilla.gnome.org/show_bug.cgi?id=753013

    * tools/generate_wrap_init.pl.in: add support for nested namespaces in
      --namespace parameter, i.e. --namespace=Gst::Bad. It requires to
      store all classes from module at least in Gst::Bad namespace, but
      allows to use this namespace in wrap_init.h class.
---
 tools/generate_wrap_init.pl.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tools/generate_wrap_init.pl.in')

diff --git a/tools/generate_wrap_init.pl.in b/tools/generate_wrap_init.pl.in
index 1381dfe3..f49fe2f2 100644
--- a/tools/generate_wrap_init.pl.in
+++ b/tools/generate_wrap_init.pl.in
@@ -66,7 +66,7 @@ while ($ARGV[0] =~ /^-/)
 {
   if ($ARGV[0] =~ /--namespace=(\S+)/)
   {
-    push(@namespace_whole, $1);
+    push(@namespace_whole, split('::', $1));
 
     if($parent_dir eq "")
       { $parent_dir = lc($1) . "mm"; }
-- 
cgit v1.2.1