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

2007-02-05 Tambet Ingo <tambet@ximian.com>

Browse Source 
* src/nm-device-802-11-wireless.c (supplicant_iface_scan_result_cb): 
	* src/supplicant-manager/nm-supplicant-interface.h
	* src/supplicant-manager/nm-supplicant-interface.c
	(nm_supplicant_interface_class_init): Change the "scan-result" signal's
	argument to boolean from enum.



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2287 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Tambet Ingo
2007-02-05 16:21:25 +00:00
committed by Tambet Ingo
parent d9ea10a633
commit b6680375d1
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,5 +1,11 @@
2007-02-05 Tambet Ingo <tambet@ximian.com> 2007-02-05 Tambet Ingo <tambet@ximian.com>
* src/nm-device-802-11-wireless.c (supplicant_iface_scan_result_cb):
* src/supplicant-manager/nm-supplicant-interface.h
* src/supplicant-manager/nm-supplicant-interface.c
(nm_supplicant_interface_class_init): Change the "scan-result" signal's
argument to boolean from enum.
Make NMDevice abstract class, remove almost all references to it's Make NMDevice abstract class, remove almost all references to it's
subclasses (the last place gets removed with new policy manager). Add subclasses (the last place gets removed with new policy manager). Add
NMDeviceInterface (which NMDevice implements) so that when we have NMDeviceInterface (which NMDevice implements) so that when we have

4
src/nm-device-802-11-wireless.c
View File

@@ -140,7 +140,7 @@ static void supplicant_iface_scanned_ap_cb (NMSupplicantInterface * iface,
NMDevice80211Wireless * self); NMDevice80211Wireless * self);
static void supplicant_iface_scan_result_cb (NMSupplicantInterface * iface, static void supplicant_iface_scan_result_cb (NMSupplicantInterface * iface,
guint32 result, gboolean result,
NMDevice80211Wireless * self); NMDevice80211Wireless * self);
static void supplicant_mgr_state_cb (NMSupplicantInterface * iface, static void supplicant_mgr_state_cb (NMSupplicantInterface * iface,
@@ -1735,7 +1735,7 @@ nm_device_802_11_wireless_disable_encryption (NMDevice80211Wireless *self)
} }
static void supplicant_iface_scan_result_cb (NMSupplicantInterface * iface, static void supplicant_iface_scan_result_cb (NMSupplicantInterface * iface,
guint32 result, gboolean result,
NMDevice80211Wireless * self) NMDevice80211Wireless * self)
{ {
g_return_if_fail (self != NULL); g_return_if_fail (self != NULL);

8
src/supplicant-manager/nm-supplicant-interface.c
View File

@@ -404,8 +404,8 @@ nm_supplicant_interface_class_init (NMSupplicantInterfaceClass *klass)
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NMSupplicantInterfaceClass, scan_result), G_STRUCT_OFFSET (NMSupplicantInterfaceClass, scan_result),
NULL, NULL, NULL, NULL,
g_cclosure_marshal_VOID__UINT, g_cclosure_marshal_VOID__BOOLEAN,
G_TYPE_NONE, 1, G_TYPE_UINT); G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
nm_supplicant_interface_signals[CONNECTION_STATE] = nm_supplicant_interface_signals[CONNECTION_STATE] =
g_signal_new ("connection-state", g_signal_new ("connection-state",
@@ -506,7 +506,7 @@ scan_results_cb (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_data)
g_signal_emit (info->interface, g_signal_emit (info->interface,
nm_supplicant_interface_signals[SCAN_RESULT], nm_supplicant_interface_signals[SCAN_RESULT],
0, 0,
NM_SUPPLICANT_INTERFACE_SCAN_RESULT_SUCCESS); TRUE);
/* Fire off a "properties" call for each returned BSSID */ /* Fire off a "properties" call for each returned BSSID */
for (i = 0; i < array->len; i++) { for (i = 0; i < array->len; i++) {
@@ -1104,7 +1104,7 @@ scan_request_cb (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_data)
g_signal_emit (info->interface, g_signal_emit (info->interface,
nm_supplicant_interface_signals[SCAN_RESULT], nm_supplicant_interface_signals[SCAN_RESULT],
0, 0,
success ? NM_SUPPLICANT_INTERFACE_SCAN_RESULT_SUCCESS : NM_SUPPLICANT_INTERFACE_SCAN_RESULT_ERROR); success ? TRUE : FALSE);
} }
gboolean gboolean

5
src/supplicant-manager/nm-supplicant-interface.h
View File

@@ -67,11 +67,6 @@ enum {
NM_SUPPLICANT_INTERFACE_CON_STATE_LAST NM_SUPPLICANT_INTERFACE_CON_STATE_LAST
}; };
enum {
NM_SUPPLICANT_INTERFACE_SCAN_RESULT_ERROR = 0,
NM_SUPPLICANT_INTERFACE_SCAN_RESULT_SUCCESS
};
#define NM_TYPE_SUPPLICANT_INTERFACE (nm_supplicant_interface_get_type ()) #define NM_TYPE_SUPPLICANT_INTERFACE (nm_supplicant_interface_get_type ())
#define NM_SUPPLICANT_INTERFACE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SUPPLICANT_INTERFACE, NMSupplicantInterface)) #define NM_SUPPLICANT_INTERFACE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SUPPLICANT_INTERFACE, NMSupplicantInterface))
#define NM_SUPPLICANT_INTERFACE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SUPPLICANT_INTERFACE, NMSupplicantInterfaceClass)) #define NM_SUPPLICANT_INTERFACE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SUPPLICANT_INTERFACE, NMSupplicantInterfaceClass))