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

Rename EekboardServer to EekboardEekboard.

Browse Source
This commit is contained in:
Daiki Ueno
2011-02-24 10:31:09 +09:00
parent 7ef245d739
commit 3eeb7cd8ab
7 changed files with 155 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/client-main.c
View File

@ -62,7 +62,7 @@ on_key_released (guint keycode, gpointer user_data)
int
main (int argc, char **argv)
{
EekboardServer *server = NULL;
EekboardEekboard *eekboard = NULL;
EekboardContext *context = NULL;
GDBusConnection *connection = NULL;
GError *error;
@ -86,14 +86,14 @@ main (int argc, char **argv)
goto out;
}
server = eekboard_server_new (connection, NULL);
if (!server) {
g_printerr ("Can't create server\n");
eekboard = eekboard_eekboard_new (connection, NULL);
if (!eekboard) {
g_printerr ("Can't create eekboard\n");
retval = 1;
goto out;
}
context = eekboard_server_create_context (server,
context = eekboard_eekboard_create_context (eekboard,
"eekboard-client",
NULL);
if (!context) {
@ -102,7 +102,7 @@ main (int argc, char **argv)
goto out;
}
eekboard_server_push_context (server, context, NULL);
eekboard_eekboard_push_context (eekboard, context, NULL);
if (opt_set_keyboard) {
GFile *file;

22
src/desktop-client.c
View File

@ -51,7 +51,7 @@ typedef struct _EekboardDesktopClientClass EekboardDesktopClientClass;
struct _EekboardDesktopClient {
GObject parent;
EekboardServer *server;
EekboardEekboard *eekboard;
EekboardContext *context;
EekKeyboard *keyboard;
@ -119,16 +119,16 @@ eekboard_desktop_client_set_property (GObject *object,
case PROP_CONNECTION:
connection = g_value_get_object (value);
client->server = eekboard_server_new (connection, NULL);
g_assert (client->server);
client->eekboard = eekboard_eekboard_new (connection, NULL);
g_assert (client->eekboard);
client->context =
eekboard_server_create_context (client->server,
eekboard_eekboard_create_context (client->eekboard,
"eekboard-desktop-client",
NULL);
g_assert (client->context);
eekboard_server_push_context (client->server, client->context, NULL);
eekboard_eekboard_push_context (client->eekboard, client->context, NULL);
break;
default:
g_object_set_property (object,
@ -175,17 +175,17 @@ eekboard_desktop_client_dispose (GObject *object)
#endif /* HAVE_FAKEKEY */
if (client->context) {
if (client->server) {
eekboard_server_pop_context (client->server, NULL);
if (client->eekboard) {
eekboard_eekboard_pop_context (client->eekboard, NULL);
}
g_object_unref (client->context);
client->context = NULL;
}
if (client->server) {
g_object_unref (client->server);
client->server = NULL;
if (client->eekboard) {
g_object_unref (client->eekboard);
client->eekboard = NULL;
}
if (client->keyboard) {
@ -239,7 +239,7 @@ eekboard_desktop_client_class_init (EekboardDesktopClientClass *klass)
static void
eekboard_desktop_client_init (EekboardDesktopClient *client)
{
client->server = NULL;
client->eekboard = NULL;
client->context = NULL;
client->display = NULL;
client->xkl_engine = NULL;