mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-04-30 23:48:05 +02:00
22e8b28790
* gnome/applet/applet-dbus-devices.c, gnome/applet/other-network-dialog.c, gnome/applet/wso-none.c, libnm-util/dbus-helpers.c, libnm-util/dbus-helpers.h, src/nm-dbus-nm.c: Fix several issues. 'Connect to Other' and 'Create New Network' both failed in the non-encrypted case because we were not appending the security options to the DBUS message. And 'Connect to Other' was also failing in the encrypted case because we were not incrementing to the next DBUS parameter. All fixed. Thanks to dcdw for some debugging help. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1276 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
59 lines
1.8 KiB
C
59 lines
1.8 KiB
C
/* NetworkManager Wireless Applet -- Display wireless access points and allow user control
|
|
*
|
|
* Dan Williams <dcbw@redhat.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*
|
|
* (C) Copyright 2005 Red Hat, Inc.
|
|
*/
|
|
|
|
#include <dbus/dbus.h>
|
|
|
|
#include "wireless-security-option.h"
|
|
#include "wso-none.h"
|
|
#include "wso-private.h"
|
|
#include "cipher.h"
|
|
#include "dbus-helpers.h"
|
|
|
|
|
|
static gboolean validate_input_func (WirelessSecurityOption *opt, const char *ssid, IEEE_802_11_Cipher ** out_cipher)
|
|
{
|
|
g_return_val_if_fail (opt != NULL, FALSE);
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
static gboolean append_dbus_params_func (WirelessSecurityOption *opt, const char *ssid, DBusMessage *message)
|
|
{
|
|
g_return_val_if_fail (opt != NULL, FALSE);
|
|
|
|
nmu_security_serialize_none_with_cipher (message);
|
|
return TRUE;
|
|
}
|
|
|
|
WirelessSecurityOption * wso_none_new (const char *glade_file)
|
|
{
|
|
WirelessSecurityOption * opt = NULL;
|
|
|
|
g_return_val_if_fail (glade_file != NULL, NULL);
|
|
|
|
opt = g_malloc0 (sizeof (WirelessSecurityOption));
|
|
opt->name = g_strdup (_("None"));
|
|
opt->validate_input_func = validate_input_func;
|
|
opt->append_dbus_params_func = append_dbus_params_func;
|
|
return opt;
|
|
}
|
|
|
|
|