use "container" for container/shallow ownership transfer (not "shallow")

2008-10-12  Tommi Komulainen  <tommi.komulainen@iki.fi>

	* girepository/girparser.c (parse_param_transfer):
	* tools/generate.c (write_callable_info): use "container" for
	container/shallow ownership transfer (not "shallow")

svn path=/trunk/; revision=689

diff --git a/ChangeLog b/ChangeLog
index 9ca10d0..2c74a70 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,12 @@
 
 2008-10-12  Tommi Komulainen  <tommi.komulainen@iki.fi>
 
+       * girepository/girparser.c (parse_param_transfer):
+       * tools/generate.c (write_callable_info): use "container" for
+       container/shallow ownership transfer (not "shallow")
+
+2008-10-12  Tommi Komulainen  <tommi.komulainen@iki.fi>
+
        * girepository/girparser.c (parse_param_transfer,
        start_parameter): Refactor handling of transfer=none/shallow/full
        to separate function

diff --git a/girepository/girparser.c b/girepository/girparser.c
index b8bff22..ead27f3 100644 (file)
--- a/girepository/girparser.c
+++ b/girepository/girparser.c
@@ -666,7 +666,7 @@ parse_param_transfer (GIrNodeParam *param, const gchar *transfer)
       param->transfer = FALSE;
       param->shallow_transfer = FALSE;
     }
-  else if (transfer && strcmp (transfer, "shallow") == 0)
+  else if (transfer && strcmp (transfer, "container") == 0)
     {
       param->transfer = FALSE;
       param->shallow_transfer = TRUE;

diff --git a/tools/generate.c b/tools/generate.c
index 7e8d5a2..8e25d33 100644 (file)
--- a/tools/generate.c
+++ b/tools/generate.c
@@ -246,7 +246,7 @@ write_callable_info (const gchar    *namespace,
        case GI_TRANSFER_NOTHING:
          break;
        case GI_TRANSFER_CONTAINER:
-         g_fprintf (file, " transfer=\"shallow\"");
+         g_fprintf (file, " transfer=\"container\"");
          break;
        case GI_TRANSFER_EVERYTHING:
          g_fprintf (file, " transfer=\"full\"");
@@ -287,7 +287,7 @@ write_callable_info (const gchar    *namespace,
        case GI_TRANSFER_NOTHING:
          break;
        case GI_TRANSFER_CONTAINER:
-         g_fprintf (file, " transfer=\"shallow\"");
+         g_fprintf (file, " transfer=\"container\"");
          break;
        case GI_TRANSFER_EVERYTHING:
          g_fprintf (file, " transfer=\"full\"");