mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-01-03 19:50:14 +01:00
2005-10-07 Robert Love <rml@novell.com>
* Cleanup prototypes: put some functions in header files and mark
others as 'static' -- feel free to invert
* src/vpn-manager/nm-dbus-vpn.c: remove prototype of
nm_vpn_manager_vpn_connection_list_copy()
* src/vpn-manager/nm-vpn-act-request.c: remove prototype of
nm_vpn_service_get_dbus_connection()
* src/vpn-manager/nm-vpn-manager.h: add prototypes for
nm_vpn_manager_vpn_connection_list_copy()
* src/vpn-manager/nm-vpn-service.c: Make
nm_vpn_service_act_request_failed() and
nm_vpn_service_stage2_daemon_wait() static.
* src/vpn-manager/nm-vpn-service.h: add prototype for
nm_vpn_service_get_dbus_connection()
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@999 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
parent
75d768a24f
commit
1b3017ff68
6 changed files with 22 additions and 9 deletions
15
ChangeLog
15
ChangeLog
|
|
@ -1,3 +1,18 @@
|
|||
2005-10-07 Robert Love <rml@novell.com>
|
||||
|
||||
* Cleanup prototypes: put some functions in header files and mark
|
||||
others as 'static' -- feel free to invert
|
||||
* src/vpn-manager/nm-dbus-vpn.c: remove prototype of
|
||||
nm_vpn_manager_vpn_connection_list_copy()
|
||||
* src/vpn-manager/nm-vpn-act-request.c: remove prototype of
|
||||
nm_vpn_service_get_dbus_connection()
|
||||
* src/vpn-manager/nm-vpn-manager.h: add prototypes for
|
||||
nm_vpn_manager_vpn_connection_list_copy()
|
||||
* src/vpn-manager/nm-vpn-service.c: Make nm_vpn_service_act_request_failed
|
||||
and nm_vpn_service_stage2_daemon_wait static.
|
||||
* src/vpn-manager/nm-vpn-service.h: add prototype for
|
||||
nm_vpn_service_get_dbus_connection()
|
||||
|
||||
2005-10-06 Christopher Aillon <caillon@redhat.com>
|
||||
|
||||
* gnome/applet/applet.c:
|
||||
|
|
|
|||
|
|
@ -399,9 +399,6 @@ out:
|
|||
}
|
||||
|
||||
|
||||
/* Should only be used by nm_dbus_vpn_connections_update_cb() */
|
||||
GSList *nm_vpn_manager_vpn_connection_list_copy (NMVPNManager *manager);
|
||||
|
||||
/*
|
||||
* nm_dbus_vpn_connections_update_cb
|
||||
*
|
||||
|
|
|
|||
|
|
@ -47,10 +47,6 @@ struct NMVPNActRequest
|
|||
};
|
||||
|
||||
|
||||
/* Ugly, I know. But we need it for now */
|
||||
DBusConnection *nm_vpn_service_get_dbus_connection (NMVPNService *service);
|
||||
|
||||
|
||||
NMVPNActRequest *nm_vpn_act_request_new (NMVPNManager *manager, NMVPNService *service, NMVPNConnection *vpn,
|
||||
NMDevice *parent_dev, char **password_items, int password_count, char **data_items, int data_count)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -34,6 +34,8 @@ void nm_vpn_manager_dispose (NMVPNManager *manager);
|
|||
|
||||
NMVPNActRequest * nm_vpn_manager_get_vpn_act_request (NMVPNManager *manager);
|
||||
|
||||
GSList * nm_vpn_manager_vpn_connection_list_copy (NMVPNManager *manager);
|
||||
|
||||
void nm_vpn_manager_activate_vpn_connection (NMVPNManager *manager, NMVPNConnection *vpn, char **password_items,
|
||||
int password_count, char **data_items, int data_count);
|
||||
void nm_vpn_manager_deactivate_vpn_connection (NMVPNManager *manager, NMDevice *dev);
|
||||
|
|
|
|||
|
|
@ -230,7 +230,8 @@ static char *construct_op_from_service_name (const char *service_name)
|
|||
* has failed.
|
||||
*
|
||||
*/
|
||||
void nm_vpn_service_act_request_failed (NMVPNService *service, NMVPNActRequest *req)
|
||||
static void nm_vpn_service_act_request_failed (NMVPNService *service,
|
||||
NMVPNActRequest *req)
|
||||
{
|
||||
NMVPNConnection *vpn;
|
||||
|
||||
|
|
@ -368,7 +369,7 @@ static void nm_vpn_service_schedule_stage1_daemon_exec (NMVPNService *service, N
|
|||
* Wait until the VPN daemon has become active.
|
||||
*
|
||||
*/
|
||||
gboolean nm_vpn_service_stage2_daemon_wait (gpointer user_data)
|
||||
static gboolean nm_vpn_service_stage2_daemon_wait (gpointer user_data)
|
||||
{
|
||||
NMVPNActRequest * req = (NMVPNActRequest *) user_data;
|
||||
NMVPNService * service;
|
||||
|
|
|
|||
|
|
@ -45,6 +45,8 @@ void nm_vpn_service_set_service_name (NMVPNService *service, const char *name)
|
|||
const char * nm_vpn_service_get_program (NMVPNService *service);
|
||||
void nm_vpn_service_set_program (NMVPNService *service, const char *program);
|
||||
|
||||
DBusConnection* nm_vpn_service_get_dbus_connection (NMVPNService *service);
|
||||
|
||||
NMVPNState nm_vpn_service_get_state (NMVPNService *service);
|
||||
|
||||
gboolean nm_vpn_service_name_owner_changed (NMVPNService *service, NMVPNActRequest *req, const char *old, const char *new);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue