cleanup

[platform/upstream/glib.git] / gio / gsettingsbackendinternal.h

diff --git a/gio/gsettingsbackendinternal.h b/gio/gsettingsbackendinternal.h
index e009b31..eef4c7a 100644 (file)
--- a/gio/gsettingsbackendinternal.h
+++ b/gio/gsettingsbackendinternal.h
@@ -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.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Authors: Ryan Lortie <desrt@desrt.ca>
  *          Matthias Clasen <mclasen@redhat.com>
@@ -39,8 +37,8 @@ typedef struct
   void (* keys_changed)          (GObject             *target,
                                   GSettingsBackend    *backend,
                                   const gchar         *prefix,
-                                  const gchar * const *names,
-                                  gpointer             origin_tag);
+                                  gpointer             origin_tag,
+                                  const gchar * const *names);
   void (* writable_changed)      (GObject             *target,
                                   GSettingsBackend    *backend,
                                   const gchar         *key);
@@ -49,55 +47,48 @@ typedef struct
                                   const gchar         *path);
 } GSettingsListenerVTable;
 
-G_GNUC_INTERNAL
 void                    g_settings_backend_watch                        (GSettingsBackend               *backend,
                                                                          const GSettingsListenerVTable  *vtable,
                                                                          GObject                        *target,
                                                                          GMainContext                   *context);
-G_GNUC_INTERNAL
 void                    g_settings_backend_unwatch                      (GSettingsBackend               *backend,
                                                                          GObject                        *target);
 
-G_GNUC_INTERNAL
 GTree *                 g_settings_backend_create_tree                  (void);
 
-G_GNUC_INTERNAL
 GVariant *              g_settings_backend_read                         (GSettingsBackend               *backend,
                                                                          const gchar                    *key,
                                                                          const GVariantType             *expected_type,
                                                                          gboolean                        default_value);
-G_GNUC_INTERNAL
+GVariant *              g_settings_backend_read_user_value              (GSettingsBackend               *backend,
+                                                                         const gchar                    *key,
+                                                                         const GVariantType             *expected_type);
 gboolean                g_settings_backend_write                        (GSettingsBackend               *backend,
                                                                          const gchar                    *key,
                                                                          GVariant                       *value,
                                                                          gpointer                        origin_tag);
-G_GNUC_INTERNAL
 gboolean                g_settings_backend_write_tree                   (GSettingsBackend               *backend,
                                                                          GTree                          *tree,
                                                                          gpointer                        origin_tag);
-G_GNUC_INTERNAL
 void                    g_settings_backend_reset                        (GSettingsBackend               *backend,
                                                                          const gchar                    *key,
                                                                          gpointer                        origin_tag);
-G_GNUC_INTERNAL
 gboolean                g_settings_backend_get_writable                 (GSettingsBackend               *backend,
                                                                          const char                     *key);
-G_GNUC_INTERNAL
 void                    g_settings_backend_unsubscribe                  (GSettingsBackend               *backend,
                                                                          const char                     *name);
-G_GNUC_INTERNAL
 void                    g_settings_backend_subscribe                    (GSettingsBackend               *backend,
                                                                          const char                     *name);
-G_GNUC_INTERNAL
 GPermission *           g_settings_backend_get_permission               (GSettingsBackend               *backend,
                                                                          const gchar                    *path);
-G_GNUC_INTERNAL
 void                    g_settings_backend_sync_default                 (void);
 
-G_GNUC_INTERNAL
 GType                   g_null_settings_backend_get_type                (void);
 
-G_GNUC_INTERNAL
 GType                   g_memory_settings_backend_get_type              (void);
 
+#ifdef HAVE_COCOA
+GType                   g_nextstep_settings_backend_get_type            (void);
+#endif
+
 #endif  /* __G_SETTINGS_BACKEND_INTERNAL_H__ */