[network-manager-applet/th/c-e-import-fixes-bgo774290: 3/10] c-e: tag DeleteConnectionResultFunc with a special argument

[Thomas Haller <thaller src gnome org>]

commit 497f7dc722ba9099c1d2d5bf9a1f21eeb7e242e9
Author: Thomas Haller <thaller redhat com>
Date:   Fri Nov 11 15:01:21 2016 +0100

    c-e: tag DeleteConnectionResultFunc with a special argument

 src/connection-editor/connection-helpers.c |    2 +-
 src/connection-editor/connection-helpers.h |    6 +++++-
 src/connection-editor/nm-connection-list.c |    5 ++++-
 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 502bf6c..4c1ed03 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 90f5265..05640b5 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 4b7f759..f391df0 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 eba7482..591feec 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)
 {