fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-27 01:10:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

proxy/trivial: rename nm_pac_runner_manager*() functions

Browse source 
As the type is called NMPacRunnerManager, the proper name for the
functions is nm_pac_runner_manager*(). Alternatively, it the type
should be NMPacrunnerManager.
This commit is contained in:
Thomas Haller 2016-08-19 09:52:55 +02:00
parent a9820a63d4
commit 404f57a2a9
4 changed files with 35 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/devices/nm-device.c
View file

@ -11383,7 +11383,7 @@ _set_state_full (NMDevice *self,
}
/* Remove config from PacRunner */
nm_pacrunner_manager_remove (priv->pacrunner_manager, nm_device_get_ip_iface (self));
nm_pac_runner_manager_remove (priv->pacrunner_manager, nm_device_get_ip_iface (self));
break;
case NM_DEVICE_STATE_DISCONNECTED:
if ( priv->queued_act_request
@ -11409,11 +11409,11 @@ _set_state_full (NMDevice *self,
self, NULL, NULL, NULL);
if (priv->proxy_config) {
nm_pacrunner_manager_send (priv->pacrunner_manager,
nm_device_get_ip_iface (self),
priv->proxy_config,
priv->ip4_config,
priv->ip6_config);
nm_pac_runner_manager_send (priv->pacrunner_manager,
nm_device_get_ip_iface (self),
priv->proxy_config,
priv->ip4_config,
priv->ip6_config);
}
break;
case NM_DEVICE_STATE_FAILED:
@ -12231,7 +12231,7 @@ nm_device_init (NMDevice *self)
priv->available_connections = g_hash_table_new_full (g_direct_hash, g_direct_equal, g_object_unref, NULL);
priv->ip6_saved_properties = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, g_free);
priv->pacrunner_manager = g_object_ref (nm_pacrunner_manager_get ());
priv->pacrunner_manager = g_object_ref (nm_pac_runner_manager_get ());
priv->default_route.v4_is_assumed = TRUE;
priv->default_route.v6_is_assumed = TRUE;

26
src/nm-pacrunner-manager.c
View file

@ -57,7 +57,7 @@ struct _NMPacRunnerManagerClass {
GObjectClass parent;
};
G_DEFINE_TYPE (NMPacRunnerManager, nm_pacrunner_manager, G_TYPE_OBJECT)
G_DEFINE_TYPE (NMPacRunnerManager, nm_pac_runner_manager, G_TYPE_OBJECT)
#define NM_PACRUNNER_MANAGER_GET_PRIVATE(self) \
({ \
@ -337,7 +337,7 @@ pacrunner_proxy_cb (GObject *source, GAsyncResult *res, gpointer user_data)
}
/**
* nm_pacrunner_manager_send():
* nm_pac_runner_manager_send():
* @self: the #NMPacRunnerManager
* @iface: the iface for the connection or %NULL
* @proxy_config: Proxy config of the connection
@ -345,11 +345,11 @@ pacrunner_proxy_cb (GObject *source, GAsyncResult *res, gpointer user_data)
* @ip6_config: IP6 Config of the connection
*/
void
nm_pacrunner_manager_send (NMPacRunnerManager *self,
const char *iface,
NMProxyConfig *proxy_config,
NMIP4Config *ip4_config,
NMIP6Config *ip6_config)
nm_pac_runner_manager_send (NMPacRunnerManager *self,
const char *iface,
NMProxyConfig *proxy_config,
NMIP4Config *ip4_config,
NMIP6Config *ip6_config)
{
char **strv = NULL;
NMProxyConfigMethod method;
@ -439,13 +439,13 @@ pacrunner_remove_done (GObject *source, GAsyncResult *res, gpointer user_data)
}
/**
* nm_pacrunner_manager_remove():
* nm_pac_runner_manager_remove():
* @self: the #NMPacRunnerManager
* @iface: the iface for the connection to be removed
* from PacRunner
*/
void
nm_pacrunner_manager_remove (NMPacRunnerManager *self, const char *iface)
nm_pac_runner_manager_remove (NMPacRunnerManager *self, const char *iface)
{
NMPacRunnerManagerPrivate *priv = NM_PACRUNNER_MANAGER_GET_PRIVATE (self);
GList *list;
@ -467,10 +467,10 @@ nm_pacrunner_manager_remove (NMPacRunnerManager *self, const char *iface)
}
}
NM_DEFINE_SINGLETON_GETTER (NMPacRunnerManager, nm_pacrunner_manager_get, NM_TYPE_PACRUNNER_MANAGER);
NM_DEFINE_SINGLETON_GETTER (NMPacRunnerManager, nm_pac_runner_manager_get, NM_TYPE_PACRUNNER_MANAGER);
static void
nm_pacrunner_manager_init (NMPacRunnerManager *self)
nm_pac_runner_manager_init (NMPacRunnerManager *self)
{
NMPacRunnerManagerPrivate *priv = NM_PACRUNNER_MANAGER_GET_PRIVATE (self);
@ -504,11 +504,11 @@ dispose (GObject *object)
g_list_free_full (priv->remove, (GDestroyNotify) remove_data_destroy);
priv->remove = NULL;
G_OBJECT_CLASS (nm_pacrunner_manager_parent_class)->dispose (object);
G_OBJECT_CLASS (nm_pac_runner_manager_parent_class)->dispose (object);
}
static void
nm_pacrunner_manager_class_init (NMPacRunnerManagerClass *klass)
nm_pac_runner_manager_class_init (NMPacRunnerManagerClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);

18
src/nm-pacrunner-manager.h
View file

@ -21,7 +21,7 @@
#ifndef __NETWORKMANAGER_PACRUNNER_MANAGER_H__
#define __NETWORKMANAGER_PACRUNNER_MANAGER_H__
#define NM_TYPE_PACRUNNER_MANAGER (nm_pacrunner_manager_get_type ())
#define NM_TYPE_PACRUNNER_MANAGER (nm_pac_runner_manager_get_type ())
#define NM_PACRUNNER_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_PACRUNNER_MANAGER, NMPacRunnerManager))
#define NM_PACRUNNER_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_PACRUNNER_MANAGER, NMPacRunnerManagerClass))
#define NM_IS_PACRUNNER_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_PACRUNNER_MANAGER))
@ -30,16 +30,16 @@
typedef struct _NMPacRunnerManagerClass NMPacRunnerManagerClass;
GType nm_pacrunner_manager_get_type (void);
GType nm_pac_runner_manager_get_type (void);
NMPacRunnerManager *nm_pacrunner_manager_get (void);
NMPacRunnerManager *nm_pac_runner_manager_get (void);
void nm_pacrunner_manager_send (NMPacRunnerManager *self,
const char *iface,
NMProxyConfig *proxy_config,
NMIP4Config *ip4_config,
NMIP6Config *ip6_config);
void nm_pac_runner_manager_send (NMPacRunnerManager *self,
const char *iface,
NMProxyConfig *proxy_config,
NMIP4Config *ip4_config,
NMIP6Config *ip6_config);
void nm_pacrunner_manager_remove (NMPacRunnerManager *self, const char *iface);
void nm_pac_runner_manager_remove (NMPacRunnerManager *self, const char *iface);
#endif /* __NETWORKMANAGER_PACRUNNER_MANAGER_H__ */

12
src/vpn-manager/nm-vpn-connection.c
View file

@ -568,11 +568,11 @@ _set_vpn_state (NMVpnConnection *self,
NULL);
if (priv->proxy_config) {
nm_pacrunner_manager_send (nm_pacrunner_manager_get (),
priv->ip_iface,
priv->proxy_config,
priv->ip4_config,
priv->ip6_config);
nm_pac_runner_manager_send (nm_pac_runner_manager_get (),
priv->ip_iface,
priv->proxy_config,
priv->ip4_config,
priv->ip6_config);
}
break;
case STATE_DEACTIVATING:
@ -603,7 +603,7 @@ _set_vpn_state (NMVpnConnection *self,
}
/* Remove config from PacRunner */
nm_pacrunner_manager_remove (nm_pacrunner_manager_get(), priv->ip_iface);
nm_pac_runner_manager_remove (nm_pac_runner_manager_get(), priv->ip_iface);
break;
case STATE_FAILED:
case STATE_DISCONNECTED: