[glib] move GSettings(Backend) to giotypes.h
- From: Ryan Lortie <ryanl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] move GSettings(Backend) to giotypes.h
- Date: Wed, 16 Jun 2010 22:49:21 +0000 (UTC)
commit be8f938b6309afccd85e8f79d5e8c42a1ab11131
Author: Ryan Lortie <desrt desrt ca>
Date: Wed Jun 16 18:49:20 2010 -0400
move GSettings(Backend) to giotypes.h
gio/giotypes.h | 5 ++++-
gio/gsettings.h | 3 +--
gio/gsettingsbackend.h | 2 --
3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/gio/giotypes.h b/gio/giotypes.h
index 980f3e3..c6b0806 100644
--- a/gio/giotypes.h
+++ b/gio/giotypes.h
@@ -43,11 +43,14 @@ typedef struct _GConverter GConverter;
typedef struct _GConverterInputStream GConverterInputStream;
typedef struct _GConverterOutputStream GConverterOutputStream;
typedef struct _GDataInputStream GDataInputStream;
-typedef struct _GPermission GPermission;
typedef struct _GSimplePermission GSimplePermission;
typedef struct _GZlibCompressor GZlibCompressor;
typedef struct _GZlibDecompressor GZlibDecompressor;
+typedef struct _GSettingsBackend GSettingsBackend;
+typedef struct _GSettings GSettings;
+typedef struct _GPermission GPermission;
+
/**
* GDrive:
*
diff --git a/gio/gsettings.h b/gio/gsettings.h
index aad224e..07c0391 100644
--- a/gio/gsettings.h
+++ b/gio/gsettings.h
@@ -26,7 +26,7 @@
#ifndef __G_SETTINGS_H__
#define __G_SETTINGS_H__
-#include <glib-object.h>
+#include <gio/giotypes.h>
G_BEGIN_DECLS
@@ -42,7 +42,6 @@ G_BEGIN_DECLS
typedef struct _GSettingsPrivate GSettingsPrivate;
typedef struct _GSettingsClass GSettingsClass;
-typedef struct _GSettings GSettings;
struct _GSettingsClass
{
diff --git a/gio/gsettingsbackend.h b/gio/gsettingsbackend.h
index 7fdd4e4..47456a3 100644
--- a/gio/gsettingsbackend.h
+++ b/gio/gsettingsbackend.h
@@ -60,8 +60,6 @@ G_BEGIN_DECLS
**/
typedef struct _GSettingsBackendPrivate GSettingsBackendPrivate;
typedef struct _GSettingsBackendClass GSettingsBackendClass;
-typedef struct _GSettingsBackend GSettingsBackend;
-
struct _GSettingsBackendClass
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]