diff options
57 files changed, 237 insertions, 216 deletions
diff --git a/lib/telepathy-glib/base-connection-manager.c b/lib/telepathy-glib/base-connection-manager.c index 8f8ad85a1..db381aafd 100644 --- a/lib/telepathy-glib/base-connection-manager.c +++ b/lib/telepathy-glib/base-connection-manager.c @@ -94,7 +94,7 @@ tp_base_connection_manager_finalize (GObject *object) TpBaseConnectionManagerPrivate *priv = TP_BASE_CONNECTION_MANAGER_GET_PRIVATE (self); - g_hash_table_destroy(priv->connections); + g_hash_table_destroy (priv->connections); G_OBJECT_CLASS (tp_base_connection_manager_parent_class)->finalize (object); } @@ -201,14 +201,14 @@ param_default_value (const TpCMParamSpec *params, int i) GValue *value; value = g_slice_new0 (GValue); - g_value_init(value, params[i].gtype); + g_value_init (value, params[i].gtype); /* TODO: this check could be stricter if we knew whether register was true. In practice REQUIRED and REGISTER always go together in the Gabble params, though */ if (params[i].flags & TP_CONN_MGR_PARAM_FLAG_REQUIRED & TP_CONN_MGR_PARAM_FLAG_REGISTER) { - g_assert(params[i].def == NULL); + g_assert (params[i].def == NULL); goto OUT; } @@ -233,8 +233,8 @@ param_default_value (const TpCMParamSpec *params, int i) g_value_set_boolean (value, GPOINTER_TO_INT (params[i].def)); break; default: - g_error("parameter_defaults: encountered unknown type %s on argument %s", - params[i].dtype, params[i].name); + g_error ("parameter_defaults: encountered unknown type %s on " + "argument %s", params[i].dtype, params[i].name); } OUT: @@ -332,7 +332,7 @@ parse_parameters (const TpCMParamSpec *paramspec, value = g_hash_table_lookup (provided, "register"); if (value != NULL && G_VALUE_TYPE(value) == G_TYPE_BOOLEAN && - g_value_get_boolean(value)) + g_value_get_boolean (value)) { mandatory_flag = TP_CONN_MGR_PARAM_FLAG_REGISTER; } @@ -650,7 +650,7 @@ tp_base_connection_manager_register (TpBaseConnectionManager *self) } static void -service_iface_init(gpointer g_iface, gpointer iface_data) +service_iface_init (gpointer g_iface, gpointer iface_data) { TpSvcConnectionManagerClass *klass = (TpSvcConnectionManagerClass *)g_iface; diff --git a/lib/telepathy-glib/base-connection-manager.h b/lib/telepathy-glib/base-connection-manager.h index 98cfce936..3988a7c9c 100644 --- a/lib/telepathy-glib/base-connection-manager.h +++ b/lib/telepathy-glib/base-connection-manager.h @@ -181,7 +181,7 @@ struct _TpBaseConnectionManager { gpointer priv; }; -GType tp_base_connection_manager_get_type(void); +GType tp_base_connection_manager_get_type (void); /** * tp_base_connection_manager_register: @@ -198,7 +198,7 @@ gboolean tp_base_connection_manager_register (TpBaseConnectionManager *self); /* TYPE MACROS */ #define TP_TYPE_BASE_CONNECTION_MANAGER \ - (tp_base_connection_manager_get_type()) + (tp_base_connection_manager_get_type ()) #define TP_BASE_CONNECTION_MANAGER(obj) \ (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_BASE_CONNECTION_MANAGER, TpBaseConnectionManager)) #define TP_BASE_CONNECTION_MANAGER_CLASS(klass) \ diff --git a/lib/telepathy-glib/base-connection.h b/lib/telepathy-glib/base-connection.h index c5e56a545..18eb6e079 100644 --- a/lib/telepathy-glib/base-connection.h +++ b/lib/telepathy-glib/base-connection.h @@ -243,7 +243,7 @@ struct _TpBaseConnection { gpointer priv; }; -GType tp_base_connection_get_type(void); +GType tp_base_connection_get_type (void); TpHandleRepoIface *tp_base_connection_get_handles (TpBaseConnection *self, TpHandleType handle_type); @@ -265,7 +265,7 @@ void tp_base_connection_dbus_request_handles (TpSvcConnection *iface, /* TYPE MACROS */ #define TP_TYPE_BASE_CONNECTION \ - (tp_base_connection_get_type()) + (tp_base_connection_get_type ()) #define TP_BASE_CONNECTION(obj) \ (G_TYPE_CHECK_INSTANCE_CAST((obj), TP_TYPE_BASE_CONNECTION, \ TpBaseConnection)) @@ -300,7 +300,7 @@ void tp_base_connection_dbus_request_handles (TpSvcConnection *iface, "Connection is disconnected" }; \ \ DEBUG ("rejected request as disconnected"); \ - dbus_g_method_return_error((context), &e); \ + dbus_g_method_return_error ((context), &e); \ return; \ } \ } G_STMT_END diff --git a/lib/telepathy-glib/channel-factory-iface.h b/lib/telepathy-glib/channel-factory-iface.h index 963dde6db..25b13b7d0 100644 --- a/lib/telepathy-glib/channel-factory-iface.h +++ b/lib/telepathy-glib/channel-factory-iface.h @@ -30,7 +30,7 @@ G_BEGIN_DECLS -#define TP_TYPE_CHANNEL_FACTORY_IFACE tp_channel_factory_iface_get_type() +#define TP_TYPE_CHANNEL_FACTORY_IFACE (tp_channel_factory_iface_get_type ()) #define TP_CHANNEL_FACTORY_IFACE(obj) \ (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ diff --git a/lib/telepathy-glib/channel-iface.h b/lib/telepathy-glib/channel-iface.h index 15caa305e..3943b9c78 100644 --- a/lib/telepathy-glib/channel-iface.h +++ b/lib/telepathy-glib/channel-iface.h @@ -26,7 +26,7 @@ G_BEGIN_DECLS -#define TP_TYPE_CHANNEL_IFACE tp_channel_iface_get_type() +#define TP_TYPE_CHANNEL_IFACE (tp_channel_iface_get_type ()) #define TP_CHANNEL_IFACE(obj) \ (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ diff --git a/lib/telepathy-glib/group-mixin.h b/lib/telepathy-glib/group-mixin.h index e5abbb272..1cc786eb6 100644 --- a/lib/telepathy-glib/group-mixin.h +++ b/lib/telepathy-glib/group-mixin.h @@ -133,7 +133,7 @@ struct _TpGroupMixin { /* TYPE MACROS */ #define TP_GROUP_MIXIN_CLASS_OFFSET_QUARK \ - (tp_group_mixin_class_get_offset_quark()) + (tp_group_mixin_class_get_offset_quark ()) #define TP_GROUP_MIXIN_CLASS_OFFSET(o) \ (GPOINTER_TO_UINT (g_type_get_qdata (G_OBJECT_CLASS_TYPE (o), \ TP_GROUP_MIXIN_CLASS_OFFSET_QUARK))) @@ -141,7 +141,7 @@ struct _TpGroupMixin { ((TpGroupMixinClass *) tp_mixin_offset_cast (o, \ TP_GROUP_MIXIN_CLASS_OFFSET (o))) -#define TP_GROUP_MIXIN_OFFSET_QUARK (tp_group_mixin_get_offset_quark()) +#define TP_GROUP_MIXIN_OFFSET_QUARK (tp_group_mixin_get_offset_quark ()) #define TP_GROUP_MIXIN_OFFSET(o) (GPOINTER_TO_UINT (g_type_get_qdata (\ G_OBJECT_TYPE (o), TP_GROUP_MIXIN_OFFSET_QUARK))) #define TP_GROUP_MIXIN(o) ((TpGroupMixin *) tp_mixin_offset_cast (o, \ diff --git a/lib/telepathy-glib/handle-repo-dynamic.c b/lib/telepathy-glib/handle-repo-dynamic.c index 089147c9b..1c4b1451a 100644 --- a/lib/telepathy-glib/handle-repo-dynamic.c +++ b/lib/telepathy-glib/handle-repo-dynamic.c @@ -119,7 +119,7 @@ handle_priv_free (TpHandlePriv *priv) { g_return_if_fail (priv != NULL); - g_free(priv->string); + g_free (priv->string); g_datalist_clear (&(priv->datalist)); #ifdef ENABLE_HANDLE_LEAK_DEBUG g_slist_foreach (priv->traces, handle_leak_trace_free_gfunc, NULL); @@ -265,7 +265,7 @@ tp_dynamic_handle_repo_init (TpDynamicHandleRepo *self) self->next_handle = 1; g_datalist_init (&self->holder_to_handle_set); - self->bus_service_proxy = dbus_g_proxy_new_for_name (tp_get_bus(), + self->bus_service_proxy = dbus_g_proxy_new_for_name (tp_get_bus (), DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS); dbus_g_proxy_add_signal (self->bus_service_proxy, @@ -306,7 +306,7 @@ handle_leak_debug_printbt_foreach (gpointer data, gpointer user_data) HandleLeakTrace *hltrace = (HandleLeakTrace *) data; int i; - printf("\t %s at:\n", handle_leak_describe_event (hltrace->event)); + printf ("\t %s at:\n", handle_leak_describe_event (hltrace->event)); for (i = 1; i < hltrace->len; i++) { diff --git a/lib/telepathy-glib/handle-repo-static.c b/lib/telepathy-glib/handle-repo-static.c index 37f181669..b75f34f9c 100644 --- a/lib/telepathy-glib/handle-repo-static.c +++ b/lib/telepathy-glib/handle-repo-static.c @@ -111,7 +111,7 @@ static_get_property (GObject *object, g_value_set_uint (value, self->handle_type); break; case PROP_HANDLE_NAMES: - g_value_set_boxed (value, g_strdupv(self->handle_names)); + g_value_set_boxed (value, g_strdupv (self->handle_names)); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); @@ -261,7 +261,7 @@ static_lookup_handle (TpHandleRepoIface *irepo, for (i = 0; i < self->last_handle; i++) { - if (!strcmp(self->handle_names[i], id)) + if (!strcmp (self->handle_names[i], id)) return (TpHandle) i + 1; } diff --git a/lib/telepathy-glib/handle-set.c b/lib/telepathy-glib/handle-set.c index 2a01a3304..c9c457596 100644 --- a/lib/telepathy-glib/handle-set.c +++ b/lib/telepathy-glib/handle-set.c @@ -50,7 +50,7 @@ tp_handle_set_new (TpHandleRepoIface *repo) g_assert (repo != NULL); set = g_slice_new0 (TpHandleSet); - set->intset = tp_intset_new(); + set->intset = tp_intset_new (); set->repo = repo; return set; @@ -105,7 +105,7 @@ tp_handle_set_add (TpHandleSet *set, TpHandle handle) g_return_if_fail (set != NULL); g_return_if_fail (handle != 0); - if (!tp_intset_is_member(set->intset, handle)) + if (!tp_intset_is_member (set->intset, handle)) { tp_handle_ref (set->repo, handle); tp_intset_add (set->intset, handle); @@ -129,7 +129,7 @@ tp_handle_set_remove (TpHandleSet *set, TpHandle handle) g_return_val_if_fail (set != NULL, FALSE); g_return_val_if_fail (handle != 0, FALSE); - if (tp_intset_is_member(set->intset, handle)) + if (tp_intset_is_member (set->intset, handle)) { tp_handle_unref (set->repo, handle); tp_intset_remove (set->intset, handle); @@ -152,7 +152,7 @@ tp_handle_set_remove (TpHandleSet *set, TpHandle handle) gboolean tp_handle_set_is_member (TpHandleSet *set, TpHandle handle) { - return tp_intset_is_member(set->intset, handle); + return tp_intset_is_member (set->intset, handle); } typedef struct __foreach_data @@ -163,11 +163,11 @@ typedef struct __foreach_data } _foreach_data; static void -foreach_helper(guint i, gpointer userdata) +foreach_helper (guint i, gpointer userdata) { _foreach_data *data = (_foreach_data*) userdata; - data->func(data->set, i, data->userdata); + data->func (data->set, i, data->userdata); } /** diff --git a/lib/telepathy-glib/internal-debug.h b/lib/telepathy-glib/internal-debug.h index 558ae8b39..b88bcc491 100644 --- a/lib/telepathy-glib/internal-debug.h +++ b/lib/telepathy-glib/internal-debug.h @@ -56,12 +56,12 @@ G_END_DECLS #undef DEBUG #define DEBUG(format, ...) \ - _tp_debug(DEBUG_FLAG, "%s: " format, G_STRFUNC, ##__VA_ARGS__) + _tp_debug (DEBUG_FLAG, "%s: " format, G_STRFUNC, ##__VA_ARGS__) #undef DEBUGGING -#define DEBUGGING _tp_debug_flag_is_set(DEBUG_FLAG) +#define DEBUGGING _tp_debug_flag_is_set (DEBUG_FLAG) -#else /* !defined(ENABLE_DEBUG) */ +#else /* !defined (ENABLE_DEBUG) */ #undef DEBUG #define DEBUG(format, ...) @@ -69,5 +69,5 @@ G_END_DECLS #undef DEBUGGING #define DEBUGGING 0 -#endif /* !defined(ENABLE_DEBUG) */ -#endif /* defined(DEBUG_FLAG) */ +#endif /* !defined (ENABLE_DEBUG) */ +#endif /* defined (DEBUG_FLAG) */ diff --git a/lib/telepathy-glib/intset.c b/lib/telepathy-glib/intset.c index 482dde46d..2215c1653 100644 --- a/lib/telepathy-glib/intset.c +++ b/lib/telepathy-glib/intset.c @@ -142,10 +142,11 @@ tp_intset_add (TpIntSet *set, guint element) if (offset >= set->size) { newsize = ((offset>>DEFAULT_INCREMENT_LOG2) +1 ) << DEFAULT_INCREMENT_LOG2; - set->bits = g_renew(guint32, set->bits, newsize); - memset (set->bits + set->size, 0, sizeof(guint32) * (newsize - set->size)); + set->bits = g_renew (guint32, set->bits, newsize); + memset (set->bits + set->size, 0, + sizeof (guint32) * (newsize - set->size)); set->size = newsize; - g_assert(offset<newsize); + g_assert (offset<newsize); } set->bits[offset] = set->bits[offset] | (1<<(element & 0x1f)); } diff --git a/lib/telepathy-glib/properties-mixin.c b/lib/telepathy-glib/properties-mixin.c index c058373fb..c3d877d60 100644 --- a/lib/telepathy-glib/properties-mixin.c +++ b/lib/telepathy-glib/properties-mixin.c @@ -81,7 +81,8 @@ tp_properties_mixin_class_get_offset_quark () { static GQuark offset_quark = 0; if (!offset_quark) - offset_quark = g_quark_from_static_string("TpPropertiesMixinClassOffsetQuark"); + offset_quark = g_quark_from_static_string ( + "TpPropertiesMixinClassOffsetQuark"); return offset_quark; } @@ -95,7 +96,8 @@ tp_properties_mixin_get_offset_quark () { static GQuark offset_quark = 0; if (!offset_quark) - offset_quark = g_quark_from_static_string("TpPropertiesMixinOffsetQuark"); + offset_quark = g_quark_from_static_string ( + "TpPropertiesMixinOffsetQuark"); return offset_quark; } @@ -1140,7 +1142,7 @@ set_properties (TpSvcPropertiesInterface *iface, * inside the G_DEFINE_TYPE_WITH_CODE macro. */ void -tp_properties_mixin_iface_init(gpointer g_iface, gpointer iface_data) +tp_properties_mixin_iface_init (gpointer g_iface, gpointer iface_data) { TpSvcPropertiesInterfaceClass *klass = (TpSvcPropertiesInterfaceClass *)g_iface; diff --git a/lib/telepathy-glib/properties-mixin.h b/lib/telepathy-glib/properties-mixin.h index 51c41f967..ee3f5ddc3 100644 --- a/lib/telepathy-glib/properties-mixin.h +++ b/lib/telepathy-glib/properties-mixin.h @@ -141,7 +141,7 @@ typedef struct _TpPropertiesMixin TpPropertiesMixin; /* TYPE MACROS */ #define TP_PROPERTIES_MIXIN_CLASS_OFFSET_QUARK \ - (tp_properties_mixin_class_get_offset_quark()) + (tp_properties_mixin_class_get_offset_quark ()) #define TP_PROPERTIES_MIXIN_CLASS_OFFSET(o) \ (GPOINTER_TO_UINT (g_type_get_qdata (G_OBJECT_CLASS_TYPE (o), \ TP_PROPERTIES_MIXIN_CLASS_OFFSET_QUARK))) @@ -150,7 +150,7 @@ typedef struct _TpPropertiesMixin TpPropertiesMixin; TP_PROPERTIES_MIXIN_CLASS_OFFSET (o))) #define TP_PROPERTIES_MIXIN_OFFSET_QUARK \ - (tp_properties_mixin_get_offset_quark()) + (tp_properties_mixin_get_offset_quark ()) #define TP_PROPERTIES_MIXIN_OFFSET(o) \ (GPOINTER_TO_UINT (g_type_get_qdata (G_OBJECT_TYPE (o), \ TP_PROPERTIES_MIXIN_OFFSET_QUARK))) @@ -260,7 +260,7 @@ void tp_properties_mixin_emit_flags (GObject *obj, const TpIntSet *props); gboolean tp_properties_mixin_is_readable (GObject *obj, guint prop_id); gboolean tp_properties_mixin_is_writable (GObject *obj, guint prop_id); -void tp_properties_mixin_iface_init(gpointer g_iface, gpointer iface_data); +void tp_properties_mixin_iface_init (gpointer g_iface, gpointer iface_data); G_END_DECLS diff --git a/lib/telepathy-glib/run.c b/lib/telepathy-glib/run.c index 1f99b4e25..532f3eb31 100644 --- a/lib/telepathy-glib/run.c +++ b/lib/telepathy-glib/run.c @@ -149,7 +149,7 @@ segv_handler (int sig) static void add_signal_handlers (void) { -#if defined(HAVE_SIGNAL) && defined(ENABLE_BACKTRACE) +#if defined (HAVE_SIGNAL) && defined (ENABLE_BACKTRACE) signal (SIGSEGV, segv_handler); #endif /* HAVE_SIGNAL && ENABLE_BACKTRACE */ } @@ -188,9 +188,9 @@ tp_run_connection_manager (const char *prog_name, add_signal_handlers (); - g_type_init(); + g_type_init (); - g_set_prgname(prog_name); + g_set_prgname (prog_name); fatal_mask = g_log_set_always_fatal (G_LOG_FATAL_MASK); fatal_mask |= G_LOG_LEVEL_CRITICAL; @@ -216,7 +216,7 @@ tp_run_connection_manager (const char *prog_name, dbus_g_error_domain_register (TP_ERRORS, "org.freedesktop.Telepathy.Error", TP_TYPE_ERROR); - manager = construct_cm(); + manager = construct_cm (); g_signal_connect (manager, "new-connection", (GCallback) new_connection, NULL); diff --git a/lib/telepathy-glib/text-mixin.c b/lib/telepathy-glib/text-mixin.c index 831e8e8e2..d28425413 100644 --- a/lib/telepathy-glib/text-mixin.c +++ b/lib/telepathy-glib/text-mixin.c @@ -168,7 +168,7 @@ tp_text_mixin_class_get_offset_quark () { static GQuark offset_quark = 0; if (!offset_quark) - offset_quark = g_quark_from_static_string("TpTextMixinClassOffsetQuark"); + offset_quark = g_quark_from_static_string ("TpTextMixinClassOffsetQuark"); return offset_quark; } @@ -184,7 +184,7 @@ tp_text_mixin_get_offset_quark () { static GQuark offset_quark = 0; if (!offset_quark) - offset_quark = g_quark_from_static_string("TpTextMixinOffsetQuark"); + offset_quark = g_quark_from_static_string ("TpTextMixinOffsetQuark"); return offset_quark; } @@ -322,7 +322,7 @@ _pending_get_alloc () static _Allocator alloc = { 0, }; if (0 == alloc.size) - _allocator_init (&alloc, sizeof(_PendingMessage), MAX_PENDING_MESSAGES); + _allocator_init (&alloc, sizeof (_PendingMessage), MAX_PENDING_MESSAGES); return &alloc; } @@ -474,11 +474,11 @@ tp_text_mixin_acknowledge_pending_messages (GObject *obj, _PendingMessage *msg; guint i; - nodes = g_new(GList *, ids->len); + nodes = g_new (GList *, ids->len); for (i = 0; i < ids->len; i++) { - guint id = g_array_index(ids, guint, i); + guint id = g_array_index (ids, guint, i); nodes[i] = g_queue_find_custom (mixin->priv->pending, GINT_TO_POINTER (id), @@ -491,7 +491,7 @@ tp_text_mixin_acknowledge_pending_messages (GObject *obj, g_set_error (error, TP_ERRORS, TP_ERROR_INVALID_ARGUMENT, "invalid message id %u", id); - g_free(nodes); + g_free (nodes); return FALSE; } } @@ -507,7 +507,7 @@ tp_text_mixin_acknowledge_pending_messages (GObject *obj, _pending_free (msg, mixin->priv->contacts_repo); } - g_free(nodes); + g_free (nodes); return TRUE; } diff --git a/lib/telepathy-glib/text-mixin.h b/lib/telepathy-glib/text-mixin.h index 7f06fc833..fb0a7b2ae 100644 --- a/lib/telepathy-glib/text-mixin.h +++ b/lib/telepathy-glib/text-mixin.h @@ -57,11 +57,11 @@ struct _TpTextMixin { }; /* TYPE MACROS */ -#define TP_TEXT_MIXIN_CLASS_OFFSET_QUARK (tp_text_mixin_class_get_offset_quark()) +#define TP_TEXT_MIXIN_CLASS_OFFSET_QUARK (tp_text_mixin_class_get_offset_quark ()) #define TP_TEXT_MIXIN_CLASS_OFFSET(o) (GPOINTER_TO_UINT (g_type_get_qdata (G_OBJECT_CLASS_TYPE (o), TP_TEXT_MIXIN_CLASS_OFFSET_QUARK))) #define TP_TEXT_MIXIN_CLASS(o) ((TpTextMixinClass *) tp_mixin_offset_cast (o, TP_TEXT_MIXIN_CLASS_OFFSET (o))) -#define TP_TEXT_MIXIN_OFFSET_QUARK (tp_text_mixin_get_offset_quark()) +#define TP_TEXT_MIXIN_OFFSET_QUARK (tp_text_mixin_get_offset_quark ()) #define TP_TEXT_MIXIN_OFFSET(o) (GPOINTER_TO_UINT (g_type_get_qdata (G_OBJECT_TYPE (o), TP_TEXT_MIXIN_OFFSET_QUARK))) #define TP_TEXT_MIXIN(o) ((TpTextMixin *) tp_mixin_offset_cast (o, TP_TEXT_MIXIN_OFFSET (o))) diff --git a/lib/telepathy-glib/util.c b/lib/telepathy-glib/util.c index 9947f47a4..fb270856e 100644 --- a/lib/telepathy-glib/util.c +++ b/lib/telepathy-glib/util.c @@ -159,7 +159,7 @@ tp_escape_as_identifier (const gchar *name) GString *op; const gchar *ptr, *first_ok; - g_return_val_if_fail(name != NULL, NULL); + g_return_val_if_fail (name != NULL, NULL); for (ptr = name; *ptr; ptr++) { diff --git a/lib/tests/test-internal-debug.c b/lib/tests/test-internal-debug.c index 90185832a..62163a217 100644 --- a/lib/tests/test-internal-debug.c +++ b/lib/tests/test-internal-debug.c @@ -72,8 +72,8 @@ main (int argc, char **argv) { /* We enable debugging for IM, but not for the connection. */ tp_debug_set_flags_from_string ("im"); - test_debugging(); - test_not_debugging(); - test_debugging_again(); + test_debugging (); + test_not_debugging (); + test_debugging_again (); return 0; } diff --git a/lib/tests/test-intset.c b/lib/tests/test-intset.c index 8f86745fc..3c41d5f38 100644 --- a/lib/tests/test-intset.c +++ b/lib/tests/test-intset.c @@ -3,7 +3,7 @@ int main (int argc, char **argv) { - TpIntSet *set1 = tp_intset_new(); + TpIntSet *set1 = tp_intset_new (); TpIntSet *a, *b; TpIntSet *ab_union, *ab_expected_union; TpIntSet *ab_inter, *ab_expected_inter; @@ -11,31 +11,31 @@ int main (int argc, char **argv) TpIntSet *b_diff_a, *b_expected_diff_a; TpIntSet *ab_symmdiff, *ab_expected_symmdiff; - tp_intset_add(set1, 0); + tp_intset_add (set1, 0); - tp_intset_add(set1, 2); - tp_intset_add(set1, 3); - tp_intset_add(set1, 5); - tp_intset_add(set1, 8); + tp_intset_add (set1, 2); + tp_intset_add (set1, 3); + tp_intset_add (set1, 5); + tp_intset_add (set1, 8); - tp_intset_add(set1, 1024); - tp_intset_add(set1, 32); + tp_intset_add (set1, 1024); + tp_intset_add (set1, 32); - g_assert(tp_intset_size(set1) == 7); + g_assert (tp_intset_size (set1) == 7); - g_assert(tp_intset_is_member(set1, 2)); - g_assert(tp_intset_is_member(set1, 5)); - g_assert(tp_intset_is_member(set1, 1024)); - g_assert(!tp_intset_is_member(set1, 1023)); - g_assert(!tp_intset_is_member(set1, 1025)); - g_assert(tp_intset_is_member(set1, 0)); - g_assert(tp_intset_is_member(set1, 32)); - g_assert(!tp_intset_is_member(set1, 31)); - g_assert(!tp_intset_is_member(set1, 33)); + g_assert (tp_intset_is_member (set1, 2)); + g_assert (tp_intset_is_member (set1, 5)); + g_assert (tp_intset_is_member (set1, 1024)); + g_assert (!tp_intset_is_member (set1, 1023)); + g_assert (!tp_intset_is_member (set1, 1025)); + g_assert (tp_intset_is_member (set1, 0)); + g_assert (tp_intset_is_member (set1, 32)); + g_assert (!tp_intset_is_member (set1, 31)); + g_assert (!tp_intset_is_member (set1, 33)); - tp_intset_remove(set1, 8); - tp_intset_remove(set1, 1024); - g_assert(tp_intset_size(set1) == 5); + tp_intset_remove (set1, 8); + tp_intset_remove (set1, 1024); + g_assert (tp_intset_size (set1) == 5); #define NUM_A 11 #define NUM_B 823 diff --git a/lib/tests/test-util.c b/lib/tests/test-util.c index e3aeb815f..db1d74480 100644 --- a/lib/tests/test-util.c +++ b/lib/tests/test-util.c @@ -9,15 +9,15 @@ int main (int argc, char **argv) GPtrArray *ptrarray; gchar *string; - puts("Testing tp_strdiff..."); + puts ("Testing tp_strdiff..."); g_assert (!tp_strdiff (NULL, NULL)); g_assert (tp_strdiff ("badger", NULL)); g_assert (tp_strdiff (NULL, "badger")); g_assert (!tp_strdiff ("badger", "badger")); g_assert (tp_strdiff ("badger", "mushroom")); - puts("... OK"); + puts ("... OK"); - puts("Testing tp_g_ptr_array_contains..."); + puts ("Testing tp_g_ptr_array_contains..."); ptrarray = g_ptr_array_new (); g_ptr_array_add (ptrarray, GINT_TO_POINTER (23)); g_ptr_array_add (ptrarray, GINT_TO_POINTER (42)); @@ -25,9 +25,9 @@ int main (int argc, char **argv) g_assert (tp_g_ptr_array_contains (ptrarray, GINT_TO_POINTER (42))); g_assert (!tp_g_ptr_array_contains (ptrarray, GINT_TO_POINTER (666))); g_ptr_array_free (ptrarray, TRUE); - puts("... OK"); + puts ("... OK"); - puts("Testing tp_escape_as_identifier..."); + puts ("Testing tp_escape_as_identifier..."); string = tp_escape_as_identifier (""); g_assert (!tp_strdiff (string, "")); g_free (string); @@ -37,7 +37,7 @@ int main (int argc, char **argv) string = tp_escape_as_identifier ("0123abc_xyz\x01\xff"); g_assert (!tp_strdiff (string, "_30123abc_5fxyz_01_ff")); g_free (string); - puts("... OK"); + puts ("... OK"); return 0; } diff --git a/src/base64.c b/src/base64.c index 9950d9148..fbfcb6349 100644 --- a/src/base64.c +++ b/src/base64.c @@ -140,7 +140,7 @@ GString *base64_decode (const gchar *str) { if (str[i] != 'A' && str[i] != '=' && - !isspace(str[i]) && + !isspace (str[i]) && decoding[(guchar) str[i]] == 0) { DEBUG ("bad character %x at byte %u", (guchar)str[i], i); @@ -152,7 +152,7 @@ GString *base64_decode (const gchar *str) for (i = 0; str[i]; i++) { - if (isspace(str[i])) + if (isspace (str[i])) continue; group[filled++] = str[i]; diff --git a/src/conn-avatars.c b/src/conn-avatars.c index 7fba9f094..f4f5989d8 100644 --- a/src/conn-avatars.c +++ b/src/conn-avatars.c @@ -161,7 +161,7 @@ _got_self_avatar_for_get_avatar_tokens (GObject *obj, g_signal_handler_disconnect (obj, context->signal_conn); g_free (context->ret[context->my_index]); - context->ret[context->my_index] = g_strdup(sha1); + context->ret[context->my_index] = g_strdup (sha1); /* FIXME: I'm not entirely sure why gcc warns without this cast from * (gchar **) to (const gchar **) */ diff --git a/src/conn-presence.c b/src/conn-presence.c index 771cbff93..996562373 100644 --- a/src/conn-presence.c +++ b/src/conn-presence.c @@ -382,7 +382,7 @@ gabble_connection_get_statuses (TpSvcConnectionInterfacePresence *iface, g_value_init (g_value_array_get_nth (status, 3), DBUS_TYPE_G_STRING_STRING_HASHTABLE); g_value_set_static_boxed (g_value_array_get_nth (status, 3), - get_statuses_arguments()); + get_statuses_arguments ()); g_hash_table_insert (ret, (gchar*) gabble_statuses[i].name, status); } diff --git a/src/debug.h b/src/debug.h index 6c6b9aab6..522d1d715 100644 --- a/src/debug.h +++ b/src/debug.h @@ -39,9 +39,9 @@ G_END_DECLS #ifdef DEBUG_FLAG #define DEBUG(format, ...) \ - gabble_debug(DEBUG_FLAG, "%s: " format, G_STRFUNC, ##__VA_ARGS__) + gabble_debug (DEBUG_FLAG, "%s: " format, G_STRFUNC, ##__VA_ARGS__) -#define DEBUGGING gabble_debug_flag_is_set(DEBUG_FLAG) +#define DEBUGGING gabble_debug_flag_is_set (DEBUG_FLAG) #define NODE_DEBUG(n, s) \ G_STMT_START { \ diff --git a/src/disco.h b/src/disco.h index 82a1adee0..334f8b85e 100644 --- a/src/disco.h +++ b/src/disco.h @@ -56,11 +56,11 @@ typedef enum GQuark gabble_disco_error_quark (void); #define GABBLE_DISCO_ERROR gabble_disco_error_quark () -GType gabble_disco_get_type(void); +GType gabble_disco_get_type (void); /* TYPE MACROS */ #define GABBLE_TYPE_DISCO \ - (gabble_disco_get_type()) + (gabble_disco_get_type ()) #define GABBLE_DISCO(obj) \ (G_TYPE_CHECK_INSTANCE_CAST((obj), GABBLE_TYPE_DISCO, GabbleDisco)) #define GABBLE_DISCO_CLASS(klass) \ diff --git a/src/gabble-connection-manager.h b/src/gabble-connection-manager.h index b7bff74d7..5365ab13b 100644 --- a/src/gabble-connection-manager.h +++ b/src/gabble-connection-manager.h @@ -41,11 +41,11 @@ struct _GabbleConnectionManager { extern const TpCMProtocolSpec gabble_protocols[]; -GType gabble_connection_manager_get_type(void); +GType gabble_connection_manager_get_type (void); /* TYPE MACROS */ #define GABBLE_TYPE_CONNECTION_MANAGER \ - (gabble_connection_manager_get_type()) + (gabble_connection_manager_get_type ()) #define GABBLE_CONNECTION_MANAGER(obj) \ (G_TYPE_CHECK_INSTANCE_CAST((obj), GABBLE_TYPE_CONNECTION_MANAGER, \ GabbleConnectionManager)) diff --git a/src/gabble-connection.c b/src/gabble-connection.c index 4135b3314..ce9adc17f 100644 --- a/src/gabble-connection.c +++ b/src/gabble-connection.c @@ -79,8 +79,8 @@ ("GValueArray", G_TYPE_UINT, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_UINT, \ G_TYPE_INVALID)) -static void conn_service_iface_init(gpointer, gpointer); -static void capabilities_service_iface_init(gpointer, gpointer); +static void conn_service_iface_init (gpointer, gpointer); +static void capabilities_service_iface_init (gpointer, gpointer); G_DEFINE_TYPE_WITH_CODE(GabbleConnection, gabble_connection, @@ -1591,7 +1591,7 @@ connection_iq_disco_cb (LmMessageHandler *handler, if (node && ( 0 != strncmp (node, NS_GABBLE_CAPS "#", strlen (NS_GABBLE_CAPS) + 1) || - strlen(node) < strlen (NS_GABBLE_CAPS) + 2)) + strlen (node) < strlen (NS_GABBLE_CAPS) + 2)) { NODE_DEBUG (iq, "got iq disco query with unexpected node attribute"); return LM_HANDLER_RESULT_ALLOW_MORE_HANDLERS; @@ -1613,7 +1613,7 @@ connection_iq_disco_cb (LmMessageHandler *handler, DEBUG ("got disco request for bundle %s, caps are %x", node, self->self_presence->caps); features = capabilities_get_features (self->self_presence->caps); - g_debug("%s: caps now %u", G_STRFUNC, self->self_presence->caps); + g_debug ("%s: caps now %u", G_STRFUNC, self->self_presence->caps); for (i = features; NULL != i; i = i->next) { @@ -1756,7 +1756,7 @@ connection_ssl_cb (LmSSL *lmssl, tp_reason = TP_CONNECTION_STATUS_REASON_CERT_OTHER_ERROR; break; default: - g_assert_not_reached(); + g_assert_not_reached (); reason = "Unknown SSL error code from Loudmouth."; tp_reason = TP_CONNECTION_STATUS_REASON_ENCRYPTION_ERROR; break; @@ -2454,7 +2454,7 @@ room_verify_batch_free (RoomVerifyBatch *batch) g_array_free (batch->handles, TRUE); for (i = 0; i < batch->count; i++) { - g_free(batch->contexts[i].jid); + g_free (batch->contexts[i].jid); } g_free (batch->contexts); g_slice_free (RoomVerifyBatch, batch); @@ -2474,7 +2474,7 @@ room_verify_batch_raise_error (RoomVerifyBatch *batch, { if (batch->contexts[i].request) { - gabble_disco_cancel_request(batch->conn->disco, + gabble_disco_cancel_request (batch->conn->disco, batch->contexts[i].request); } } @@ -2497,7 +2497,7 @@ room_verify_batch_new (GabbleConnection *conn, batch->conn = conn; batch->invocation = invocation; batch->count = count; - batch->handles = g_array_sized_new(FALSE, FALSE, sizeof(TpHandle), count); + batch->handles = g_array_sized_new (FALSE, FALSE, sizeof (TpHandle), count); batch->contexts = g_new0(RoomVerifyContext, count); for (i = 0; i < count; i++) { @@ -2546,7 +2546,7 @@ room_verify_batch_try_return (RoomVerifyBatch *batch) for (i = 0; i < batch->count; i++) { - if (!g_array_index(batch->handles, TpHandle, i)) + if (!g_array_index (batch->handles, TpHandle, i)) { /* we're not ready yet */ return FALSE; @@ -2765,7 +2765,7 @@ gabble_connection_request_handles (TpSvcConnection *iface, /* We reimplement RequestHandles to be able to do async validation on * room handles */ static void -conn_service_iface_init(gpointer g_iface, gpointer iface_data) +conn_service_iface_init (gpointer g_iface, gpointer iface_data) { TpSvcConnectionClass *klass = (TpSvcConnectionClass *)g_iface; @@ -2776,7 +2776,7 @@ conn_service_iface_init(gpointer g_iface, gpointer iface_data) } static void -capabilities_service_iface_init(gpointer g_iface, gpointer iface_data) +capabilities_service_iface_init (gpointer g_iface, gpointer iface_data) { TpSvcConnectionInterfaceCapabilitiesClass *klass = (TpSvcConnectionInterfaceCapabilitiesClass *)g_iface; diff --git a/src/gabble-connection.h b/src/gabble-connection.h index 78934e0f1..d844c13fb 100644 --- a/src/gabble-connection.h +++ b/src/gabble-connection.h @@ -130,11 +130,11 @@ typedef enum { GABBLE_CONNECTION_ALIAS_FROM_ROSTER } GabbleConnectionAliasSource; -GType gabble_connection_get_type(void); +GType gabble_connection_get_type (void); /* TYPE MACROS */ #define GABBLE_TYPE_CONNECTION \ - (gabble_connection_get_type()) + (gabble_connection_get_type ()) #define GABBLE_CONNECTION(obj) \ (G_TYPE_CHECK_INSTANCE_CAST((obj), GABBLE_TYPE_CONNECTION, GabbleConnection)) #define GABBLE_CONNECTION_CLASS(klass) \ diff --git a/src/gabble-im-channel.c b/src/gabble-im-channel.c index 35ca54b38..714adbf62 100644 --- a/src/gabble-im-channel.c +++ b/src/gabble-im-channel.c @@ -564,7 +564,7 @@ gabble_im_channel_set_chat_state (TpSvcChannelInterfaceChatState *iface, } static void -channel_iface_init(gpointer g_iface, gpointer iface_data) +channel_iface_init (gpointer g_iface, gpointer iface_data) { TpSvcChannelClass *klass = (TpSvcChannelClass *)g_iface; @@ -578,7 +578,7 @@ channel_iface_init(gpointer g_iface, gpointer iface_data) } static void -text_iface_init(gpointer g_iface, gpointer iface_data) +text_iface_init (gpointer g_iface, gpointer iface_data) { TpSvcChannelTypeTextClass *klass = (TpSvcChannelTypeTextClass *)g_iface; @@ -590,7 +590,7 @@ text_iface_init(gpointer g_iface, gpointer iface_data) } static void -chat_state_iface_init(gpointer g_iface, gpointer iface_data) +chat_state_iface_init (gpointer g_iface, gpointer iface_data) { TpSvcChannelInterfaceChatStateClass *klass = (TpSvcChannelInterfaceChatStateClass *)g_iface; #define IMPLEMENT(x) tp_svc_channel_interface_chat_state_implement_##x (\ diff --git a/src/gabble-im-channel.h b/src/gabble-im-channel.h index 7947ec154..8be680f4b 100644 --- a/src/gabble-im-channel.h +++ b/src/gabble-im-channel.h @@ -46,11 +46,11 @@ struct _GabbleIMChannel { gpointer priv; }; -GType gabble_im_channel_get_type(void); +GType gabble_im_channel_get_type (void); /* TYPE MACROS */ #define GABBLE_TYPE_IM_CHANNEL \ - (gabble_im_channel_get_type()) + (gabble_im_channel_get_type ()) #define GABBLE_IM_CHANNEL(obj) \ (G_TYPE_CHECK_INSTANCE_CAST((obj), GABBLE_TYPE_IM_CHANNEL, GabbleIMChannel)) #define GABBLE_IM_CHANNEL_CLASS(klass) \ diff --git a/src/gabble-media-channel.c b/src/gabble-media-channel.c index 92f3856c5..e05a01a00 100644 --- a/src/gabble-media-channel.c +++ b/src/gabble-media-channel.c @@ -1414,7 +1414,7 @@ _gabble_media_channel_caps_to_typeflags (GabblePresenceCapabilities caps) static void -channel_iface_init(gpointer g_iface, gpointer iface_data) +channel_iface_init (gpointer g_iface, gpointer iface_data) { TpSvcChannelClass *klass = (TpSvcChannelClass *)g_iface; @@ -1428,7 +1428,7 @@ channel_iface_init(gpointer g_iface, gpointer iface_data) } static void -streamed_media_iface_init(gpointer g_iface, gpointer iface_data) +streamed_media_iface_init (gpointer g_iface, gpointer iface_data) { TpSvcChannelTypeStreamedMediaClass *klass = (TpSvcChannelTypeStreamedMediaClass *)g_iface; @@ -1442,7 +1442,7 @@ streamed_media_iface_init(gpointer g_iface, gpointer iface_data) } static void -media_signalling_iface_init(gpointer g_iface, gpointer iface_data) +media_signalling_iface_init (gpointer g_iface, gpointer iface_data) { TpSvcChannelInterfaceMediaSignallingClass *klass = (TpSvcChannelInterfaceMediaSignallingClass *)g_iface; diff --git a/src/gabble-media-channel.h b/src/gabble-media-channel.h index 690a0542f..af3088149 100644 --- a/src/gabble-media-channel.h +++ b/src/gabble-media-channel.h @@ -51,21 +51,24 @@ struct _GabbleMediaChannel { gpointer priv; }; -GType gabble_media_channel_get_type(void); +GType gabble_media_channel_get_type (void); /* TYPE MACROS */ #define GABBLE_TYPE_MEDIA_CHANNEL \ - (gabble_media_channel_get_type()) + (gabble_media_channel_get_type ()) #define GABBLE_MEDIA_CHANNEL(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj), GABBLE_TYPE_MEDIA_CHANNEL, GabbleMediaChannel)) + (G_TYPE_CHECK_INSTANCE_CAST((obj), GABBLE_TYPE_MEDIA_CHANNEL,\ + GabbleMediaChannel)) #define GABBLE_MEDIA_CHANNEL_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass), GABBLE_TYPE_MEDIA_CHANNEL, GabbleMediaChannelClass)) + (G_TYPE_CHECK_CLASS_CAST((klass), GABBLE_TYPE_MEDIA_CHANNEL,\ + GabbleMediaChannelClass)) #define GABBLE_IS_MEDIA_CHANNEL(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj), GABBLE_TYPE_MEDIA_CHANNEL)) #define GABBLE_IS_MEDIA_CHANNEL_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass), GABBLE_TYPE_MEDIA_CHANNEL)) #define GABBLE_MEDIA_CHANNEL_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), GABBLE_TYPE_MEDIA_CHANNEL, GabbleMediaChannelClass)) + (G_TYPE_INSTANCE_GET_CLASS ((obj), GABBLE_TYPE_MEDIA_CHANNEL, \ + GabbleMediaChannelClass)) gboolean _gabble_media_channel_add_member (GObject *obj, diff --git a/src/gabble-media-session.h b/src/gabble-media-session.h index 1da29e493..82303b464 100644 --- a/src/gabble-media-session.h +++ b/src/gabble-media-session.h @@ -69,21 +69,24 @@ struct _GabbleMediaSession { gpointer priv; }; -GType gabble_media_session_get_type(void); +GType gabble_media_session_get_type (void); /* TYPE MACROS */ #define GABBLE_TYPE_MEDIA_SESSION \ - (gabble_media_session_get_type()) + (gabble_media_session_get_type ()) #define GABBLE_MEDIA_SESSION(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj), GABBLE_TYPE_MEDIA_SESSION, GabbleMediaSession)) + (G_TYPE_CHECK_INSTANCE_CAST((obj), GABBLE_TYPE_MEDIA_SESSION, \ + GabbleMediaSession)) #define GABBLE_MEDIA_SESSION_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass), GABBLE_TYPE_MEDIA_SESSION, GabbleMediaSessionClass)) + (G_TYPE_CHECK_CLASS_CAST((klass), GABBLE_TYPE_MEDIA_SESSION, \ + GabbleMediaSessionClass)) #define GABBLE_IS_MEDIA_SESSION(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj), GABBLE_TYPE_MEDIA_SESSION)) #define GABBLE_IS_MEDIA_SESSION_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass), GABBLE_TYPE_MEDIA_SESSION)) #define GABBLE_MEDIA_SESSION_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), GABBLE_TYPE_MEDIA_SESSION, GabbleMediaSessionClass)) + (G_TYPE_INSTANCE_GET_CLASS ((obj), GABBLE_TYPE_MEDIA_SESSION, \ + GabbleMediaSessionClass)) /* CONVENIENCE MACROS */ #define MSG_REPLY_CB_END_SESSION_IF_NOT_SUCCESSFUL(s, m) \ @@ -93,7 +96,8 @@ GType gabble_media_session_get_type(void); GMS_DEBUG_ERROR (s, m); \ NODE_DEBUG (sent_msg->node, "message sent"); \ NODE_DEBUG (reply_msg->node, "message reply"); \ - _gabble_media_session_terminate (s, INITIATOR_LOCAL, TP_CHANNEL_GROUP_CHANGE_REASON_ERROR); \ + _gabble_media_session_terminate (s, INITIATOR_LOCAL, \ + TP_CHANNEL_GROUP_CHANGE_REASON_ERROR); \ return LM_HANDLER_RESULT_REMOVE_MESSAGE; \ } \ } G_STMT_END diff --git a/src/gabble-media-stream.c b/src/gabble-media-stream.c index dc719cc7d..82fc29d9a 100644 --- a/src/gabble-media-stream.c +++ b/src/gabble-media-stream.c @@ -368,7 +368,7 @@ gabble_media_stream_class_init (GabbleMediaStreamClass *gabble_media_stream_clas param_spec = g_param_spec_enum ("mode", "Signalling mode", "Which signalling mode used to control the " "stream.", - gabble_media_session_mode_get_type(), + gabble_media_session_mode_get_type (), MODE_JINGLE, G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | @@ -1121,7 +1121,7 @@ _gabble_media_stream_post_remote_codecs (GabbleMediaStream *stream, return FALSE; } - id = atoi(str); + id = atoi (str); /* codec name */ name = lm_message_node_get_attribute (node, "name"); diff --git a/src/gabble-media-stream.h b/src/gabble-media-stream.h index 48bec3993..fc96b8b2b 100644 --- a/src/gabble-media-stream.h +++ b/src/gabble-media-stream.h @@ -62,21 +62,24 @@ struct _GabbleMediaStream { gpointer priv; }; -GType gabble_media_stream_get_type(void); +GType gabble_media_stream_get_type (void); /* TYPE MACROS */ #define GABBLE_TYPE_MEDIA_STREAM \ - (gabble_media_stream_get_type()) + (gabble_media_stream_get_type ()) #define GABBLE_MEDIA_STREAM(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj), GABBLE_TYPE_MEDIA_STREAM, GabbleMediaStream)) + (G_TYPE_CHECK_INSTANCE_CAST((obj), GABBLE_TYPE_MEDIA_STREAM, \ + GabbleMediaStream)) #define GABBLE_MEDIA_STREAM_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass), GABBLE_TYPE_MEDIA_STREAM, GabbleMediaStreamClass)) + (G_TYPE_CHECK_CLASS_CAST((klass), GABBLE_TYPE_MEDIA_STREAM, \ + GabbleMediaStreamClass)) #define GABBLE_IS_MEDIA_STREAM(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj), GABBLE_TYPE_MEDIA_STREAM)) #define GABBLE_IS_MEDIA_STREAM_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass), GABBLE_TYPE_MEDIA_STREAM)) #define GABBLE_MEDIA_STREAM_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), GABBLE_TYPE_MEDIA_STREAM, GabbleMediaStreamClass)) + (G_TYPE_INSTANCE_GET_CLASS ((obj), GABBLE_TYPE_MEDIA_STREAM, \ + GabbleMediaStreamClass)) #define TP_TYPE_TRANSPORT_STRUCT (dbus_g_type_get_struct ("GValueArray", \ G_TYPE_UINT, \ @@ -121,12 +124,19 @@ gboolean gabble_media_stream_error (GabbleMediaStream *self, guint errno, const gchar *message, GError **error); void _gabble_media_stream_close (GabbleMediaStream *close); -gboolean _gabble_media_stream_post_remote_codecs (GabbleMediaStream *stream, LmMessage *message, LmMessageNode *desc_node, GError **error); -gboolean _gabble_media_stream_post_remote_candidates (GabbleMediaStream *stream, LmMessage *message, LmMessageNode *transport_node, GError **error); -LmMessageNode *_gabble_media_stream_add_content_node (GabbleMediaStream *stream, LmMessageNode *session_node); -void _gabble_media_stream_content_node_add_description (GabbleMediaStream *stream, LmMessageNode *content_node); -LmMessageNode *_gabble_media_stream_content_node_add_transport (GabbleMediaStream *stream, LmMessageNode *content_node); -void _gabble_media_stream_update_sending (GabbleMediaStream *stream, gboolean start_sending); +gboolean _gabble_media_stream_post_remote_codecs (GabbleMediaStream *stream, + LmMessage *message, LmMessageNode *desc_node, GError **error); +gboolean _gabble_media_stream_post_remote_candidates ( + GabbleMediaStream *stream, LmMessage *message, + LmMessageNode *transport_node, GError **error); +LmMessageNode *_gabble_media_stream_add_content_node ( + GabbleMediaStream *stream, LmMessageNode *session_node); +void _gabble_media_stream_content_node_add_description ( + GabbleMediaStream *stream, LmMessageNode *content_node); +LmMessageNode *_gabble_media_stream_content_node_add_transport ( + GabbleMediaStream *stream, LmMessageNode *content_node); +void _gabble_media_stream_update_sending (GabbleMediaStream *stream, + gboolean start_sending); G_END_DECLS diff --git a/src/gabble-muc-channel.c b/src/gabble-muc-channel.c index aacd24452..8217a3491 100644 --- a/src/gabble-muc-channel.c +++ b/src/gabble-muc-channel.c @@ -1931,8 +1931,9 @@ _gabble_muc_channel_handle_invited (GabbleMucChannel *chan, /* queue the message */ if (message && (message[0] != '\0')) { - tp_text_mixin_receive (G_OBJECT (chan), TP_CHANNEL_TEXT_MESSAGE_TYPE_NOTICE, inviter, - time(NULL), message); + tp_text_mixin_receive (G_OBJECT (chan), + TP_CHANNEL_TEXT_MESSAGE_TYPE_NOTICE, inviter, + time (NULL), message); } /* emit READY signal so NewChannel is emitted */ @@ -2754,7 +2755,7 @@ gabble_muc_channel_set_chat_state (TpSvcChannelInterfaceChatState *iface, } static void -channel_iface_init(gpointer g_iface, gpointer iface_data) +channel_iface_init (gpointer g_iface, gpointer iface_data) { TpSvcChannelClass *klass = (TpSvcChannelClass *)g_iface; @@ -2768,7 +2769,7 @@ channel_iface_init(gpointer g_iface, gpointer iface_data) } static void -text_iface_init(gpointer g_iface, gpointer iface_data) +text_iface_init (gpointer g_iface, gpointer iface_data) { TpSvcChannelTypeTextClass *klass = (TpSvcChannelTypeTextClass *)g_iface; @@ -2780,7 +2781,7 @@ text_iface_init(gpointer g_iface, gpointer iface_data) } static void -password_iface_init(gpointer g_iface, gpointer iface_data) +password_iface_init (gpointer g_iface, gpointer iface_data) { TpSvcChannelInterfacePasswordClass *klass = (TpSvcChannelInterfacePasswordClass *)g_iface; @@ -2793,7 +2794,7 @@ password_iface_init(gpointer g_iface, gpointer iface_data) } static void -chat_state_iface_init(gpointer g_iface, gpointer iface_data) +chat_state_iface_init (gpointer g_iface, gpointer iface_data) { TpSvcChannelInterfaceChatStateClass *klass = (TpSvcChannelInterfaceChatStateClass *)g_iface; diff --git a/src/gabble-muc-channel.h b/src/gabble-muc-channel.h index 2575b9c9e..62da01932 100644 --- a/src/gabble-muc-channel.h +++ b/src/gabble-muc-channel.h @@ -52,11 +52,11 @@ struct _GabbleMucChannel { gpointer priv; }; -GType gabble_muc_channel_get_type(void); +GType gabble_muc_channel_get_type (void); /* TYPE MACROS */ #define GABBLE_TYPE_MUC_CHANNEL \ - (gabble_muc_channel_get_type()) + (gabble_muc_channel_get_type ()) #define GABBLE_MUC_CHANNEL(obj) \ (G_TYPE_CHECK_INSTANCE_CAST((obj), GABBLE_TYPE_MUC_CHANNEL, GabbleMucChannel)) #define GABBLE_MUC_CHANNEL_CLASS(klass) \ diff --git a/src/gabble-register.c b/src/gabble-register.c index 8e05dae09..991b4a35b 100644 --- a/src/gabble-register.c +++ b/src/gabble-register.c @@ -302,16 +302,16 @@ nokia_iv_get_reply_cb (GabbleConnection *conn, for (i = 0; i < strlen (challenge); i++) challenge[i] = tolower (challenge[i]); - md5_init(&calculator); - md5_append(&calculator, (const md5_byte_t *)auth_btid, - strlen(auth_btid)); - md5_append(&calculator, (const md5_byte_t *)":", 1); - md5_append(&calculator, (const md5_byte_t *)challenge, strlen(challenge)); - md5_finish(&calculator, digest); + md5_init (&calculator); + md5_append (&calculator, (const md5_byte_t *)auth_btid, + strlen (auth_btid)); + md5_append (&calculator, (const md5_byte_t *)":", 1); + md5_append (&calculator, (const md5_byte_t *)challenge, strlen (challenge)); + md5_finish (&calculator, digest); for (i = 0; i < 16; i++) { - sprintf(response + i*2, "%02x",digest[i]); + sprintf (response + i*2, "%02x",digest[i]); } lm_message_node_add_child (query_node, "mac", auth_mac); diff --git a/src/gabble-register.h b/src/gabble-register.h index e413b46c9..119f56b68 100644 --- a/src/gabble-register.h +++ b/src/gabble-register.h @@ -31,11 +31,11 @@ G_BEGIN_DECLS typedef struct _GabbleRegister GabbleRegister; typedef struct _GabbleRegisterClass GabbleRegisterClass; -GType gabble_register_get_type(void); +GType gabble_register_get_type (void); /* TYPE MACROS */ #define GABBLE_TYPE_REGISTER \ - (gabble_register_get_type()) + (gabble_register_get_type ()) #define GABBLE_REGISTER(obj) \ (G_TYPE_CHECK_INSTANCE_CAST((obj), GABBLE_TYPE_REGISTER, GabbleRegister)) #define GABBLE_REGISTER_CLASS(klass) \ diff --git a/src/gabble-roomlist-channel.c b/src/gabble-roomlist-channel.c index 21e5e2897..33b2e35d8 100644 --- a/src/gabble-roomlist-channel.c +++ b/src/gabble-roomlist-channel.c @@ -667,7 +667,7 @@ gabble_roomlist_channel_stop_listing (TpSvcChannelTypeRoomList *iface, } static void -channel_iface_init(gpointer g_iface, gpointer iface_data) +channel_iface_init (gpointer g_iface, gpointer iface_data) { TpSvcChannelClass *klass = (TpSvcChannelClass *)g_iface; @@ -681,7 +681,7 @@ channel_iface_init(gpointer g_iface, gpointer iface_data) } static void -roomlist_iface_init(gpointer g_iface, gpointer iface_data) +roomlist_iface_init (gpointer g_iface, gpointer iface_data) { TpSvcChannelTypeRoomListClass *klass = (TpSvcChannelTypeRoomListClass *)g_iface; diff --git a/src/gabble-roomlist-channel.h b/src/gabble-roomlist-channel.h index 4c67519ce..2ba39d7ca 100644 --- a/src/gabble-roomlist-channel.h +++ b/src/gabble-roomlist-channel.h @@ -38,11 +38,11 @@ struct _GabbleRoomlistChannel { gpointer priv; }; -GType gabble_roomlist_channel_get_type(void); +GType gabble_roomlist_channel_get_type (void); /* TYPE MACROS */ #define GABBLE_TYPE_ROOMLIST_CHANNEL \ - (gabble_roomlist_channel_get_type()) + (gabble_roomlist_channel_get_type ()) #define GABBLE_ROOMLIST_CHANNEL(obj) \ (G_TYPE_CHECK_INSTANCE_CAST((obj), GABBLE_TYPE_ROOMLIST_CHANNEL, GabbleRoomlistChannel)) #define GABBLE_ROOMLIST_CHANNEL_CLASS(klass) \ diff --git a/src/gabble-roster-channel.h b/src/gabble-roster-channel.h index 2d5ca5e11..78b2d9e45 100644 --- a/src/gabble-roster-channel.h +++ b/src/gabble-roster-channel.h @@ -45,11 +45,11 @@ struct _GabbleRosterChannel { gpointer priv; }; -GType gabble_roster_channel_get_type(void); +GType gabble_roster_channel_get_type (void); /* TYPE MACROS */ #define GABBLE_TYPE_ROSTER_CHANNEL \ - (gabble_roster_channel_get_type()) + (gabble_roster_channel_get_type ()) #define GABBLE_ROSTER_CHANNEL(obj) \ (G_TYPE_CHECK_INSTANCE_CAST((obj), GABBLE_TYPE_ROSTER_CHANNEL, GabbleRosterChannel)) #define GABBLE_ROSTER_CHANNEL_CLASS(klass) \ diff --git a/src/im-factory.h b/src/im-factory.h index 6f723b94b..811ccb9ef 100644 --- a/src/im-factory.h +++ b/src/im-factory.h @@ -37,11 +37,11 @@ struct _GabbleImFactory { GObject parent; }; -GType gabble_im_factory_get_type(void); +GType gabble_im_factory_get_type (void); /* TYPE MACROS */ #define GABBLE_TYPE_IM_FACTORY \ - (gabble_im_factory_get_type()) + (gabble_im_factory_get_type ()) #define GABBLE_IM_FACTORY(obj) \ (G_TYPE_CHECK_INSTANCE_CAST((obj), GABBLE_TYPE_IM_FACTORY, GabbleImFactory)) #define GABBLE_IM_FACTORY_CLASS(klass) \ diff --git a/src/media-factory.c b/src/media-factory.c index 7b0c3b2b9..83d49a280 100644 --- a/src/media-factory.c +++ b/src/media-factory.c @@ -703,8 +703,8 @@ gabble_media_factory_iface_connecting (TpChannelFactoryIface *iface) GabbleMediaFactory *fac = GABBLE_MEDIA_FACTORY (iface); GabbleMediaFactoryPrivate *priv = GABBLE_MEDIA_FACTORY_GET_PRIVATE (fac); - g_assert(priv->conn != NULL); - g_assert(priv->conn->lmconn != NULL); + g_assert (priv->conn != NULL); + g_assert (priv->conn->lmconn != NULL); DEBUG ("adding callbacks"); diff --git a/src/media-factory.h b/src/media-factory.h index 957b109b0..ac9611d54 100644 --- a/src/media-factory.h +++ b/src/media-factory.h @@ -37,11 +37,11 @@ struct _GabbleMediaFactory { GObject parent; }; -GType gabble_media_factory_get_type(void); +GType gabble_media_factory_get_type (void); /* TYPE MACROS */ #define GABBLE_TYPE_MEDIA_FACTORY \ - (gabble_media_factory_get_type()) + (gabble_media_factory_get_type ()) #define GABBLE_MEDIA_FACTORY(obj) \ (G_TYPE_CHECK_INSTANCE_CAST((obj), GABBLE_TYPE_MEDIA_FACTORY, GabbleMediaFactory)) #define GABBLE_MEDIA_FACTORY_CLASS(klass) \ diff --git a/src/muc-factory.h b/src/muc-factory.h index c938dc33b..7cc794d1d 100644 --- a/src/muc-factory.h +++ b/src/muc-factory.h @@ -35,11 +35,11 @@ struct _GabbleMucFactory { GObject parent; }; -GType gabble_muc_factory_get_type(void); +GType gabble_muc_factory_get_type (void); /* TYPE MACROS */ #define GABBLE_TYPE_MUC_FACTORY \ - (gabble_muc_factory_get_type()) + (gabble_muc_factory_get_type ()) #define GABBLE_MUC_FACTORY(obj) \ (G_TYPE_CHECK_INSTANCE_CAST((obj), GABBLE_TYPE_MUC_FACTORY, GabbleMucFactory)) #define GABBLE_MUC_FACTORY_CLASS(klass) \ diff --git a/src/presence-cache.h b/src/presence-cache.h index 0c8ec39e8..1cfa248ac 100644 --- a/src/presence-cache.h +++ b/src/presence-cache.h @@ -28,7 +28,7 @@ G_BEGIN_DECLS -#define GABBLE_TYPE_PRESENCE_CACHE gabble_presence_cache_get_type() +#define GABBLE_TYPE_PRESENCE_CACHE gabble_presence_cache_get_type () #define GABBLE_PRESENCE_CACHE(obj) \ (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ diff --git a/src/presence.c b/src/presence.c index d1dfa176f..cf6ef9ce6 100644 --- a/src/presence.c +++ b/src/presence.c @@ -412,7 +412,7 @@ gabble_presence_dump (GabblePresence *presence) { Resource *res = (Resource *) i->data; - g_string_append_printf(ret, + g_string_append_printf (ret, " %s\n" " capabilities: %d\n" " status: %d\n" @@ -422,7 +422,7 @@ gabble_presence_dump (GabblePresence *presence) } if (priv->resources == NULL) - g_string_append_printf(ret, " (none)\n"); + g_string_append_printf (ret, " (none)\n"); return g_string_free (ret, FALSE); } diff --git a/src/presence.h b/src/presence.h index 90e35e56c..b641fcef9 100644 --- a/src/presence.h +++ b/src/presence.h @@ -29,7 +29,7 @@ G_BEGIN_DECLS -#define GABBLE_TYPE_PRESENCE gabble_presence_get_type() +#define GABBLE_TYPE_PRESENCE gabble_presence_get_type () #define GABBLE_PRESENCE(obj) \ (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ diff --git a/src/roster.c b/src/roster.c index a55a61842..e0ebffac1 100644 --- a/src/roster.c +++ b/src/roster.c @@ -1353,7 +1353,7 @@ _gabble_roster_send_presence_ack (GabbleRoster *roster, sub_type = LM_MESSAGE_SUB_TYPE_UNSUBSCRIBE; break; default: - g_assert_not_reached(); + g_assert_not_reached (); return; } @@ -1764,7 +1764,7 @@ roster_item_apply_edits (GabbleRoster *roster, g_return_if_fail (item->unsent_edits); - memcpy (&edited_item, item, sizeof(GabbleRosterItem)); + memcpy (&edited_item, item, sizeof (GabbleRosterItem)); #ifdef ENABLE_DEBUG if (DEBUGGING) @@ -1784,7 +1784,7 @@ roster_item_apply_edits (GabbleRoster *roster, edited_item.subscription = edits->new_subscription; } - if (edits->new_name != NULL && tp_strdiff(item->name, edits->new_name)) + if (edits->new_name != NULL && tp_strdiff (item->name, edits->new_name)) { DEBUG ("Changing name from %s to %s", item->name, edits->new_name); altered = TRUE; diff --git a/src/roster.h b/src/roster.h index b1c968f25..1dba0e90c 100644 --- a/src/roster.h +++ b/src/roster.h @@ -30,11 +30,11 @@ G_BEGIN_DECLS typedef struct _GabbleRosterClass GabbleRosterClass; -GType gabble_roster_get_type(void); +GType gabble_roster_get_type (void); /* TYPE MACROS */ #define GABBLE_TYPE_ROSTER \ - (gabble_roster_get_type()) + (gabble_roster_get_type ()) #define GABBLE_ROSTER(obj) \ (G_TYPE_CHECK_INSTANCE_CAST((obj), GABBLE_TYPE_ROSTER, GabbleRoster)) #define GABBLE_ROSTER_CLASS(klass) \ diff --git a/src/util.c b/src/util.c index 6acff2900..fb065c15a 100644 --- a/src/util.c +++ b/src/util.c @@ -426,7 +426,7 @@ gabble_remove_resource (const gchar *jid) return g_strdup (jid); /* The user and domain parts can't contain '/', assuming it's valid */ - buf = g_malloc(slash - jid + 1); + buf = g_malloc (slash - jid + 1); strncpy (buf, jid, slash - jid); buf[slash - jid] = '\0'; diff --git a/src/vcard-manager.c b/src/vcard-manager.c index 3bc0b0418..787edec85 100644 --- a/src/vcard-manager.c +++ b/src/vcard-manager.c @@ -323,7 +323,7 @@ cache_entry_timeout (gpointer data) GabbleVCardManagerPrivate *priv = GABBLE_VCARD_MANAGER_GET_PRIVATE (manager); GabbleVCardCacheEntry *entry; - time_t now = time(NULL); + time_t now = time (NULL); while (NULL != (entry = tp_heap_peek_first (priv->timed_cache))) { @@ -341,7 +341,7 @@ cache_entry_timeout (gpointer data) if (entry) { priv->cache_timer = g_timeout_add ( - 1000 * (entry->received + VCARD_CACHE_ENTRY_TTL - time(NULL)), + 1000 * (entry->received + VCARD_CACHE_ENTRY_TTL - time (NULL)), cache_entry_timeout, manager); } @@ -399,14 +399,14 @@ cache_entry_fill (GabbleVCardManager *manager, LmMessage *msg, TpHandle handle) g_assert (entry->message == NULL); entry->message = lm_message_new ("", LM_MESSAGE_TYPE_IQ); lm_message_node_steal_children (entry->message->node, msg->node); - entry->received = time(NULL); + entry->received = time (NULL); tp_heap_add (priv->timed_cache, entry); if (priv->cache_timer == 0) { GabbleVCardCacheEntry *first = tp_heap_peek_first (priv->timed_cache); priv->cache_timer = g_timeout_add ((first->received + - VCARD_CACHE_ENTRY_TTL - time(NULL)) * 1000, cache_entry_timeout, manager); + VCARD_CACHE_ENTRY_TTL - time (NULL)) * 1000, cache_entry_timeout, manager); } } @@ -1415,7 +1415,7 @@ gabble_vcard_manager_get_cached_alias (GabbleVCardManager *manager, g_return_val_if_fail (tp_handle_is_valid (contact_repo, handle, NULL), NULL); s = tp_handle_get_qdata (contact_repo, handle, - gabble_vcard_manager_cache_quark()); + gabble_vcard_manager_cache_quark ()); if (s == NO_ALIAS) s = NULL; @@ -1444,7 +1444,7 @@ gabble_vcard_manager_has_cached_alias (GabbleVCardManager *manager, FALSE); p = tp_handle_get_qdata (contact_repo, handle, - gabble_vcard_manager_cache_quark()); + gabble_vcard_manager_cache_quark ()); return p != NULL; } diff --git a/src/vcard-manager.h b/src/vcard-manager.h index 12e89f126..c81f9038f 100644 --- a/src/vcard-manager.h +++ b/src/vcard-manager.h @@ -48,11 +48,11 @@ typedef enum GQuark gabble_vcard_manager_error_quark (void); #define GABBLE_VCARD_MANAGER_ERROR gabble_vcard_manager_error_quark () -GType gabble_vcard_manager_get_type(void); +GType gabble_vcard_manager_get_type (void); /* TYPE MACROS */ #define GABBLE_TYPE_VCARD_MANAGER \ - (gabble_vcard_manager_get_type()) + (gabble_vcard_manager_get_type ()) #define GABBLE_VCARD_MANAGER(obj) \ (G_TYPE_CHECK_INSTANCE_CAST((obj), GABBLE_TYPE_VCARD_MANAGER, GabbleVCardManager)) #define GABBLE_VCARD_MANAGER_CLASS(klass) \ diff --git a/src/write-mgr-file.c b/src/write-mgr-file.c index 684cd6318..fd61ef6b0 100644 --- a/src/write-mgr-file.c +++ b/src/write-mgr-file.c @@ -32,55 +32,55 @@ mgr_file_contents (const char *busname, const TpCMProtocolSpec protocols[], GError **error) { - GKeyFile *f = g_key_file_new(); + GKeyFile *f = g_key_file_new (); const TpCMProtocolSpec *protocol; const TpCMParamSpec *row; - g_key_file_set_string(f, "ConnectionManager", "BusName", busname); - g_key_file_set_string(f, "ConnectionManager", "ObjectPath", objpath); + g_key_file_set_string (f, "ConnectionManager", "BusName", busname); + g_key_file_set_string (f, "ConnectionManager", "ObjectPath", objpath); for (protocol = protocols; protocol->name; protocol++) { - gchar *section_name = g_strdup_printf("Protocol %s", protocol->name); + gchar *section_name = g_strdup_printf ("Protocol %s", protocol->name); for (row = protocol->parameters; row->name; row++) { - gchar *param_name = g_strdup_printf("param-%s", row->name); - gchar *param_value = g_strdup_printf("%s%s%s", row->dtype, + gchar *param_name = g_strdup_printf ("param-%s", row->name); + gchar *param_value = g_strdup_printf ("%s%s%s", row->dtype, (row->flags & TP_CONN_MGR_PARAM_FLAG_REQUIRED ? " required" : ""), (row->flags & TP_CONN_MGR_PARAM_FLAG_REGISTER ? " register" : "")); - g_key_file_set_string(f, section_name, param_name, param_value); - g_free(param_value); - g_free(param_name); + g_key_file_set_string (f, section_name, param_name, param_value); + g_free (param_value); + g_free (param_name); } for (row = protocol->parameters; row->name; row++) { if (row->flags & TP_CONN_MGR_PARAM_FLAG_HAS_DEFAULT) { - gchar *default_name = g_strdup_printf("default-%s", row->name); + gchar *default_name = g_strdup_printf ("default-%s", row->name); switch (row->gtype) { case G_TYPE_STRING: - g_key_file_set_string(f, section_name, default_name, + g_key_file_set_string (f, section_name, default_name, row->def); break; case G_TYPE_INT: case G_TYPE_UINT: - g_key_file_set_integer(f, section_name, default_name, + g_key_file_set_integer (f, section_name, default_name, GPOINTER_TO_INT(row->def)); break; case G_TYPE_BOOLEAN: - g_key_file_set_boolean(f, section_name, default_name, + g_key_file_set_boolean (f, section_name, default_name, GPOINTER_TO_INT(row->def) ? 1 : 0); } - g_free(default_name); + g_free (default_name); } } - g_free(section_name); + g_free (section_name); } - return g_key_file_to_data(f, NULL, error); + return g_key_file_to_data (f, NULL, error); } int @@ -88,16 +88,16 @@ main (void) { GError *error = NULL; - gchar *s = mgr_file_contents(TP_CM_BUS_NAME_BASE "gabble", + gchar *s = mgr_file_contents (TP_CM_BUS_NAME_BASE "gabble", TP_CM_OBJECT_PATH_BASE "gabble", gabble_protocols, &error); if (!s) { - fprintf(stderr, error->message); - g_error_free(error); + fprintf (stderr, error->message); + g_error_free (error); return 1; } - printf("%s", s); - g_free(s); + printf ("%s", s); + g_free (s); return 0; } diff --git a/tests/test-gabble-presence.c b/tests/test-gabble-presence.c index 8c6c3919e..a282bef6d 100644 --- a/tests/test-gabble-presence.c +++ b/tests/test-gabble-presence.c @@ -4,15 +4,15 @@ #include <glib.h> #include <presence.h> -int main(int argc, char **argv) +int main (int argc, char **argv) { const gchar *resource; gchar *dump; GabblePresence *presence; - g_type_init(); + g_type_init (); - presence = gabble_presence_new(); + presence = gabble_presence_new (); g_assert (GABBLE_PRESENCE_OFFLINE == presence->status); g_assert (NULL == presence->status_message); @@ -69,7 +69,7 @@ int main(int argc, char **argv) g_assert (NULL == resource); /* give voice cap to second resource, but make priority negative */ - g_assert (FALSE == gabble_presence_update(presence, "bar", + g_assert (FALSE == gabble_presence_update (presence, "bar", GABBLE_PRESENCE_AVAILABLE, "dingoes", -1)); gabble_presence_set_capabilities (presence, "bar", PRESENCE_CAP_GOOGLE_VOICE, 0); @@ -111,7 +111,7 @@ int main(int argc, char **argv) g_assert (TRUE == gabble_presence_update (presence, NULL, GABBLE_PRESENCE_OFFLINE, "gone", 0)); g_assert (GABBLE_PRESENCE_OFFLINE == presence->status); - g_assert (0 == strcmp("gone", presence->status_message)); + g_assert (0 == strcmp ("gone", presence->status_message)); /* caps are gone too */ resource = gabble_presence_pick_resource_by_caps (presence, diff --git a/tests/test-handles.c b/tests/test-handles.c index bab36fb84..fb5ec1c6e 100644 --- a/tests/test-handles.c +++ b/tests/test-handles.c @@ -92,7 +92,7 @@ void test_handles (guint handle_type) for (i = 0; i < NUM_TP_HANDLE_TYPES; i++) { if (repos[i]) - g_object_unref((GObject *)repos[i]); + g_object_unref ((GObject *)repos[i]); } } |