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

Check if the server is active.

Browse Source
This commit is contained in:
Daiki Ueno
2011-03-03 12:12:52 +09:00
parent cfd33921a1
commit b8a01d794e
6 changed files with 196 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/desktop-client-main.c
View File

@ -77,10 +77,29 @@ on_notify_keyboard_visible (GObject *object,
g_main_loop_quit (loop);
}
static void
on_context_destroyed (EekboardContext *context,
gpointer user_data)
{
GMainLoop *loop = user_data;
g_main_loop_quit (loop);
}
static void
on_destroyed (EekboardEekboard *eekboard,
gpointer user_data)
{
GMainLoop *loop = user_data;
g_main_loop_quit (loop);
}
int
main (int argc, char **argv)
{
EekboardDesktopClient *client;
EekboardEekboard *eekboard;
EekboardContext *context;
GBusType bus_type;
GDBusConnection *connection;
@ -136,6 +155,10 @@ main (int argc, char **argv)
}
client = eekboard_desktop_client_new (connection);
if (client == NULL) {
g_printerr ("Can't create a client\n");
exit (1);
}
gconfc = gconf_client_get_default ();
@ -196,9 +219,15 @@ main (int argc, char **argv)
g_object_get (client, "context", &context, NULL);
g_signal_connect (context, "notify::keyboard-visible",
G_CALLBACK(on_notify_keyboard_visible), loop);
g_signal_connect (context, "destroyed",
G_CALLBACK(on_context_destroyed), loop);
g_object_unref (context);
}
g_object_get (client, "eekboard", &eekboard, NULL);
g_signal_connect (eekboard, "destroyed",
G_CALLBACK(on_destroyed), loop);
g_main_loop_run (loop);
g_main_loop_unref (loop);

44
src/desktop-client.c
View File

@ -43,6 +43,7 @@
enum {
PROP_0,
PROP_CONNECTION,
PROP_EEKBOARD,
PROP_CONTEXT,
PROP_LAST
};
@ -124,15 +125,19 @@ eekboard_desktop_client_set_property (GObject *object,
connection = g_value_get_object (value);
client->eekboard = eekboard_eekboard_new (connection, NULL);
g_assert (client->eekboard);
client->context =
eekboard_eekboard_create_context (client->eekboard,
"eekboard-desktop-client",
NULL);
g_assert (client->context);
eekboard_eekboard_push_context (client->eekboard, client->context, NULL);
if (client->eekboard != NULL) {
client->context =
eekboard_eekboard_create_context (client->eekboard,
"eekboard-desktop-client",
NULL);
if (client->context == NULL) {
g_object_unref (client->eekboard);
client->eekboard = NULL;
} else
eekboard_eekboard_push_context (client->eekboard,
client->context,
NULL);
}
break;
default:
g_object_set_property (object,
@ -151,6 +156,9 @@ eekboard_desktop_client_get_property (GObject *object,
EekboardDesktopClient *client = EEKBOARD_DESKTOP_CLIENT(object);
switch (prop_id) {
case PROP_EEKBOARD:
g_value_set_object (value, client->eekboard);
break;
case PROP_CONTEXT:
g_value_set_object (value, client->context);
break;
@ -230,6 +238,15 @@ eekboard_desktop_client_class_init (EekboardDesktopClientClass *klass)
PROP_CONNECTION,
pspec);
pspec = g_param_spec_object ("eekboard",
"Eekboard",
"Eekboard",
EEKBOARD_TYPE_EEKBOARD,
G_PARAM_READABLE);
g_object_class_install_property (gobject_class,
PROP_EEKBOARD,
pspec);
pspec = g_param_spec_object ("context",
"Context",
"Context",
@ -460,9 +477,12 @@ keystroke_listener_cb (const AccessibleKeystroke *stroke,
EekboardDesktopClient *
eekboard_desktop_client_new (GDBusConnection *connection)
{
return g_object_new (EEKBOARD_TYPE_DESKTOP_CLIENT,
"connection", connection,
NULL);
EekboardDesktopClient *client = g_object_new (EEKBOARD_TYPE_DESKTOP_CLIENT,
"connection", connection,
NULL);
if (client->context)
return client;
return NULL;
}
static GdkFilterReturn