colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2005-06-21 Robert Love <rml@novell.com>

Browse Source 
* applet/applet-dbus-devices.c: mark non-static functions static.
	* applet/applet-dbus-vpn.c: (ditto)
	* applet/applet.c: (ditto)
	* applet/nm-device.h: (ditto)
	* applet/other-network-dialog.c: (ditto)
	* applet/passphrase-dialog.c: (ditto)
	* NetworkManager.c: (ditto)
	* NetworkManagerDbus.c: (ditto)
	* NetworkManagerDevice.c: (ditto)
	* NetworkManagerPolicy.c: (ditto)
	* NetworkManagerUtils.c: (ditto)
	* NetworkManagerWireless.c: (ditto)
	* NetworkManagerWireless.h: (ditto)
	* nm-netlink-monitor.c: (ditto)
	* applet/applet-dbus-info.c: (ditto), add FIXME's.
	* vpn-manager/nm-dbus-vpn.c: (ditto), remove shadowed variable.
	* autoip.c: include autoip.h.
	* autoip.h: new file.  define get_autoip().
	* nm-netlink-monitor.h: define nm_netlink_close_connection().
	* NetworkManagerDbus.h: remove duplicate definitions.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@728 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Robert Love
2005-06-21 15:07:01 +00:00
committed by Robert Love
parent adb425dc02
commit 28d334748b
18 changed files with 85 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ChangeLog
View File

@@ -1,3 +1,26 @@
2005-06-21 Robert Love <rml@novell.com>
* applet/applet-dbus-devices.c: mark non-static functions static.
* applet/applet-dbus-vpn.c: (ditto)
* applet/applet.c: (ditto)
* applet/nm-device.h: (ditto)
* applet/other-network-dialog.c: (ditto)
* applet/passphrase-dialog.c: (ditto)
* NetworkManager.c: (ditto)
* NetworkManagerDbus.c: (ditto)
* NetworkManagerDevice.c: (ditto)
* NetworkManagerPolicy.c: (ditto)
* NetworkManagerUtils.c: (ditto)
* NetworkManagerWireless.c: (ditto)
* NetworkManagerWireless.h: (ditto)
* nm-netlink-monitor.c: (ditto)
* applet/applet-dbus-info.c: (ditto), add FIXME's.
* vpn-manager/nm-dbus-vpn.c: (ditto), remove shadowed variable.
* autoip.c: include autoip.h.
* autoip.h: new file. define get_autoip().
* nm-netlink-monitor.h: define nm_netlink_close_connection().
* NetworkManagerDbus.h: remove duplicate definitions.
2005-06-20 Robert Love <rml@novell.com> 2005-06-20 Robert Love <rml@novell.com>
* Makefile.am: Add missing intltool-foo.in generated files to * Makefile.am: Add missing intltool-foo.in generated files to

26
gnome/applet/applet-dbus-devices.c
View File

