projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
doc: improve doc of g_file_equal()
[platform/upstream/glib.git]
/
gio
/
ginitable.h
diff --git
a/gio/ginitable.h
b/gio/ginitable.h
index
5336ad8
..
2c8804b
100644
(file)
--- a/
gio/ginitable.h
+++ b/
gio/ginitable.h
@@
-13,20
+13,18
@@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
* 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 <http://www.gnu.org/licenses/>.
*
* Author: Alexander Larsson <alexl@redhat.com>
*/
*
* Author: Alexander Larsson <alexl@redhat.com>
*/
+#ifndef __G_INITABLE_H__
+#define __G_INITABLE_H__
+
#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
#error "Only <gio/gio.h> can be included directly."
#endif
#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
#error "Only <gio/gio.h> can be included directly."
#endif
-#ifndef __G_INITABLE_H__
-#define __G_INITABLE_H__
-
#include <gio/giotypes.h>
G_BEGIN_DECLS
#include <gio/giotypes.h>
G_BEGIN_DECLS
@@
-51,7
+49,8
@@
typedef struct _GInitableIface GInitableIface;
* @g_iface: The parent interface.
* @init: Initializes the object.
*
* @g_iface: The parent interface.
* @init: Initializes the object.
*
- * Provides an interface for initializing object such that initialization may fail.
+ * Provides an interface for initializing object such that initialization
+ * may fail.
*
* Since: 2.22
**/
*
* Since: 2.22
**/
@@
-67,22
+66,27
@@
struct _GInitableIface
};
};
+GLIB_AVAILABLE_IN_ALL
GType g_initable_get_type (void) G_GNUC_CONST;
GType g_initable_get_type (void) G_GNUC_CONST;
+GLIB_AVAILABLE_IN_ALL
gboolean g_initable_init (GInitable *initable,
GCancellable *cancellable,
GError **error);
gboolean g_initable_init (GInitable *initable,
GCancellable *cancellable,
GError **error);
+GLIB_AVAILABLE_IN_ALL
gpointer g_initable_new (GType object_type,
GCancellable *cancellable,
GError **error,
const gchar *first_property_name,
...);
gpointer g_initable_new (GType object_type,
GCancellable *cancellable,
GError **error,
const gchar *first_property_name,
...);
+GLIB_AVAILABLE_IN_ALL
gpointer g_initable_newv (GType object_type,
guint n_parameters,
GParameter *parameters,
GCancellable *cancellable,
GError **error);
gpointer g_initable_newv (GType object_type,
guint n_parameters,
GParameter *parameters,
GCancellable *cancellable,
GError **error);
+GLIB_AVAILABLE_IN_ALL
GObject* g_initable_new_valist (GType object_type,
const gchar *first_property_name,
va_list var_args,
GObject* g_initable_new_valist (GType object_type,
const gchar *first_property_name,
va_list var_args,