Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
GNOME
network-manager-applet
Commits
497f7dc7
Commit
497f7dc7
authored
Nov 11, 2016
by
Thomas Haller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
c-e: tag DeleteConnectionResultFunc with a special argument
parent
1009ec16
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
4 deletions
+12
-4
src/connection-editor/connection-helpers.c
src/connection-editor/connection-helpers.c
+1
-1
src/connection-editor/connection-helpers.h
src/connection-editor/connection-helpers.h
+5
-1
src/connection-editor/nm-connection-list.c
src/connection-editor/nm-connection-list.c
+4
-1
src/connection-editor/page-master.c
src/connection-editor/page-master.c
+2
-1
No files found.
src/connection-editor/connection-helpers.c
View file @
497f7dc7
...
...
@@ -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
...
...
src/connection-editor/connection-helpers.h
View file @
497f7dc7
...
...
@@ -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
);
...
...
src/connection-editor/nm-connection-list.c
View file @
497f7dc7
...
...
@@ -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
;
...
...
src/connection-editor/page-master.c
View file @
497f7dc7
...
...
@@ -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
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment