luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-18 14:48:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

Some more cosmetics

Browse Source
This commit is contained in:
Matthias Clasen
2010-04-15 12:39:21 -04:00
parent e228a7fb81
commit a469a3d068
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
gio/gsettingsbackend.c
View File

@@ -23,7 +23,6 @@
#include "config.h" #include "config.h"
#define G_SETTINGS_ENABLE_BACKEND
#include "gsettingsbackendinternal.h" #include "gsettingsbackendinternal.h"
#include "gmemorysettingsbackend.h" #include "gmemorysettingsbackend.h"
#include "giomodule-priv.h" #include "giomodule-priv.h"
@@ -100,13 +99,13 @@ struct _GSettingsBackendWatch
}; };
void void
g_settings_backend_watch (GSettingsBackend *backend, g_settings_backend_watch (GSettingsBackend *backend,
GSettingsBackendChangedFunc changed, GSettingsBackendChangedFunc changed,
GSettingsBackendPathChangedFunc path_changed, GSettingsBackendPathChangedFunc path_changed,
GSettingsBackendKeysChangedFunc keys_changed, GSettingsBackendKeysChangedFunc keys_changed,
GSettingsBackendWritableChangedFunc writable_changed, GSettingsBackendWritableChangedFunc writable_changed,
GSettingsBackendPathWritableChangedFunc path_writable_changed, GSettingsBackendPathWritableChangedFunc path_writable_changed,
gpointer user_data) gpointer user_data)
{ {
GSettingsBackendWatch *watch; GSettingsBackendWatch *watch;
@@ -460,7 +459,9 @@ g_settings_backend_changed_tree (GSettingsBackend *backend,
watch->keys_changed (backend, state.prefix, watch->keys_changed (backend, state.prefix,
(const gchar * const *) list, (const gchar * const *) list,
origin_tag, watch->user_data); origin_tag, watch->user_data);
g_free (list); g_free (list);
g_free (state.prefix);
} }
/*< private > /*< private >
@@ -508,8 +509,6 @@ g_settings_backend_read (GSettingsBackend *backend,
* to emit a second "changed" signal (either during this call, or later) * to emit a second "changed" signal (either during this call, or later)
* to indicate that the affected keys have suddenly "changed back" to their * to indicate that the affected keys have suddenly "changed back" to their
* old values. * old values.
*
* Since: 2.26
*/ */
void void
g_settings_backend_write (GSettingsBackend *backend, g_settings_backend_write (GSettingsBackend *backend,
@@ -826,13 +825,11 @@ g_settings_backend_get_with_context (const gchar *context)
static GHashTable *backends; static GHashTable *backends;
GSettingsBackend *backend; GSettingsBackend *backend;
g_return_val_if_fail (context != NULL, NULL);
_g_io_modules_ensure_extension_points_registered (); _g_io_modules_ensure_extension_points_registered ();
G_TYPE_MEMORY_SETTINGS_BACKEND; G_TYPE_MEMORY_SETTINGS_BACKEND;
/* FIXME: hash null properly? */
if (!context)
context = "";
if (!backends) if (!backends)
backends = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); backends = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);