luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-03 22:52:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

GDBusServer: move business logic from _new() function to initable_init()

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=639478

Signed-off-by: David Zeuthen <davidz@redhat.com>
This commit is contained in:
Tristan Van Berkom 2011-03-24 10:07:18 -04:00 committed by David Zeuthen
parent 30fdc1a799
commit a8bc1436f1
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gio/gdbusserver.c
View File

@ -494,15 +494,6 @@ g_dbus_server_new_sync (const gchar *address,
"guid", guid, "guid", guid,
"authentication-observer", observer, "authentication-observer", observer,
NULL); NULL);
if (server != NULL)
{
/* Right now we don't have any transport not using the listener... */
g_assert (server->is_using_listener);
server->run_signal_handler_id = g_signal_connect (G_SOCKET_SERVICE (server->listener),
"run",
G_CALLBACK (on_run),
server);
}
return server; return server;
} }
@ -1103,9 +1094,6 @@ initable_init (GInitable *initable,
} }
} }
if (!ret)
goto out;
out: out:
g_strfreev (addr_array); g_strfreev (addr_array);
@ -1114,6 +1102,13 @@ initable_init (GInitable *initable,
{ {
if (last_error != NULL) if (last_error != NULL)
g_error_free (last_error); g_error_free (last_error);
/* Right now we don't have any transport not using the listener... */
g_assert (server->is_using_listener);
server->run_signal_handler_id = g_signal_connect (G_SOCKET_SERVICE (server->listener),
"run",
G_CALLBACK (on_run),
server);
} }
else else
{ {