Bug 576605 - Get rid of GI_SCOPE_TYPE_OBJECT

Remove support for (scope object) as it lacks a real use case.

diff --git a/girepository/girepository.h b/girepository/girepository.h
index efc6aca..a01c3ec 100644 (file)
--- a/girepository/girepository.h
+++ b/girepository/girepository.h
@@ -296,8 +296,6 @@ typedef enum {
   GI_SCOPE_TYPE_INVALID, /* The argument is not of callback type */
   GI_SCOPE_TYPE_CALL, /* The callback and associated user_data is only used during the
                          call to this function */
-  GI_SCOPE_TYPE_OBJECT, /* The callback and associated user_data is used until
-                           the object containing this method is destroyed */
   GI_SCOPE_TYPE_ASYNC, /* The callback and associated user_data is 
                           only used until the callback is invoked, and the callback 
                           is invoked always exactly once. */

diff --git a/girepository/girparser.c b/girepository/girparser.c
index 02fa037..519c43c 100644 (file)
--- a/girepository/girparser.c
+++ b/girepository/girparser.c
@@ -934,8 +934,6 @@ start_parameter (GMarkupParseContext *context,
 
   if (scope && strcmp (scope, "call") == 0)
     param->scope = GI_SCOPE_TYPE_CALL;
-  else if (scope && strcmp (scope, "object") == 0)
-    param->scope = GI_SCOPE_TYPE_OBJECT;
   else if (scope && strcmp (scope, "async") == 0)
     param->scope = GI_SCOPE_TYPE_ASYNC;
   else if (scope && strcmp (scope, "notified") == 0)

diff --git a/tools/generate.c b/tools/generate.c
index f876721..a71f365 100644 (file)
--- a/tools/generate.c
+++ b/tools/generate.c
@@ -490,9 +490,6 @@ write_callable_info (const gchar    *namespace,
         case GI_SCOPE_TYPE_CALL:
           xml_printf (file, " scope=\"call\"");
           break;
-        case GI_SCOPE_TYPE_OBJECT:
-          xml_printf (file, " scope=\"object\"");
-          break;
         case GI_SCOPE_TYPE_ASYNC:
           xml_printf (file, " scope=\"async\"");
           break;