@@ -44,7 +44,7 @@ void nmwa_dbus_devices_schedule_copy (NMWirelessApplet *applet);
* Callback from nmwa_dbus_update_nm_state * Callback from nmwa_dbus_update_nm_state
* *
*/ */
void nmwa_dbus_nm_state_cb (DBusPendingCall *pcall, void *user_data) static void nmwa_dbus_nm_state_cb (DBusPendingCall *pcall, void *user_data)
{ {
DBusMessage * reply; DBusMessage * reply;
NMWirelessApplet * applet = (NMWirelessApplet *) user_data; NMWirelessApplet * applet = (NMWirelessApplet *) user_data;
@@ -114,7 +114,7 @@ void nmwa_dbus_update_nm_state (NMWirelessApplet *applet)
* Callback from nmwa_dbus_update_wireless_enabled * Callback from nmwa_dbus_update_wireless_enabled
* *
*/ */
void nmwa_dbus_update_wireless_enabled_cb (DBusPendingCall *pcall, void *user_data) static void nmwa_dbus_update_wireless_enabled_cb (DBusPendingCall *pcall, void *user_data)
{ {
DBusMessage * reply; DBusMessage * reply;
NMWirelessApplet * applet = (NMWirelessApplet *) user_data; NMWirelessApplet * applet = (NMWirelessApplet *) user_data;
@@ -152,7 +152,7 @@ out:
* Get the wireless_enabled value from NetworkManager * Get the wireless_enabled value from NetworkManager
* *
*/ */
void nmwa_dbus_update_wireless_enabled (NMWirelessApplet *applet) static void nmwa_dbus_update_wireless_enabled (NMWirelessApplet *applet)
{ {
DBusMessage * message; DBusMessage * message;
DBusPendingCall * pcall = NULL; DBusPendingCall * pcall = NULL;
@@ -227,7 +227,7 @@ typedef struct HalInfoCBData
char * vendor; char * vendor;
} HalInfoCBData; } HalInfoCBData;
void free_hal_info_cb_data (HalInfoCBData *cb_data) static void free_hal_info_cb_data (HalInfoCBData *cb_data)
{ {
if (cb_data) if (cb_data)
{ {
@@ -497,7 +497,7 @@ void nmwa_free_dbus_data_model (NMWirelessApplet *applet)
* Copy the dbus data model over to the gui data model * Copy the dbus data model over to the gui data model
* *
*/ */
void nmwa_copy_data_model (NMWirelessApplet *applet) static void nmwa_copy_data_model (NMWirelessApplet *applet)
{ {
GSList *elt; GSList *elt;
NetworkDevice *act_dev = NULL; NetworkDevice *act_dev = NULL;
@@ -527,7 +527,7 @@ void nmwa_copy_data_model (NMWirelessApplet *applet)
* Schedule the driver notification routine to run in the main loop. * Schedule the driver notification routine to run in the main loop.
* *
*/ */
void nmwa_dbus_schedule_driver_notification (NMWirelessApplet *applet, NetworkDevice *dev) static void nmwa_dbus_schedule_driver_notification (NMWirelessApplet *applet, NetworkDevice *dev)
{ {
DriverNotifyCBData *cb_data; DriverNotifyCBData *cb_data;
@@ -550,7 +550,7 @@ void nmwa_dbus_schedule_driver_notification (NMWirelessApplet *applet, NetworkDe
* has any problems (no carrier detect, no wireless scanning, etc). * has any problems (no carrier detect, no wireless scanning, etc).
* *
*/ */
void nmwa_dbus_check_drivers (NMWirelessApplet *applet) static void nmwa_dbus_check_drivers (NMWirelessApplet *applet)
{ {
GSList *elt; GSList *elt;
@@ -593,7 +593,7 @@ typedef struct NetPropCBData
NMWirelessApplet * applet; NMWirelessApplet * applet;
} NetPropCBData; } NetPropCBData;
void free_net_prop_cb_data (NetPropCBData *data) static void free_net_prop_cb_data (NetPropCBData *data)
{ {
if (data) if (data)
{ {
@@ -610,7 +610,7 @@ void free_net_prop_cb_data (NetPropCBData *data)
* Callback for each network we called "getProperties" on in nmwa_dbus_device_properties_cb(). * Callback for each network we called "getProperties" on in nmwa_dbus_device_properties_cb().
* *
*/ */
void nmwa_dbus_net_properties_cb (DBusPendingCall *pcall, void *user_data) static void nmwa_dbus_net_properties_cb (DBusPendingCall *pcall, void *user_data)
{ {
DBusMessage * reply; DBusMessage * reply;
NetPropCBData * cb_data = (NetPropCBData *) user_data; NetPropCBData * cb_data = (NetPropCBData *) user_data;
@@ -756,7 +756,7 @@ void nmwa_dbus_device_remove_one_network (NMWirelessApplet *applet, const char *
* Callback for each device we called "getProperties" on in nmwa_dbus_update_devices_cb(). * Callback for each device we called "getProperties" on in nmwa_dbus_update_devices_cb().
* *
*/ */
void nmwa_dbus_device_properties_cb (DBusPendingCall *pcall, void *user_data) static void nmwa_dbus_device_properties_cb (DBusPendingCall *pcall, void *user_data)
{ {
DBusMessage * reply; DBusMessage * reply;
NMWirelessApplet * applet = (NMWirelessApplet *) user_data; NMWirelessApplet * applet = (NMWirelessApplet *) user_data;
@@ -891,7 +891,7 @@ void nmwa_dbus_device_update_one_device (NMWirelessApplet *applet, const char *d
* nmwa_dbus_update_devices callback. * nmwa_dbus_update_devices callback.
* *
*/ */
void nmwa_dbus_update_devices_cb (DBusPendingCall *pcall, void *user_data) static void nmwa_dbus_update_devices_cb (DBusPendingCall *pcall, void *user_data)
{ {
DBusMessage * reply; DBusMessage * reply;
NMWirelessApplet * applet = (NMWirelessApplet *) user_data; NMWirelessApplet * applet = (NMWirelessApplet *) user_data;
@@ -1091,7 +1091,7 @@ typedef struct StrengthCBData
} StrengthCBData; } StrengthCBData;
void free_strength_cb_data (StrengthCBData *data) static void free_strength_cb_data (StrengthCBData *data)
{ {
if (data) if (data)
g_free (data->dev_path); g_free (data->dev_path);
@@ -1105,7 +1105,7 @@ void free_strength_cb_data (StrengthCBData *data)
* nmwa_dbus_update_device_strength callback. * nmwa_dbus_update_device_strength callback.
* *
*/ */
void nmwa_dbus_update_device_strength_cb (DBusPendingCall *pcall, void *user_data) static void nmwa_dbus_update_device_strength_cb (DBusPendingCall *pcall, void *user_data)
{ {
DBusMessage * reply; DBusMessage * reply;
StrengthCBData * cb_data = user_data; StrengthCBData * cb_data = user_data;

4
gnome/applet/applet-dbus-info.c
View File

@@ -43,7 +43,7 @@
* Helper to validate network types NMI can deal with * Helper to validate network types NMI can deal with
* *
*/ */
inline gboolean nmi_network_type_valid (NMNetworkType type) static inline gboolean nmi_network_type_valid (NMNetworkType type)
{ {
return ((type == NETWORK_TYPE_ALLOWED)); return ((type == NETWORK_TYPE_ALLOWED));
} }
@@ -377,6 +377,7 @@ static DBusMessage *nmi_dbus_get_network_properties (NMWirelessApplet *applet, D
ap_addrs_value = gconf_client_get (applet->gconf_client, gconf_key, NULL); ap_addrs_value = gconf_client_get (applet->gconf_client, gconf_key, NULL);
g_free (gconf_key); g_free (gconf_key);
/* FIXME: key_type is always nonnegative as it is unsigned */
if (!essid || (timestamp < 0) || (key_type < 0)) if (!essid || (timestamp < 0) || (key_type < 0))
{ {
if (!essid) if (!essid)
@@ -389,6 +390,7 @@ static DBusMessage *nmi_dbus_get_network_properties (NMWirelessApplet *applet, D
reply = nmwa_dbus_create_error_message (message, NMI_DBUS_INTERFACE, "BadNetworkData", reply = nmwa_dbus_create_error_message (message, NMI_DBUS_INTERFACE, "BadNetworkData",
"NetworkManagerInfo::getNetworkProperties could not access timestamp for network '%s'", network); "NetworkManagerInfo::getNetworkProperties could not access timestamp for network '%s'", network);
} }
/* FIXME: key_type is always nonnegative as it is unsigned */
else if (key_type < 0) else if (key_type < 0)
{ {
reply = nmwa_dbus_create_error_message (message, NMI_DBUS_INTERFACE, "BadNetworkData", reply = nmwa_dbus_create_error_message (message, NMI_DBUS_INTERFACE, "BadNetworkData",

8
gnome/applet/applet-dbus-vpn.c
View File

@@ -44,7 +44,7 @@ static void nmwa_dbus_vpn_schedule_copy (NMWirelessApplet *applet);
* Callback from nmwa_dbus_vpn_get_active_vpn_connection * Callback from nmwa_dbus_vpn_get_active_vpn_connection
* *
*/ */
void nmwa_dbus_vpn_get_active_vpn_connection_cb (DBusPendingCall *pcall, void *user_data) static void nmwa_dbus_vpn_get_active_vpn_connection_cb (DBusPendingCall *pcall, void *user_data)
{ {
DBusMessage * reply; DBusMessage * reply;
NMWirelessApplet * applet = (NMWirelessApplet *) user_data; NMWirelessApplet * applet = (NMWirelessApplet *) user_data;
@@ -125,7 +125,7 @@ typedef struct VpnPropsCBData
char * name; char * name;
} VpnPropsCBData; } VpnPropsCBData;
void free_vpn_props_cb_data (VpnPropsCBData *data) static void free_vpn_props_cb_data (VpnPropsCBData *data)
{ {
if (data) if (data)
{ {
@@ -141,7 +141,7 @@ void free_vpn_props_cb_data (VpnPropsCBData *data)
* Callback for each VPN connection we called "getVPNConnectionProperties" on. * Callback for each VPN connection we called "getVPNConnectionProperties" on.
* *
*/ */
void nmwa_dbus_vpn_properties_cb (DBusPendingCall *pcall, void *user_data) static void nmwa_dbus_vpn_properties_cb (DBusPendingCall *pcall, void *user_data)
{ {
DBusMessage * reply; DBusMessage * reply;
VpnPropsCBData * cb_data = user_data; VpnPropsCBData * cb_data = user_data;
@@ -248,7 +248,7 @@ void nmwa_dbus_vpn_update_one_vpn_connection (NMWirelessApplet *applet, const ch
* nmwa_dbus_vpn_update_vpn_connections callback. * nmwa_dbus_vpn_update_vpn_connections callback.
* *
*/ */
void nmwa_dbus_vpn_update_vpn_connections_cb (DBusPendingCall *pcall, void *user_data) static void nmwa_dbus_vpn_update_vpn_connections_cb (DBusPendingCall *pcall, void *user_data)
{ {
DBusMessage * reply; DBusMessage * reply;
NMWirelessApplet * applet = (NMWirelessApplet *) user_data; NMWirelessApplet * applet = (NMWirelessApplet *) user_data;

18
gnome/applet/applet.c
View File

@@ -404,7 +404,7 @@ void nmwa_schedule_vpn_login_banner_dialog (NMWirelessApplet *applet, const char
* notifications for from GConf. * notifications for from GConf.
* *
*/ */
GSList *nmwa_driver_notify_get_ignored_list (NMWirelessApplet *applet) static GSList *nmwa_driver_notify_get_ignored_list (NMWirelessApplet *applet)
{ {
char *key; char *key;
GConfValue *value; GConfValue *value;
@@ -435,7 +435,7 @@ GSList *nmwa_driver_notify_get_ignored_list (NMWirelessApplet *applet)
* ignore driver notifications for a particular device. * ignore driver notifications for a particular device.
* *
*/ */
gboolean nmwa_driver_notify_is_device_ignored (NMWirelessApplet *applet, NetworkDevice *dev) static gboolean nmwa_driver_notify_is_device_ignored (NMWirelessApplet *applet, NetworkDevice *dev)
{ {
gboolean found = FALSE; gboolean found = FALSE;
GSList * mac_list = NULL; GSList * mac_list = NULL;
@@ -477,7 +477,7 @@ gboolean nmwa_driver_notify_is_device_ignored (NMWirelessApplet *applet, Network
* in GConf. Stores user's pref for "Don't remind me". * in GConf. Stores user's pref for "Don't remind me".
* *
*/ */
void nmwa_driver_notify_ignore_device (NMWirelessApplet *applet, NetworkDevice *dev) static void nmwa_driver_notify_ignore_device (NMWirelessApplet *applet, NetworkDevice *dev)
{ {
gboolean found = FALSE; gboolean found = FALSE;
GSList * new_mac_list = NULL; GSList * new_mac_list = NULL;
@@ -519,13 +519,13 @@ void nmwa_driver_notify_ignore_device (NMWirelessApplet *applet, NetworkDevice *
g_slist_free (new_mac_list); g_slist_free (new_mac_list);
} }
gboolean nmwa_driver_notify_dialog_delete_cb (GtkWidget *widget, GdkEvent *event, gpointer user_data) static gboolean nmwa_driver_notify_dialog_delete_cb (GtkWidget *widget, GdkEvent *event, gpointer user_data)
{ {
gtk_widget_destroy (widget); gtk_widget_destroy (widget);
return FALSE; return FALSE;
} }
gboolean nmwa_driver_notify_dialog_destroy_cb (GtkWidget *widget, GdkEvent *event, gpointer user_data) static gboolean nmwa_driver_notify_dialog_destroy_cb (GtkWidget *widget, GdkEvent *event, gpointer user_data)
{ {
DriverNotifyCBData *cb_data = (DriverNotifyCBData *)(user_data); DriverNotifyCBData *cb_data = (DriverNotifyCBData *)(user_data);
NetworkDevice *dev; NetworkDevice *dev;
@@ -545,7 +545,7 @@ gboolean nmwa_driver_notify_dialog_destroy_cb (GtkWidget *widget, GdkEvent *even
} }
gboolean nmwa_driver_notify_ok_cb (GtkButton *button, gpointer user_data) static gboolean nmwa_driver_notify_ok_cb (GtkButton *button, gpointer user_data)
{ {
DriverNotifyCBData *cb_data = (DriverNotifyCBData *)(user_data); DriverNotifyCBData *cb_data = (DriverNotifyCBData *)(user_data);
NetworkDevice *dev; NetworkDevice *dev;
@@ -962,7 +962,7 @@ static void nmwa_start_redraw_timeout (NMWirelessApplet *applet)
* pop up a warning or error dialog with certain text * pop up a warning or error dialog with certain text
* *
*/ */
gboolean show_warning_dialog (char *mesg) static gboolean show_warning_dialog (char *mesg)
{ {
GtkWidget * dialog; GtkWidget * dialog;
guint32 timestamp; guint32 timestamp;
@@ -1372,7 +1372,7 @@ typedef struct AddNetworksCB
* nmwa_add_networks_helper * nmwa_add_networks_helper
* *
*/ */
void nmwa_add_networks_helper (NetworkDevice *dev, WirelessNetwork *net, gpointer user_data) static void nmwa_add_networks_helper (NetworkDevice *dev, WirelessNetwork *net, gpointer user_data)
{ {
AddNetworksCB * cb_data = (AddNetworksCB *)user_data; AddNetworksCB * cb_data = (AddNetworksCB *)user_data;
NMNetworkMenuItem * item; NMNetworkMenuItem * item;
@@ -1405,7 +1405,7 @@ void nmwa_add_networks_helper (NetworkDevice *dev, WirelessNetwork *net, gpointe
* nmwa_has_encrypted_networks_helper * nmwa_has_encrypted_networks_helper
* *
*/ */
void nmwa_has_encrypted_networks_helper (NetworkDevice *dev, WirelessNetwork *net, gpointer user_data) static void nmwa_has_encrypted_networks_helper (NetworkDevice *dev, WirelessNetwork *net, gpointer user_data)
{ {
gboolean * has_encrypted = user_data; gboolean * has_encrypted = user_data;

2
gnome/applet/nm-device.h
View File

@@ -70,8 +70,6 @@ const char * network_device_get_nm_path (NetworkDevice *dev);
gint network_device_get_strength (NetworkDevice *dev); gint network_device_get_strength (NetworkDevice *dev);
void network_device_set_strength (NetworkDevice *dev, gint strength); void network_device_set_strength (NetworkDevice *dev, gint strength);
const char * network_device_get_iface (NetworkDevice *dev);
const char * network_device_get_hal_udi (NetworkDevice *dev); const char * network_device_get_hal_udi (NetworkDevice *dev);
void network_device_set_hal_udi (NetworkDevice *dev, const char *hal_udi); void network_device_set_hal_udi (NetworkDevice *dev, const char *hal_udi);

4
gnome/applet/other-network-dialog.c
View File

@@ -133,7 +133,7 @@ static GtkTreeModel *create_wireless_adapter_model (NMWirelessApplet *applet)
* key type. * key type.
* *
*/ */
void nmwa_other_network_dialog_key_type_combo_changed (GtkWidget *key_type_combo, gpointer user_data) static void nmwa_other_network_dialog_key_type_combo_changed (GtkWidget *key_type_combo, gpointer user_data)
{ {
GtkLabel *entry_label; GtkLabel *entry_label;
int combo_choice; int combo_choice;
@@ -168,7 +168,7 @@ void nmwa_other_network_dialog_key_type_combo_changed (GtkWidget *key_type_combo
* widget's status. * widget's status.
* *
*/ */
void nmwa_other_network_dialog_enc_check_toggled (GtkWidget *enc_check_button, gpointer user_data) static void nmwa_other_network_dialog_enc_check_toggled (GtkWidget *enc_check_button, gpointer user_data)
{ {
GladeXML *xml = (GladeXML *)user_data; GladeXML *xml = (GladeXML *)user_data;
GtkComboBox *combo; GtkComboBox *combo;

8
gnome/applet/passphrase-dialog.c
View File

@@ -100,7 +100,7 @@ static void update_button_cb (GtkWidget *widget, GladeXML *xml)
* clear the passphrase entry, and hide the dialog. * clear the passphrase entry, and hide the dialog.
* *
*/ */
void nmi_passphrase_dialog_clear (GtkWidget *dialog) static void nmi_passphrase_dialog_clear (GtkWidget *dialog)
{ {
char * data; char * data;
GtkWidget * entry = NULL; GtkWidget * entry = NULL;
@@ -143,7 +143,7 @@ void nmi_passphrase_dialog_clear (GtkWidget *dialog)
* key type. * key type.
* *
*/ */
void nmi_passphrase_dialog_key_type_combo_changed (GtkWidget *key_type_combo, gpointer user_data) static void nmi_passphrase_dialog_key_type_combo_changed (GtkWidget *key_type_combo, gpointer user_data)
{ {
GtkWidget * dialog = gtk_widget_get_toplevel (key_type_combo); GtkWidget * dialog = gtk_widget_get_toplevel (key_type_combo);
@@ -181,7 +181,7 @@ void nmi_passphrase_dialog_key_type_combo_changed (GtkWidget *key_type_combo, gp
* to NetworkManager. Get rid of the dialog. * to NetworkManager. Get rid of the dialog.
* *
*/ */
void nmi_passphrase_dialog_ok_clicked (GtkWidget *ok_button, gpointer user_data) static void nmi_passphrase_dialog_ok_clicked (GtkWidget *ok_button, gpointer user_data)
{ {
GtkWidget * dialog = gtk_widget_get_toplevel (ok_button); GtkWidget * dialog = gtk_widget_get_toplevel (ok_button);
NMWirelessApplet * applet = (NMWirelessApplet *)user_data; NMWirelessApplet * applet = (NMWirelessApplet *)user_data;
@@ -261,7 +261,7 @@ void nmi_passphrase_dialog_ok_clicked (GtkWidget *ok_button, gpointer user_data)
* and get rid of the dialog. * and get rid of the dialog.
* *
*/ */
void nmi_passphrase_dialog_cancel_clicked (GtkWidget *cancel_button, gpointer user_data) static void nmi_passphrase_dialog_cancel_clicked (GtkWidget *cancel_button, gpointer user_data)
{ {
GtkWidget * dialog = gtk_widget_get_toplevel (cancel_button); GtkWidget * dialog = gtk_widget_get_toplevel (cancel_button);
NMWirelessApplet * applet = (NMWirelessApplet *)user_data; NMWirelessApplet * applet = (NMWirelessApplet *)user_data;

2
src/NetworkManager.c
View File

@@ -544,7 +544,7 @@ static void nm_print_usage (void)
* or not. * or not.
* *
*/ */
gboolean nm_poll_and_update_wireless_link_state (NMData *data) static gboolean nm_poll_and_update_wireless_link_state (NMData *data)
{ {
GSList * elt; GSList * elt;
GSList * copy = NULL; GSList * copy = NULL;

8
src/NetworkManagerDbus.c
View File

@@ -711,7 +711,7 @@ typedef struct GetOneNetworkCBData
} GetOneNetworkCBData; } GetOneNetworkCBData;
void free_get_one_network_cb_data (GetOneNetworkCBData *data) static void free_get_one_network_cb_data (GetOneNetworkCBData *data)
{ {
if (data) if (data)
{ {
@@ -731,7 +731,7 @@ typedef struct GetNetworksCBData
} GetNetworksCBData; } GetNetworksCBData;
void free_get_networks_cb_data (GetNetworksCBData *data) static void free_get_networks_cb_data (GetNetworksCBData *data)
{ {
if (data) if (data)
{ {
@@ -748,7 +748,7 @@ void free_get_networks_cb_data (GetNetworksCBData *data)
* Add a new NMAccessPoint to the allowed list with the correct properties * Add a new NMAccessPoint to the allowed list with the correct properties
* *
*/ */
void nm_dbus_get_network_data_cb (DBusPendingCall *pcall, void *user_data) static void nm_dbus_get_network_data_cb (DBusPendingCall *pcall, void *user_data)
{ {
GetOneNetworkCBData * cb_data = (GetOneNetworkCBData *)user_data; GetOneNetworkCBData * cb_data = (GetOneNetworkCBData *)user_data;
DBusMessage * reply; DBusMessage * reply;
@@ -856,7 +856,7 @@ out:
* Async callback from nm_dbus_get_networks * Async callback from nm_dbus_get_networks
* *
*/ */
void nm_dbus_get_networks_cb (DBusPendingCall *pcall, void *user_data) static void nm_dbus_get_networks_cb (DBusPendingCall *pcall, void *user_data)
{ {
DBusMessage * reply; DBusMessage * reply;
DBusMessageIter iter, array_iter; DBusMessageIter iter, array_iter;

3
src/NetworkManagerDbus.h
View File

@@ -80,9 +80,6 @@ gboolean nm_dbus_update_network_auth_method (DBusConnection *connection, const
void nm_dbus_update_allowed_networks (DBusConnection *connection, NMAccessPointList *list, NMData *data); void nm_dbus_update_allowed_networks (DBusConnection *connection, NMAccessPointList *list, NMData *data);
DBusMessage * nm_dbus_create_error_message (DBusMessage *message, const char *exception_namespace,
const char *exception, const char *format, ...);
NMDevice * nm_dbus_get_device_from_object_path (NMData *data, const char *path); NMDevice * nm_dbus_get_device_from_object_path (NMData *data, const char *path);
NMState nm_get_app_state_from_data (NMData *data); NMState nm_get_app_state_from_data (NMData *data);

25
src/NetworkManagerDevice.c
View File

@@ -27,6 +27,7 @@
#include <signal.h> #include <signal.h>
#include <string.h> #include <string.h>
#include "autoip.h"
#include "NetworkManager.h" #include "NetworkManager.h"
#include "NetworkManagerMain.h" #include "NetworkManagerMain.h"
#include "NetworkManagerDevice.h" #include "NetworkManagerDevice.h"
@@ -43,8 +44,6 @@
#include "nm-activation-request.h" #include "nm-activation-request.h"
#include "nm-utils.h" #include "nm-utils.h"
extern gboolean get_autoip (NMDevice *dev, struct in_addr *out_ip);
/* Local static prototypes */ /* Local static prototypes */
static gpointer nm_device_worker (gpointer user_data); static gpointer nm_device_worker (gpointer user_data);
static gboolean nm_device_wireless_scan (gpointer user_data); static gboolean nm_device_wireless_scan (gpointer user_data);
@@ -575,7 +574,7 @@ void nm_device_set_removed (NMDevice *dev, const gboolean removed)
* to get a link, based on the # of frequencies it has to * to get a link, based on the # of frequencies it has to
* scan. * scan.
*/ */
gint nm_device_get_association_pause_value (NMDevice *dev) static gint nm_device_get_association_pause_value (NMDevice *dev)
{ {
g_return_val_if_fail (dev != NULL, -1); g_return_val_if_fail (dev != NULL, -1);
g_return_val_if_fail (nm_device_is_wireless (dev), -1); g_return_val_if_fail (nm_device_is_wireless (dev), -1);
@@ -1029,7 +1028,7 @@ void nm_device_set_essid (NMDevice *dev, const char *essid)
* For wireless devices, get the frequency we broadcast/receive on. * For wireless devices, get the frequency we broadcast/receive on.
* *
*/ */
double nm_device_get_frequency (NMDevice *dev) static double nm_device_get_frequency (NMDevice *dev)
{ {
NMSock *sk; NMSock *sk;
int err; int err;
@@ -1068,7 +1067,7 @@ double nm_device_get_frequency (NMDevice *dev)
* A frequency <= 0 means "auto". * A frequency <= 0 means "auto".
* *
*/ */
void nm_device_set_frequency (NMDevice *dev, const double freq) static void nm_device_set_frequency (NMDevice *dev, const double freq)
{ {
NMSock *sk; NMSock *sk;
int err; int err;
@@ -1146,7 +1145,7 @@ void nm_device_set_frequency (NMDevice *dev, const double freq)
* Returned value is rate in KHz. * Returned value is rate in KHz.
* *
*/ */
int nm_device_get_bitrate (NMDevice *dev) static int nm_device_get_bitrate (NMDevice *dev)
{ {
NMSock *sk; NMSock *sk;
int err = -1; int err = -1;
@@ -1179,7 +1178,7 @@ int nm_device_get_bitrate (NMDevice *dev)
* Rate argument should be in Mbps (mega-bits per second), or 0 for automatic. * Rate argument should be in Mbps (mega-bits per second), or 0 for automatic.
* *
*/ */
void nm_device_set_bitrate (NMDevice *dev, const int Mbps) static void nm_device_set_bitrate (NMDevice *dev, const int Mbps)
{ {
NMSock *sk; NMSock *sk;
@@ -1632,7 +1631,7 @@ gboolean nm_device_is_up (NMDevice *dev)
/* I really wish nm_v_wait_for_completion_or_timeout could translate these /* I really wish nm_v_wait_for_completion_or_timeout could translate these
* to first class args instead of a all this void * arg stuff, so these * to first class args instead of a all this void * arg stuff, so these
* helpers could be nice and _tiny_. */ * helpers could be nice and _tiny_. */
gboolean nm_completion_device_is_up_test (int tries, nm_completion_args args) static gboolean nm_completion_device_is_up_test (int tries, nm_completion_args args)
{ {
NMDevice *dev = args[0]; NMDevice *dev = args[0];
gboolean *err = args[1]; gboolean *err = args[1];
@@ -1683,7 +1682,7 @@ void nm_device_bring_down (NMDevice *dev)
nm_device_set_up_down (dev, FALSE); nm_device_set_up_down (dev, FALSE);
} }
gboolean nm_completion_device_is_down_test (int tries, nm_completion_args args) static gboolean nm_completion_device_is_down_test (int tries, nm_completion_args args)
{ {
NMDevice *dev = args[0]; NMDevice *dev = args[0];
gboolean *err = args[1]; gboolean *err = args[1];
@@ -1702,7 +1701,7 @@ gboolean nm_completion_device_is_down_test (int tries, nm_completion_args args)
return FALSE; return FALSE;
} }
gboolean nm_device_bring_down_wait (NMDevice *dev, gboolean cancelable) static gboolean nm_device_bring_down_wait (NMDevice *dev, gboolean cancelable)
{ {
gboolean err = FALSE; gboolean err = FALSE;
nm_completion_args args; nm_completion_args args;
@@ -1880,7 +1879,7 @@ gboolean nm_device_activation_start (NMActRequest *req)
* Cancel activation on a device and clean up. * Cancel activation on a device and clean up.
* *
*/ */
gboolean nm_device_activation_handle_cancel (NMActRequest *req) static gboolean nm_device_activation_handle_cancel (NMActRequest *req)
{ {
NMDevice * dev; NMDevice * dev;
NMData * data; NMData * data;
@@ -1911,7 +1910,7 @@ gboolean nm_device_activation_handle_cancel (NMActRequest *req)
* Schedule the activation cancel handler * Schedule the activation cancel handler
* *
*/ */
void nm_device_schedule_activation_handle_cancel (NMActRequest *req) static void nm_device_schedule_activation_handle_cancel (NMActRequest *req)
{ {
NMDevice * dev; NMDevice * dev;
NMData * data; NMData * data;
@@ -3050,7 +3049,7 @@ gboolean nm_device_is_activating (NMDevice *dev)
* Return whether or not the device is successfully activated. * Return whether or not the device is successfully activated.
* *
*/ */
gboolean nm_device_is_activated (NMDevice *dev) static gboolean nm_device_is_activated (NMDevice *dev)
{ {
NMActRequest * req; NMActRequest * req;
NMActStage stage; NMActStage stage;

2
src/NetworkManagerPolicy.c
View File

@@ -44,7 +44,7 @@
* on the main thread. * on the main thread.
* *
*/ */
gboolean nm_policy_activation_finish (NMActRequest *req) static gboolean nm_policy_activation_finish (NMActRequest *req)
{ {
NMDevice *dev = NULL; NMDevice *dev = NULL;
NMAccessPoint *ap = NULL; NMAccessPoint *ap = NULL;

4
src/NetworkManagerUtils.c
View File

@@ -461,7 +461,7 @@ static char *nm_get_device_driver_name (LibHalContext *ctx, NMDevice *dev)
* Blacklist certain wireless devices. * Blacklist certain wireless devices.
* *
*/ */
NMDriverSupportLevel nm_get_wireless_driver_support_level (LibHalContext *ctx, NMDevice *dev, char **driver) static NMDriverSupportLevel nm_get_wireless_driver_support_level (LibHalContext *ctx, NMDevice *dev, char **driver)
{ {
NMDriverSupportLevel level = NM_DRIVER_FULLY_SUPPORTED; NMDriverSupportLevel level = NM_DRIVER_FULLY_SUPPORTED;
char *driver_name = NULL; char *driver_name = NULL;
@@ -500,7 +500,7 @@ NMDriverSupportLevel nm_get_wireless_driver_support_level (LibHalContext *ctx, N
* Blacklist certain devices. * Blacklist certain devices.
* *
*/ */
NMDriverSupportLevel nm_get_wired_driver_support_level (LibHalContext *ctx, NMDevice *dev, char **driver) static NMDriverSupportLevel nm_get_wired_driver_support_level (LibHalContext *ctx, NMDevice *dev, char **driver)
{ {
NMDriverSupportLevel level = NM_DRIVER_FULLY_SUPPORTED; NMDriverSupportLevel level = NM_DRIVER_FULLY_SUPPORTED;
char *driver_name = NULL; char *driver_name = NULL;

1
src/autoip.c
View File

@@ -34,6 +34,7 @@
#include "NetworkManagerMain.h" #include "NetworkManagerMain.h"
#include "NetworkManagerUtils.h" #include "NetworkManagerUtils.h"
#include "nm-utils.h" #include "nm-utils.h"
#include "autoip.h"
// Times here are in seconds // Times here are in seconds
#define LINKLOCAL_ADDR 0xa9fe0000 #define LINKLOCAL_ADDR 0xa9fe0000

2
src/nm-netlink-monitor.c
View File

@@ -205,7 +205,7 @@ nm_netlink_monitor_open_connection (NmNetlinkMonitor *monitor,
return TRUE; return TRUE;
} }
void static void
nm_netlink_monitor_close_connection (NmNetlinkMonitor *monitor) nm_netlink_monitor_close_connection (NmNetlinkMonitor *monitor)
{ {
g_return_if_fail (monitor->priv->io_channel != NULL); g_return_if_fail (monitor->priv->io_channel != NULL);

3
src/nm-netlink-monitor.h
View File

@@ -82,6 +82,9 @@ gboolean
nm_netlink_monitor_open_connection (NmNetlinkMonitor *monitor, nm_netlink_monitor_open_connection (NmNetlinkMonitor *monitor,
GError **error); GError **error);
void
nm_netlink_monitor_close_connection (NmNetlinkMonitor *monitor);
void nm_netlink_monitor_attach (NmNetlinkMonitor *monitor, void nm_netlink_monitor_attach (NmNetlinkMonitor *monitor,
GMainContext *context); GMainContext *context);
void nm_netlink_monitor_detach (NmNetlinkMonitor *monitor); void nm_netlink_monitor_detach (NmNetlinkMonitor *monitor);

5
src/vpn-manager/nm-dbus-vpn.c
View File

@@ -321,7 +321,7 @@ typedef struct UpdateOneVPNCBData
} UpdateOneVPNCBData; } UpdateOneVPNCBData;
void free_update_one_vpn_cb_data (UpdateOneVPNCBData *data) static void free_update_one_vpn_cb_data (UpdateOneVPNCBData *data)
{ {
if (data) if (data)
g_free (data->vpn); g_free (data->vpn);
@@ -334,7 +334,7 @@ void free_update_one_vpn_cb_data (UpdateOneVPNCBData *data)
* Retrieve and add to our VPN Manager one VPN connection from NMI. * Retrieve and add to our VPN Manager one VPN connection from NMI.
* *
*/ */
void nm_dbus_vpn_update_one_connection_cb (DBusPendingCall *pcall, void *user_data) static void nm_dbus_vpn_update_one_connection_cb (DBusPendingCall *pcall, void *user_data)
{ {
UpdateOneVPNCBData * cb_data = (UpdateOneVPNCBData *) user_data; UpdateOneVPNCBData * cb_data = (UpdateOneVPNCBData *) user_data;
DBusMessage * reply; DBusMessage * reply;
@@ -601,7 +601,6 @@ static DBusMessage *nm_dbus_vpn_get_vpn_connection_properties (DBusConnection *c
DBusMessage *reply = NULL; DBusMessage *reply = NULL;
DBusError error; DBusError error;
const char *name; const char *name;
const char *user_name;
gboolean good = FALSE; gboolean good = FALSE;
NMVPNConnection *vpn_con; NMVPNConnection *vpn_con;