diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-11-11 15:01:21 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-11-22 11:47:29 +0100 |
| commit | 497f7dc722ba9099c1d2d5bf9a1f21eeb7e242e9 (patch) | |
| tree | d2f069faaf02e2ff1db883e72cff002d3101ad94 | |
| parent | 1009ec16393d26df00f92f2ec43e3b63de0d4f0b (diff) | |
| download | network-manager-applet-497f7dc722ba9099c1d2d5bf9a1f21eeb7e242e9.tar.gz | |
c-e: tag DeleteConnectionResultFunc with a special argument
| -rw-r--r-- | src/connection-editor/connection-helpers.c | 2 | ||||
| -rw-r--r-- | src/connection-editor/connection-helpers.h | 6 | ||||
| -rw-r--r-- | src/connection-editor/nm-connection-list.c | 5 | ||||
| -rw-r--r-- | src/connection-editor/page-master.c | 3 |
4 files changed, 12 insertions, 4 deletions
diff --git a/src/connection-editor/connection-helpers.c b/src/connection-editor/connection-helpers.c index 502bf6c4..4c1ed035 100644 --- a/src/connection-editor/connection-helpers.c +++ b/src/connection-editor/connection-helpers.c @@ -732,7 +732,7 @@ delete_cb (GObject *connection, g_clear_error (&error); if (result_func) - (*result_func) (NM_REMOTE_CONNECTION (connection), error == NULL, user_data); + (*result_func) (FUNC_TAG_DELETE_CONNECTION_RESULT_CALL, NM_REMOTE_CONNECTION (connection), error == NULL, user_data); } void diff --git a/src/connection-editor/connection-helpers.h b/src/connection-editor/connection-helpers.h index 90f5265e..05640b59 100644 --- a/src/connection-editor/connection-helpers.h +++ b/src/connection-editor/connection-helpers.h @@ -66,7 +66,11 @@ void new_connection_of_type (GtkWindow *parent_window, NewConnectionResultFunc result_func, gpointer user_data); -typedef void (*DeleteConnectionResultFunc) (NMRemoteConnection *connection, +struct _func_tag_delete_connection_result; +#define FUNC_TAG_DELETE_CONNECTION_RESULT_IMPL struct _func_tag_delete_connection_result *_dummy +#define FUNC_TAG_DELETE_CONNECTION_RESULT_CALL ((struct _func_tag_delete_connection_result *) NULL) +typedef void (*DeleteConnectionResultFunc) (FUNC_TAG_DELETE_CONNECTION_RESULT_IMPL, + NMRemoteConnection *connection, gboolean deleted, gpointer user_data); diff --git a/src/connection-editor/nm-connection-list.c b/src/connection-editor/nm-connection-list.c index 4b7f759f..f391df01 100644 --- a/src/connection-editor/nm-connection-list.c +++ b/src/connection-editor/nm-connection-list.c @@ -359,7 +359,10 @@ do_edit (NMConnectionList *list) } static void -delete_connection_cb (NMRemoteConnection *connection, gboolean deleted, gpointer user_data) +delete_connection_cb (FUNC_TAG_DELETE_CONNECTION_RESULT_IMPL, + NMRemoteConnection *connection, + gboolean deleted, + gpointer user_data) { NMConnectionList *list = user_data; diff --git a/src/connection-editor/page-master.c b/src/connection-editor/page-master.c index eba7482c..591feece 100644 --- a/src/connection-editor/page-master.c +++ b/src/connection-editor/page-master.c @@ -485,7 +485,8 @@ connection_double_clicked_cb (GtkTreeView *tree_view, } static void -delete_result_cb (NMRemoteConnection *connection, +delete_result_cb (FUNC_TAG_DELETE_CONNECTION_RESULT_IMPL, + NMRemoteConnection *connection, gboolean deleted, gpointer user_data) { |