nextstep gsettings backend: whitespace police

This commit is contained in:
William Hua 2012-01-01 21:53:28 -05:00
parent edd2aff575
commit a07e9a5fb2

View File

@ -19,27 +19,17 @@
* Author: William Hua <william@attente.ca> * Author: William Hua <william@attente.ca>
*/ */
#include "gsettingsbackendinternal.h" #include "gsettingsbackendinternal.h"
#include "gsimplepermission.h" #include "gsimplepermission.h"
#include "giomodule.h" #include "giomodule.h"
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#define G_NEXTSTEP_SETTINGS_BACKEND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), g_nextstep_settings_backend_get_type (), GNextstepSettingsBackend)) #define G_NEXTSTEP_SETTINGS_BACKEND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), g_nextstep_settings_backend_get_type (), GNextstepSettingsBackend))
typedef struct _GNextstepSettingsBackend GNextstepSettingsBackend; typedef struct _GNextstepSettingsBackend GNextstepSettingsBackend;
typedef GSettingsBackendClass GNextstepSettingsBackendClass; typedef GSettingsBackendClass GNextstepSettingsBackendClass;
struct _GNextstepSettingsBackend struct _GNextstepSettingsBackend
{ {
GSettingsBackend parent_instance; GSettingsBackend parent_instance;
@ -49,16 +39,12 @@ struct _GNextstepSettingsBackend
GMutex mutex; GMutex mutex;
}; };
G_DEFINE_TYPE_WITH_CODE (GNextstepSettingsBackend, G_DEFINE_TYPE_WITH_CODE (GNextstepSettingsBackend,
g_nextstep_settings_backend, g_nextstep_settings_backend,
G_TYPE_SETTINGS_BACKEND, G_TYPE_SETTINGS_BACKEND,
g_io_extension_point_implement (G_SETTINGS_BACKEND_EXTENSION_POINT_NAME, g_io_extension_point_implement (G_SETTINGS_BACKEND_EXTENSION_POINT_NAME,
g_define_type_id, "nextstep", 90)); g_define_type_id, "nextstep", 90));
static void g_nextstep_settings_backend_finalize (GObject *backend); static void g_nextstep_settings_backend_finalize (GObject *backend);
static GVariant * g_nextstep_settings_backend_read (GSettingsBackend *backend, static GVariant * g_nextstep_settings_backend_read (GSettingsBackend *backend,
@ -102,25 +88,21 @@ static GVariant * g_nextstep_settings_backend_get_g_variant (id
static id g_nextstep_settings_backend_get_ns_object (GVariant *variant); static id g_nextstep_settings_backend_get_ns_object (GVariant *variant);
static void static void
g_nextstep_settings_backend_class_init (GNextstepSettingsBackendClass *class) g_nextstep_settings_backend_class_init (GNextstepSettingsBackendClass *class)
{ {
G_OBJECT_CLASS (class)->finalize = g_nextstep_settings_backend_finalize; G_OBJECT_CLASS (class)->finalize = g_nextstep_settings_backend_finalize;
class->read = g_nextstep_settings_backend_read; class->read = g_nextstep_settings_backend_read;
class->get_writable = g_nextstep_settings_backend_get_writable; class->get_writable = g_nextstep_settings_backend_get_writable;
class->write = g_nextstep_settings_backend_write; class->write = g_nextstep_settings_backend_write;
class->write_tree = g_nextstep_settings_backend_write_tree; class->write_tree = g_nextstep_settings_backend_write_tree;
class->reset = g_nextstep_settings_backend_reset; class->reset = g_nextstep_settings_backend_reset;
class->subscribe = g_nextstep_settings_backend_subscribe; class->subscribe = g_nextstep_settings_backend_subscribe;
class->unsubscribe = g_nextstep_settings_backend_unsubscribe; class->unsubscribe = g_nextstep_settings_backend_unsubscribe;
class->sync = g_nextstep_settings_backend_sync; class->sync = g_nextstep_settings_backend_sync;
class->get_permission = g_nextstep_settings_backend_get_permission; class->get_permission = g_nextstep_settings_backend_get_permission;
} }
static void static void
g_nextstep_settings_backend_init (GNextstepSettingsBackend *self) g_nextstep_settings_backend_init (GNextstepSettingsBackend *self)
{ {
@ -135,8 +117,6 @@ g_nextstep_settings_backend_init (GNextstepSettingsBackend *self)
[pool drain]; [pool drain];
} }
static void static void
g_nextstep_settings_backend_finalize (GObject *self) g_nextstep_settings_backend_finalize (GObject *self)
{ {
@ -154,8 +134,6 @@ g_nextstep_settings_backend_finalize (GObject *self)
G_OBJECT_CLASS (g_nextstep_settings_backend_parent_class)->finalize (self); G_OBJECT_CLASS (g_nextstep_settings_backend_parent_class)->finalize (self);
} }
static GVariant * static GVariant *
g_nextstep_settings_backend_read (GSettingsBackend *backend, g_nextstep_settings_backend_read (GSettingsBackend *backend,
const gchar *key, const gchar *key,
@ -164,15 +142,15 @@ g_nextstep_settings_backend_read (GSettingsBackend *backend,
{ {
GNextstepSettingsBackend *self = G_NEXTSTEP_SETTINGS_BACKEND (backend); GNextstepSettingsBackend *self = G_NEXTSTEP_SETTINGS_BACKEND (backend);
NSAutoreleasePool *pool; NSAutoreleasePool *pool;
NSString *name; NSString *name;
id value; id value;
GVariant *variant; GVariant *variant;
if (default_value) if (default_value)
return NULL; return NULL;
pool = [[NSAutoreleasePool alloc] init]; pool = [[NSAutoreleasePool alloc] init];
name = [NSString stringWithUTF8String:key]; name = [NSString stringWithUTF8String:key];
g_mutex_lock (&self->mutex); g_mutex_lock (&self->mutex);
value = [self->user_defaults objectForKey:name]; value = [self->user_defaults objectForKey:name];
@ -185,8 +163,6 @@ g_nextstep_settings_backend_read (GSettingsBackend *backend,
return variant; return variant;
} }
static gboolean static gboolean
g_nextstep_settings_backend_get_writable (GSettingsBackend *backend, g_nextstep_settings_backend_get_writable (GSettingsBackend *backend,
const gchar *key) const gchar *key)
@ -194,8 +170,6 @@ g_nextstep_settings_backend_get_writable (GSettingsBackend *backend,
return TRUE; return TRUE;
} }
static gboolean static gboolean
g_nextstep_settings_backend_write (GSettingsBackend *backend, g_nextstep_settings_backend_write (GSettingsBackend *backend,
const gchar *key, const gchar *key,
@ -218,8 +192,6 @@ g_nextstep_settings_backend_write (GSettingsBackend *backend,
return TRUE; return TRUE;
} }
static gboolean static gboolean
g_nextstep_settings_backend_write_tree (GSettingsBackend *backend, g_nextstep_settings_backend_write_tree (GSettingsBackend *backend,
GTree *tree, GTree *tree,
@ -240,8 +212,6 @@ g_nextstep_settings_backend_write_tree (GSettingsBackend *backend,
return TRUE; return TRUE;
} }
static void static void
g_nextstep_settings_backend_reset (GSettingsBackend *backend, g_nextstep_settings_backend_reset (GSettingsBackend *backend,
const gchar *key, const gchar *key,
@ -249,10 +219,10 @@ g_nextstep_settings_backend_reset (GSettingsBackend *backend,
{ {
GNextstepSettingsBackend *self = G_NEXTSTEP_SETTINGS_BACKEND (backend); GNextstepSettingsBackend *self = G_NEXTSTEP_SETTINGS_BACKEND (backend);
NSAutoreleasePool *pool; NSAutoreleasePool *pool;
NSString *name; NSString *name;
pool = [[NSAutoreleasePool alloc] init]; pool = [[NSAutoreleasePool alloc] init];
name = [NSString stringWithUTF8String:key]; name = [NSString stringWithUTF8String:key];
g_mutex_lock (&self->mutex); g_mutex_lock (&self->mutex);
[self->user_defaults removeObjectForKey:name]; [self->user_defaults removeObjectForKey:name];
@ -263,24 +233,18 @@ g_nextstep_settings_backend_reset (GSettingsBackend *backend,
[pool drain]; [pool drain];
} }
static void static void
g_nextstep_settings_backend_subscribe (GSettingsBackend *backend, g_nextstep_settings_backend_subscribe (GSettingsBackend *backend,
const gchar *name) const gchar *name)
{ {
} }
static void static void
g_nextstep_settings_backend_unsubscribe (GSettingsBackend *backend, g_nextstep_settings_backend_unsubscribe (GSettingsBackend *backend,
const gchar *name) const gchar *name)
{ {
} }
static void static void
g_nextstep_settings_backend_sync (GSettingsBackend *backend) g_nextstep_settings_backend_sync (GSettingsBackend *backend)
{ {
@ -296,8 +260,6 @@ g_nextstep_settings_backend_sync (GSettingsBackend *backend)
[pool drain]; [pool drain];
} }
static GPermission * static GPermission *
g_nextstep_settings_backend_get_permission (GSettingsBackend *backend, g_nextstep_settings_backend_get_permission (GSettingsBackend *backend,
const gchar *path) const gchar *path)
@ -305,27 +267,23 @@ g_nextstep_settings_backend_get_permission (GSettingsBackend *backend,
return g_simple_permission_new (TRUE); return g_simple_permission_new (TRUE);
} }
static gboolean static gboolean
g_nextstep_settings_backend_write_pair (gpointer name, g_nextstep_settings_backend_write_pair (gpointer name,
gpointer value, gpointer value,
gpointer data) gpointer data)
{ {
GNextstepSettingsBackend *backend = G_NEXTSTEP_SETTINGS_BACKEND (data); GNextstepSettingsBackend *backend = G_NEXTSTEP_SETTINGS_BACKEND (data);
NSString *key; NSString *key;
id object; id object;
key = [NSString stringWithUTF8String:name]; key = [NSString stringWithUTF8String:name];
object = g_nextstep_settings_backend_get_ns_object (value); object = g_nextstep_settings_backend_get_ns_object (value);
[backend->user_defaults setObject:object forKey:key]; [backend->user_defaults setObject:object forKey:key];
return FALSE; return FALSE;
} }
static GVariant * static GVariant *
g_nextstep_settings_backend_get_g_variant (id object, g_nextstep_settings_backend_get_g_variant (id object,
const GVariantType *type) const GVariantType *type)
@ -364,10 +322,10 @@ g_nextstep_settings_backend_get_g_variant (id object,
if (g_variant_type_equal (type, G_VARIANT_TYPE_STRING)) if (g_variant_type_equal (type, G_VARIANT_TYPE_STRING))
return g_variant_new_string (string); return g_variant_new_string (string);
else if (g_variant_type_equal (type, G_VARIANT_TYPE_OBJECT_PATH)) else if (g_variant_type_equal (type, G_VARIANT_TYPE_OBJECT_PATH))
return g_variant_is_object_path (string) ? return g_variant_is_object_path (string) ?
g_variant_new_object_path (string) : NULL; g_variant_new_object_path (string) : NULL;
else if (g_variant_type_equal (type, G_VARIANT_TYPE_SIGNATURE)) else if (g_variant_type_equal (type, G_VARIANT_TYPE_SIGNATURE))
return g_variant_is_signature (string) ? return g_variant_is_signature (string) ?
g_variant_new_signature (string) : NULL; g_variant_new_signature (string) : NULL;
} }
else if ([object isKindOfClass:[NSDictionary class]]) else if ([object isKindOfClass:[NSDictionary class]])
@ -375,8 +333,8 @@ g_nextstep_settings_backend_get_g_variant (id object,
if (g_variant_type_is_subtype_of (type, G_VARIANT_TYPE ("a{s*}"))) if (g_variant_type_is_subtype_of (type, G_VARIANT_TYPE ("a{s*}")))
{ {
const GVariantType *value_type; const GVariantType *value_type;
GVariantBuilder builder; GVariantBuilder builder;
NSString *key; NSString *key;
value_type = g_variant_type_value (g_variant_type_element (type)); value_type = g_variant_type_value (g_variant_type_element (type));
@ -385,12 +343,12 @@ g_nextstep_settings_backend_get_g_variant (id object,
for (key in object) for (key in object)
{ {
GVariant *name; GVariant *name;
id value; id value;
GVariant *variant; GVariant *variant;
GVariant *entry; GVariant *entry;
name = g_variant_new_string ([key UTF8String]); name = g_variant_new_string ([key UTF8String]);
value = [object objectForKey:key]; value = [object objectForKey:key];
variant = g_nextstep_settings_backend_get_g_variant (value, value_type); variant = g_nextstep_settings_backend_get_g_variant (value, value_type);
if (variant == NULL) if (variant == NULL)
@ -412,8 +370,8 @@ g_nextstep_settings_backend_get_g_variant (id object,
if (g_variant_type_is_subtype_of (type, G_VARIANT_TYPE_ARRAY)) if (g_variant_type_is_subtype_of (type, G_VARIANT_TYPE_ARRAY))
{ {
const GVariantType *value_type; const GVariantType *value_type;
GVariantBuilder builder; GVariantBuilder builder;
id value; id value;
value_type = g_variant_type_element (type); value_type = g_variant_type_element (type);
g_variant_builder_init (&builder, type); g_variant_builder_init (&builder, type);
@ -439,8 +397,6 @@ g_nextstep_settings_backend_get_g_variant (id object,
return NULL; return NULL;
} }
static id static id
g_nextstep_settings_backend_get_ns_object (GVariant *variant) g_nextstep_settings_backend_get_ns_object (GVariant *variant)
{ {
@ -475,18 +431,18 @@ g_nextstep_settings_backend_get_ns_object (GVariant *variant)
else if (g_variant_is_of_type (variant, G_VARIANT_TYPE ("a{s*}"))) else if (g_variant_is_of_type (variant, G_VARIANT_TYPE ("a{s*}")))
{ {
NSMutableDictionary *dictionary; NSMutableDictionary *dictionary;
GVariantIter iter; GVariantIter iter;
GVariant *name; GVariant *name;
GVariant *value; GVariant *value;
dictionary = [NSMutableDictionary dictionaryWithCapacity:g_variant_iter_init (&iter, variant)]; dictionary = [NSMutableDictionary dictionaryWithCapacity:g_variant_iter_init (&iter, variant)];
while (g_variant_iter_loop (&iter, "{s*}", &name, &value)) while (g_variant_iter_loop (&iter, "{s*}", &name, &value))
{ {
NSString *key; NSString *key;
id object; id object;
key = [NSString stringWithUTF8String:g_variant_get_string (name, NULL)]; key = [NSString stringWithUTF8String:g_variant_get_string (name, NULL)];
object = g_nextstep_settings_backend_get_ns_object (value); object = g_nextstep_settings_backend_get_ns_object (value);
[dictionary setObject:object forKey:key]; [dictionary setObject:object forKey:key];
@ -497,8 +453,8 @@ g_nextstep_settings_backend_get_ns_object (GVariant *variant)
else if (g_variant_is_of_type (variant, G_VARIANT_TYPE_ARRAY)) else if (g_variant_is_of_type (variant, G_VARIANT_TYPE_ARRAY))
{ {
NSMutableArray *array; NSMutableArray *array;
GVariantIter iter; GVariantIter iter;
GVariant *value; GVariant *value;
array = [NSMutableArray arrayWithCapacity:g_variant_iter_init (&iter, variant)]; array = [NSMutableArray arrayWithCapacity:g_variant_iter_init (&iter, variant)];