colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libnm-glib: allow calling nm_remote_connection_delete() without a callback

Browse Source
This commit is contained in:
Richard Hughes
2011-03-16 15:36:36 -05:00
committed by Dan Williams
parent 4480365db7
commit 4e73194500
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libnm-glib/nm-remote-connection.c
View File

@@ -145,14 +145,15 @@ delete_cb (DBusGProxy *proxy, GError *error, gpointer user_data)
RemoteCall *call = user_data; RemoteCall *call = user_data;
NMRemoteConnectionDeleteFunc func = (NMRemoteConnectionDeleteFunc) call->callback; NMRemoteConnectionDeleteFunc func = (NMRemoteConnectionDeleteFunc) call->callback;
(*func)(call->self, error, call->user_data); if (func != NULL)
(*func)(call->self, error, call->user_data);
remote_call_complete (call->self, call); remote_call_complete (call->self, call);
} }
/** /**
* nm_remote_connection_delete: * nm_remote_connection_delete:
* @connection: the #NMRemoteConnection * @connection: the #NMRemoteConnection
* @callback: (scope async): a function to be called when the delete completes * @callback: (scope async allow-none): a function to be called when the delete completes
* @user_data: caller-specific data to be passed to @callback * @user_data: caller-specific data to be passed to @callback
* *
* Delete the connection. * Delete the connection.
@@ -167,7 +168,6 @@ nm_remote_connection_delete (NMRemoteConnection *self,
g_return_if_fail (self != NULL); g_return_if_fail (self != NULL);
g_return_if_fail (NM_IS_REMOTE_CONNECTION (self)); g_return_if_fail (NM_IS_REMOTE_CONNECTION (self));
g_return_if_fail (callback != NULL);
priv = NM_REMOTE_CONNECTION_GET_PRIVATE (self); priv = NM_REMOTE_CONNECTION_GET_PRIVATE (self);