diff options
author | Tambet Ingo <tambet@gmail.com> | 2007-10-09 08:57:35 +0000 |
---|---|---|
committer | Tambet Ingo <tambet@gmail.com> | 2007-10-09 08:57:35 +0000 |
commit | 24adbe3fa4e63ea552ee7ba1256800164c2a9cd5 (patch) | |
tree | 7918aeb2732a9165c6ad91a79cb50670d29cd032 /src/nm-dbus-manager.c | |
parent | 591dc59e1f644d1963798bfa69198321b8517ce9 (diff) | |
download | NetworkManager-24adbe3fa4e63ea552ee7ba1256800164c2a9cd5.tar.gz |
2007-10-09 Tambet Ingo <tambet@gmail.com>
* src/NetworkManagerUtils.c
(nm_utils_is_empty_ssid):
(nm_utils_escape_ssid):
(nm_utils_same_ssid): Remove. These functions are copied and
pasted in a
lot of places, so they belong to libnm-utils instead.
Now with 100% less compiler warnings:
* libnm-util/nm-utils.c (nm_dbus_escape_object_path): Remove,
* unused.
(nm_dbus_unescape_object_path): Ditto.
(nm_utils_ssid_to_utf8): Ditto.
(nm_utils_is_empty_ssid): Move here from
src/NetworkManagerUtils.c
(nm_utils_escape_ssid): Ditto.
(nm_utils_same_ssid): Ditto.
* src/nm-manager.c: Include 'netinet/ether.h' for ether_aton_r.
(add_one_connection_element): Remove an unused variable.
(impl_manager_get_active_connections): Ditto.
* src/NetworkManagerPolicy.c (get_device_connection): Remove an
* unused
variable.
* src/nm-dbus-manager.c (nm_dbus_manager_start_service): Remove
* a leftover
from the previous commit.
* src/nm-device-802-11-wireless.c (set_current_ap): Remove
* unused variable.
(real_act_stage1_prepare): Ditto.
(activation_success_handler): Ditto.
(get_property): Ditto.
* src/nm-device-802-3-ethernet.c (real_get_best_connection):
* Remove unused
variable.
* src/ppp-manager/nm-pppd-plugin.c (nm_ip_up): Remove the check
* for 'ifname',
it's always set.
* src/supplicant-manager/nm-supplicant-config.c
(nm_supplicant_config_add_setting_wireless): Cast the
GByteArray's 'guint8 *'
to expected "char *".
(nm_supplicant_config_add_setting_wireless): Ditto.
(nm_supplicant_config_remove_option): Remove, not used.
* libnm-glib/libnm-glib-test.c (dump_access_point): Frequency is
* a guint32,
not double.
(test_wireless_enabled): Ifdef out unused function.
(device_deactivate): Ditto.
(device_state_changed): Ditto.
(nm_utils_is_empty_ssid): Remove, it's now in libnm-utils.
(nm_utils_escape_ssid): Ditto.
* test/nm-tool.c (nm_utils_escape_ssid): Remove, it's now in
* libnm-utils.
(nm_utils_is_empty_ssid): Ditto.
* libnm-glib/nm-client.c
* (nm_client_free_active_connection_element): Remove
unused variable.
* libnm-util/nm-setting.c (setting_wireless_destroy): Remove
* unused variable.
(setting_vpn_properties_update_secrets): Ditto.
(int_to_gvalue): Ifdef out for now, not used.
(byte_to_gvalue): Ditto.
* libnm-util/dbus-dict-helpers.c
* (_nmu_dbus_add_dict_entry_string_array):
Unused, remove.
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2960 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
Diffstat (limited to 'src/nm-dbus-manager.c')
-rw-r--r-- | src/nm-dbus-manager.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/nm-dbus-manager.c b/src/nm-dbus-manager.c index 2e126bf425..de20eb674d 100644 --- a/src/nm-dbus-manager.c +++ b/src/nm-dbus-manager.c @@ -690,8 +690,7 @@ nm_dbus_manager_start_service (NMDBusManager *self) } if (request_name_result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) { - nm_warning ("Could not acquire the NetworkManager service as it is already taken.", - request_name_result); + nm_warning ("Could not acquire the NetworkManager service as it is already taken."); goto out; } |