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

Move name owning code from server.c to server-main.c.

Browse Source
This commit is contained in:
Daiki Ueno
2011-02-21 15:11:26 +09:00
parent 4a0cda72a2
commit bf2b9c968d
6 changed files with 105 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/server-main.c
View File

@ -37,6 +37,7 @@ main (int argc, char **argv)
GDBusConnection *connection;
GError *error;
GMainLoop *loop;
guint owner_id;
#if HAVE_CLUTTER_GTK
if (gtk_clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS) {
@ -65,17 +66,29 @@ main (int argc, char **argv)
exit (1);
}
server = eekboard_server_new (connection);
server = eekboard_server_new ("/com/redhat/Eekboard/Keyboard", connection);
if (!eekboard_server_start (server)) {
if (server == NULL) {
g_printerr ("Can't start server\n");
exit (1);
}
owner_id = g_bus_own_name_on_connection (connection,
"com.redhat.Eekboard.Keyboard",
G_BUS_NAME_OWNER_FLAGS_NONE,
NULL,
NULL,
NULL,
NULL);
if (owner_id == 0) {
g_printerr ("Can't own the name\n");
exit (1);
}
loop = g_main_loop_new (NULL, FALSE);
g_main_loop_run (loop);
eekboard_server_stop (server);
g_bus_unown_name (owner_id);
g_object_unref (server);
g_object_unref (connection);
g_main_loop_unref (loop);