X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Fginitable.c;h=23d6069f3b3efd5a41a1d4c531cd1f1fad549ea8;hb=c8d10470939847069b1a346d4c44f2adde3469f6;hp=29b60ddceac8cd59d09f39a73c675058d8d10a2a;hpb=6ea86cc57f1b8b8c7acc4e08ece8baef5f28a53a;p=platform%2Fupstream%2Fglib.git
diff --git a/gio/ginitable.c b/gio/ginitable.c
index 29b60dd..23d6069 100644
--- a/gio/ginitable.c
+++ b/gio/ginitable.c
@@ -13,9 +13,7 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see .
*
* Author: Alexander Larsson
*/
@@ -24,7 +22,6 @@
#include "ginitable.h"
#include "glibintl.h"
-#include "gioalias.h"
/**
* SECTION:ginitable
@@ -33,65 +30,50 @@
* @see_also: #GAsyncInitable
*
* #GInitable is implemented by objects that can fail during
- * initialization. If an object implements this interface the
- * g_initable_init() function must be called as the first thing
- * after construction. If g_initable_init() is not called, or if
- * it returns an error, all further operations on the object
- * should fail, generally with a %G_IO_ERROR_NOT_INITIALIZED error.
+ * initialization. If an object implements this interface then
+ * it must be initialized as the first thing after construction,
+ * either via g_initable_init() or g_async_initable_init_async()
+ * (the latter is only available if it also implements #GAsyncInitable).
+ *
+ * If the object is not initialized, or initialization returns with an
+ * error, then all operations on the object except g_object_ref() and
+ * g_object_unref() are considered to be invalid, and have undefined
+ * behaviour. They will often fail with g_critical() or g_warning(), but
+ * this must not be relied on.
*
* Users of objects implementing this are not intended to use
* the interface method directly, instead it will be used automatically
* in various ways. For C applications you generally just call
* g_initable_new() directly, or indirectly via a foo_thing_new() wrapper.
* This will call g_initable_init() under the cover, returning %NULL and
- * setting a %GError on failure.
+ * setting a #GError on failure (at which point the instance is
+ * unreferenced).
*
* For bindings in languages where the native constructor supports
* exceptions the binding could check for objects implemention %GInitable
* during normal construction and automatically initialize them, throwing
* an exception on failure.
- **/
-
-GType
-g_initable_get_type (void)
-{
- static volatile gsize g_define_type_id__volatile = 0;
+ */
- if (g_once_init_enter (&g_define_type_id__volatile))
- {
- const GTypeInfo initable_info =
- {
- sizeof (GInitableIface), /* class_size */
- NULL, /* base_init */
- NULL, /* base_finalize */
- NULL,
- NULL, /* class_finalize */
- NULL, /* class_data */
- 0,
- 0, /* n_preallocs */
- NULL
- };
- GType g_define_type_id =
- g_type_register_static (G_TYPE_INTERFACE, I_("GInitable"),
- &initable_info, 0);
-
- g_type_interface_add_prerequisite (g_define_type_id, G_TYPE_OBJECT);
-
- g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
- }
+typedef GInitableIface GInitableInterface;
+G_DEFINE_INTERFACE (GInitable, g_initable, G_TYPE_OBJECT)
- return g_define_type_id__volatile;
+static void
+g_initable_default_init (GInitableInterface *iface)
+{
}
/**
* g_initable_init:
* @initable: a #GInitable.
* @cancellable: optional #GCancellable object, %NULL to ignore.
- * @error: a #GError location to store the error occuring, or %NULL to
+ * @error: a #GError location to store the error occurring, or %NULL to
* ignore.
*
- * Initializes the object implementing the interface. This must be
- * done before any real use of the object after initial construction.
+ * Initializes the object implementing the interface.
+ *
+ * The object must be initialized before any real use after initial
+ * construction, either with this function or g_async_initable_init_async().
*
* Implementations may also support cancellation. If @cancellable is not %NULL,
* then initialization can be cancelled by triggering the cancellable object
@@ -100,22 +82,22 @@ g_initable_get_type (void)
* the object doesn't support cancellable initialization the error
* %G_IO_ERROR_NOT_SUPPORTED will be returned.
*
- * If this function is not called, or returns with an error then all
- * operations on the object should fail, generally returning the
- * error %G_IO_ERROR_NOT_INITIALIZED.
+ * If the object is not initialized, or initialization returns with an
+ * error, then all operations on the object except g_object_ref() and
+ * g_object_unref() are considered to be invalid, and have undefined
+ * behaviour. See the [introduction][ginitable] for more details.
*
* Implementations of this method must be idempotent, i.e. multiple calls
* to this function with the same argument should return the same results.
* Only the first call initializes the object, further calls return the result
- * of the first call. This is so that its safe to implement the singleton
+ * of the first call. This is so that it's safe to implement the singleton
* pattern in the GObject constructor function.
*
- * Returns: %TRUE if successful. If an error
- * has occurred, this function will return %FALSE and set @error
- * appropriately if present.
+ * Returns: %TRUE if successful. If an error has occurred, this function will
+ * return %FALSE and set @error appropriately if present.
*
* Since: 2.22
- **/
+ */
gboolean
g_initable_init (GInitable *initable,
GCancellable *cancellable,
@@ -134,20 +116,22 @@ g_initable_init (GInitable *initable,
* g_initable_new:
* @object_type: a #GType supporting #GInitable.
* @cancellable: optional #GCancellable object, %NULL to ignore.
- * @error: a #GError location to store the error occuring, or %NULL to
+ * @error: a #GError location to store the error occurring, or %NULL to
* ignore.
- * @first_property_name: the name of the first property, or %NULL if no properties
+ * @first_property_name: (allow-none): the name of the first property, or %NULL if no
+ * properties
* @...: the value if the first property, followed by and other property
* value pairs, and ended by %NULL.
*
- * Helper function for constructing #GInitiable object. This is
+ * Helper function for constructing #GInitable object. This is
* similar to g_object_new() but also initializes the object
* and returns %NULL, setting an error on failure.
*
- * Return value: a newly allocated #GObject, or %NULL on error
+ * Returns: (type GObject.Object) (transfer full): a newly allocated
+ * #GObject, or %NULL on error
*
* Since: 2.22
- **/
+ */
gpointer
g_initable_new (GType object_type,
GCancellable *cancellable,
@@ -171,19 +155,20 @@ g_initable_new (GType object_type,
* g_initable_newv:
* @object_type: a #GType supporting #GInitable.
* @n_parameters: the number of parameters in @parameters
- * @parameters: the parameters to use to construct the object
+ * @parameters: (array length=n_parameters): the parameters to use to construct the object
* @cancellable: optional #GCancellable object, %NULL to ignore.
- * @error: a #GError location to store the error occuring, or %NULL to
- * ignore.
+ * @error: a #GError location to store the error occurring, or %NULL to
+ * ignore.
*
- * Helper function for constructing #GInitiable object. This is
+ * Helper function for constructing #GInitable object. This is
* similar to g_object_newv() but also initializes the object
* and returns %NULL, setting an error on failure.
*
- * Return value: a newly allocated #GObject, or %NULL on error
+ * Returns: (type GObject.Object) (transfer full): a newly allocated
+ * #GObject, or %NULL on error
*
* Since: 2.22
- **/
+ */
gpointer
g_initable_newv (GType object_type,
guint n_parameters,
@@ -213,17 +198,18 @@ g_initable_newv (GType object_type,
* the value, and other property value pairs, and ended by %NULL.
* @var_args: The var args list generated from @first_property_name.
* @cancellable: optional #GCancellable object, %NULL to ignore.
- * @error: a #GError location to store the error occuring, or %NULL to
- * ignore.
+ * @error: a #GError location to store the error occurring, or %NULL to
+ * ignore.
*
- * Helper function for constructing #GInitiable object. This is
+ * Helper function for constructing #GInitable object. This is
* similar to g_object_new_valist() but also initializes the object
* and returns %NULL, setting an error on failure.
*
- * Return value: a newly allocated #GObject, or %NULL on error
+ * Returns: (type GObject.Object) (transfer full): a newly allocated
+ * #GObject, or %NULL on error
*
* Since: 2.22
- **/
+ */
GObject*
g_initable_new_valist (GType object_type,
const gchar *first_property_name,
@@ -247,6 +233,3 @@ g_initable_new_valist (GType object_type,
return obj;
}
-
-#define __G_INITABLE_C__
-#include "gioaliasdef.c"