s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix typo.

Browse Source
This commit is contained in:
Daiki Ueno
2011-08-22 18:05:25 +09:00
parent 74de8e5056
commit 952f70b433
2 changed files with 39 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
eekboard/eekboard-client.c
View File

@ -38,7 +38,7 @@ static guint signals[LAST_SIGNAL] = { 0, };
G_DEFINE_TYPE (EekboardClient, eekboard_client, G_TYPE_DBUS_PROXY); G_DEFINE_TYPE (EekboardClient, eekboard_client, G_TYPE_DBUS_PROXY);
#define EEKBOARD_CLIENT_GET_PRIVATE(obj) \ #define EEKBOARD_CLIENT_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEKBOARD_TYPE_CLIENT, EekboardClientPrivate)) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EEKBOARD_TYPE_CLIENT, EekboardClientPrivate))
struct _EekboardClientPrivate struct _EekboardClientPrivate
@ -117,8 +117,8 @@ eekboard_name_vanished_callback (GDBusConnection *connection,
const gchar *name, const gchar *name,
gpointer user_data) gpointer user_data)
{ {
EekboardClient *eekboard = user_data; EekboardClient *client = user_data;
g_signal_emit_by_name (eekboard, "destroyed", NULL); g_signal_emit_by_name (client, "destroyed", NULL);
} }
/** /**
@ -130,7 +130,7 @@ eekboard_name_vanished_callback (GDBusConnection *connection,
*/ */
EekboardClient * EekboardClient *
eekboard_client_new (GDBusConnection *connection, eekboard_client_new (GDBusConnection *connection,
GCancellable *cancellable) GCancellable *cancellable)
{ {
GInitable *initable; GInitable *initable;
GError *error; GError *error;
@ -148,10 +148,10 @@ eekboard_client_new (GDBusConnection *connection,
"g-object-path", "/org/fedorahosted/Eekboard", "g-object-path", "/org/fedorahosted/Eekboard",
NULL); NULL);
if (initable != NULL) { if (initable != NULL) {
EekboardClient *eekboard = EEKBOARD_CLIENT (initable); EekboardClient *client = EEKBOARD_CLIENT (initable);
gchar *name_owner = g_dbus_proxy_get_name_owner (G_DBUS_PROXY(eekboard)); gchar *name_owner = g_dbus_proxy_get_name_owner (G_DBUS_PROXY(client));
if (name_owner == NULL) { if (name_owner == NULL) {
g_object_unref (eekboard); g_object_unref (client);
return NULL; return NULL;
} }
@ -161,11 +161,11 @@ eekboard_client_new (GDBusConnection *connection,
G_BUS_NAME_WATCHER_FLAGS_NONE, G_BUS_NAME_WATCHER_FLAGS_NONE,
NULL, NULL,
eekboard_name_vanished_callback, eekboard_name_vanished_callback,
eekboard, client,
NULL); NULL);
g_free (name_owner); g_free (name_owner);
return eekboard; return client;
} }
return NULL; return NULL;
} }
@ -174,8 +174,8 @@ static void
on_context_destroyed (EekboardContext *context, on_context_destroyed (EekboardContext *context,
gpointer user_data) gpointer user_data)
{ {
EekboardClient *eekboard = user_data; EekboardClient *client = user_data;
EekboardClientPrivate *priv = EEKBOARD_CLIENT_GET_PRIVATE(eekboard); EekboardClientPrivate *priv = EEKBOARD_CLIENT_GET_PRIVATE(client);
g_hash_table_remove (priv->context_hash, g_hash_table_remove (priv->context_hash,
g_dbus_proxy_get_object_path (G_DBUS_PROXY(context))); g_dbus_proxy_get_object_path (G_DBUS_PROXY(context)));
@ -192,9 +192,9 @@ on_context_destroyed (EekboardContext *context,
* Return value: (transfer full): a newly created #EekboardContext. * Return value: (transfer full): a newly created #EekboardContext.
*/ */
EekboardContext * EekboardContext *
eekboard_client_create_context (EekboardClient *eekboard, eekboard_client_create_context (EekboardClient *client,
const gchar *client_name, const gchar *client_name,
GCancellable *cancellable) GCancellable *cancellable)
{ {
GVariant *variant; GVariant *variant;
const gchar *object_path; const gchar *object_path;
@ -203,11 +203,11 @@ eekboard_client_create_context (EekboardClient *eekboard,
GError *error; GError *error;
GDBusConnection *connection; GDBusConnection *connection;
g_assert (EEKBOARD_IS_EEKBOARD(eekboard)); g_assert (EEKBOARD_IS_CLIENT(client));
g_assert (client_name); g_assert (client_name);
error = NULL; error = NULL;
variant = g_dbus_proxy_call_sync (G_DBUS_PROXY(eekboard), variant = g_dbus_proxy_call_sync (G_DBUS_PROXY(client),
"CreateContext", "CreateContext",
g_variant_new ("(s)", client_name), g_variant_new ("(s)", client_name),
G_DBUS_CALL_FLAGS_NONE, G_DBUS_CALL_FLAGS_NONE,
@ -218,26 +218,26 @@ eekboard_client_create_context (EekboardClient *eekboard,
return NULL; return NULL;
g_variant_get (variant, "(&s)", &object_path); g_variant_get (variant, "(&s)", &object_path);
connection = g_dbus_proxy_get_connection (G_DBUS_PROXY(eekboard)); connection = g_dbus_proxy_get_connection (G_DBUS_PROXY(client));
context = eekboard_context_new (connection, object_path, cancellable); context = eekboard_context_new (connection, object_path, cancellable);
if (!context) { if (!context) {
g_variant_unref (variant); g_variant_unref (variant);
return NULL; return NULL;
} }
priv = EEKBOARD_CLIENT_GET_PRIVATE(eekboard); priv = EEKBOARD_CLIENT_GET_PRIVATE(client);
g_hash_table_insert (priv->context_hash, g_hash_table_insert (priv->context_hash,
g_strdup (object_path), g_strdup (object_path),
g_object_ref (context)); g_object_ref (context));
g_signal_connect (context, "destroyed", g_signal_connect (context, "destroyed",
G_CALLBACK(on_context_destroyed), eekboard); G_CALLBACK(on_context_destroyed), client);
return context; return context;
} }
static void static void
eekboard_async_ready_callback (GObject *source_object, eekboard_async_ready_callback (GObject *source_object,
GAsyncResult *res, GAsyncResult *res,
gpointer user_data) gpointer user_data)
{ {
GError *error = NULL; GError *error = NULL;
GVariant *result; GVariant *result;
@ -258,25 +258,25 @@ eekboard_async_ready_callback (GObject *source_object,
* Enable the input context @context and disable the others. * Enable the input context @context and disable the others.
*/ */
void void
eekboard_client_push_context (EekboardClient *eekboard, eekboard_client_push_context (EekboardClient *client,
EekboardContext *context, EekboardContext *context,
GCancellable *cancellable) GCancellable *cancellable)
{ {
EekboardClientPrivate *priv; EekboardClientPrivate *priv;
const gchar *object_path; const gchar *object_path;
g_return_if_fail (EEKBOARD_IS_EEKBOARD(eekboard)); g_return_if_fail (EEKBOARD_IS_CLIENT(client));
g_return_if_fail (EEKBOARD_IS_CONTEXT(context)); g_return_if_fail (EEKBOARD_IS_CONTEXT(context));
object_path = g_dbus_proxy_get_object_path (G_DBUS_PROXY(context)); object_path = g_dbus_proxy_get_object_path (G_DBUS_PROXY(context));
priv = EEKBOARD_CLIENT_GET_PRIVATE(eekboard); priv = EEKBOARD_CLIENT_GET_PRIVATE(client);
context = g_hash_table_lookup (priv->context_hash, object_path); context = g_hash_table_lookup (priv->context_hash, object_path);
if (!context) if (!context)
return; return;
eekboard_context_set_enabled (context, TRUE); eekboard_context_set_enabled (context, TRUE);
g_dbus_proxy_call (G_DBUS_PROXY(eekboard), g_dbus_proxy_call (G_DBUS_PROXY(client),
"PushContext", "PushContext",
g_variant_new ("(s)", object_path), g_variant_new ("(s)", object_path),
G_DBUS_CALL_FLAGS_NONE, G_DBUS_CALL_FLAGS_NONE,
@ -294,12 +294,12 @@ eekboard_client_push_context (EekboardClient *eekboard,
* Disable the current input context and enable the previous one. * Disable the current input context and enable the previous one.
*/ */
void void
eekboard_client_pop_context (EekboardClient *eekboard, eekboard_client_pop_context (EekboardClient *client,
GCancellable *cancellable) GCancellable *cancellable)
{ {
g_return_if_fail (EEKBOARD_IS_EEKBOARD(eekboard)); g_return_if_fail (EEKBOARD_IS_CLIENT(client));
g_dbus_proxy_call (G_DBUS_PROXY(eekboard), g_dbus_proxy_call (G_DBUS_PROXY(client),
"PopContext", "PopContext",
NULL, NULL,
G_DBUS_CALL_FLAGS_NONE, G_DBUS_CALL_FLAGS_NONE,
@ -318,22 +318,21 @@ eekboard_client_pop_context (EekboardClient *eekboard,
* Remove @context from @eekboard. * Remove @context from @eekboard.
*/ */
void void
eekboard_client_destroy_context (EekboardClient *eekboard, eekboard_client_destroy_context (EekboardClient *client,
EekboardContext *context, EekboardContext *context,
GCancellable *cancellable) GCancellable *cancellable)
{ {
EekboardClientPrivate *priv; EekboardClientPrivate *priv;
const gchar *object_path; const gchar *object_path;
g_return_if_fail (EEKBOARD_IS_EEKBOARD(eekboard)); g_return_if_fail (EEKBOARD_IS_CLIENT(client));
g_return_if_fail (EEKBOARD_IS_CONTEXT(context)); g_return_if_fail (EEKBOARD_IS_CONTEXT(context));
priv = EEKBOARD_CLIENT_GET_PRIVATE(eekboard); priv = EEKBOARD_CLIENT_GET_PRIVATE(client);
object_path = g_dbus_proxy_get_object_path (G_DBUS_PROXY(context)); object_path = g_dbus_proxy_get_object_path (G_DBUS_PROXY(context));
g_hash_table_remove (priv->context_hash, object_path); g_hash_table_remove (priv->context_hash, object_path);
g_dbus_proxy_call (G_DBUS_PROXY(eekboard), g_dbus_proxy_call (G_DBUS_PROXY(client),
"DestroyContext", "DestroyContext",
g_variant_new ("(s)", object_path), g_variant_new ("(s)", object_path),
G_DBUS_CALL_FLAGS_NONE, G_DBUS_CALL_FLAGS_NONE,

4
eekboard/eekboard-client.h
View File

@ -28,8 +28,8 @@ G_BEGIN_DECLS
#define EEKBOARD_TYPE_CLIENT (eekboard_client_get_type()) #define EEKBOARD_TYPE_CLIENT (eekboard_client_get_type())
#define EEKBOARD_CLIENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEKBOARD_TYPE_CLIENT, EekboardClient)) #define EEKBOARD_CLIENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EEKBOARD_TYPE_CLIENT, EekboardClient))
#define EEKBOARD_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEKBOARD_TYPE_CLIENT, EekboardClientClass)) #define EEKBOARD_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EEKBOARD_TYPE_CLIENT, EekboardClientClass))
#define EEKBOARD_IS_EEKBOARD(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEKBOARD_TYPE_CLIENT)) #define EEKBOARD_IS_CLIENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EEKBOARD_TYPE_CLIENT))
#define EEKBOARD_IS_EEKBOARD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEKBOARD_TYPE_CLIENT)) #define EEKBOARD_IS_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), EEKBOARD_TYPE_CLIENT))
#define EEKBOARD_CLIENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEKBOARD_TYPE_CLIENT, EekboardClientClass)) #define EEKBOARD_CLIENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), EEKBOARD_TYPE_CLIENT, EekboardClientClass))
typedef struct _EekboardClient EekboardClient; typedef struct _EekboardClient EekboardClient;