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

2004-08-23 Dan Williams <dcbw@redhat.com>

Browse Source 
* panel-applet/NMWirelessApplet.c
		- Update our state every second to get more responsive panel icon
		- (nmwa_update_state): remove bogus applet->pix_state = PIX_WIRED that
			was causing our marching ants status blips to never move when
			looking for a wireless network

	* src/NetworkManagerDevice.c
		- (nm_device_activation_begin): return if activation has already begun
		- (nm_device_do_normal_scan): merge WEP key and priority from the
			trusted/preferred network into the device's access point when the
			scan list is processed


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@60 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2004-08-23 19:09:19 +00:00
parent 058a678f89
commit 07258fd5e1
6 changed files with 37 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@@ -1,3 +1,17 @@
2004-08-23 Dan Williams <dcbw@redhat.com>
* panel-applet/NMWirelessApplet.c
- Update our state every second to get more responsive panel icon
- (nmwa_update_state): remove bogus applet->pix_state = PIX_WIRED that
was causing our marching ants status blips to never move when
looking for a wireless network
* src/NetworkManagerDevice.c
- (nm_device_activation_begin): return if activation has already begun
- (nm_device_do_normal_scan): merge WEP key and priority from the
trusted/preferred network into the device's access point when the
scan list is processed
2004-08-23 Dan Williams <dcbw@redhat.com>
* initscript/NetworkManager

6
info-daemon/Makefile.am
View File

@@ -25,12 +25,14 @@ NetworkManagerInfo_SOURCES = NetworkManagerInfo.h \
NetworkManagerInfoDbus.h \
NetworkManagerInfoDbus.c \
NetworkManagerInfoPassphraseDialog.c \
NetworkManagerInfoPassphraseDialog.h
NetworkManagerInfoPassphraseDialog.h \
NetworkManagerInfoNetworksDialog.c \
NetworkManagerInfoNetworksDialog.h
NetworkManagerInfo_LDADD = $(NM_LIBS) $(GLADE_LIBS) $(GCONF_LIBS) $(GTK_LIBS) $(GDK_PIXBUF_LIBS) $(LIBGNOMEUI_LIBS)
gladedir = $(datadir)/NetworkManagerInfo/glade
glade_DATA = passphrase.glade keyring.png
glade_DATA = passphrase.glade keyring.png networks.glade
dbusservicedir=$(DBUS_SYS_DIR)
dbusservice_DATA = NetworkManagerInfo.conf

5
info-daemon/NetworkManagerInfo.h
View File

@@ -37,8 +37,9 @@ struct NMIAppInfo
DBusConnection *connection;
GConfClient *gconf_client;
GladeXML *new_networks_dialog;
GtkListStore *nnd_list_store;
GladeXML *networks_dialog;
GtkListStore *networks_list_store;
GdkPixbuf *padlock_pixbuf;
};
typedef struct NMIAppInfo NMIAppInfo;

5
info-daemon/passphrase.glade
View File

@@ -5,6 +5,7 @@
<widget class="GtkDialog" id="passphrase_dialog">
<property name="border_width">6</property>
<property name="has_focus">True</property>
<property name="title" translatable="yes"> </property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_CENTER_ALWAYS</property>
@@ -12,8 +13,8 @@
<property name="resizable">False</property>
<property name="destroy_with_parent">False</property>
<property name="decorated">True</property>
<property name="skip_taskbar_hint">False</property>
<property name="skip_pager_hint">False</property>
<property name="skip_taskbar_hint">True</property>
<property name="skip_pager_hint">True</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="has_separator">False</property>

3
panel-applet/NMWirelessApplet.c
View File

@@ -48,7 +48,7 @@
#include "NMWirelessApplet.h"
#include "NMWirelessAppletDbus.h"
#define CFG_UPDATE_INTERVAL 2
#define CFG_UPDATE_INTERVAL 1
static char * pixmap_names[] =
{
@@ -132,7 +132,6 @@ static void nmwa_draw (NMWirelessApplet *applet)
*/
static void nmwa_update_state (NMWirelessApplet *applet)
{
applet->pix_state = PIX_WIRED;
if (applet->nm_active)
{
char *status = nmwa_dbus_get_nm_status (applet->connection);

12
src/NetworkManagerDevice.c
View File

@@ -811,6 +811,7 @@ gboolean nm_device_activation_begin (NMDevice *dev)
GError *error = NULL;
g_return_val_if_fail (dev != NULL, FALSE);
g_return_val_if_fail (!dev->activating, TRUE); // Return if activation has already begun
/* Ref the device so it doesn't go away while worker function is active */
nm_device_ref (dev);
@@ -1557,6 +1558,7 @@ static void nm_device_do_normal_scan (NMDevice *dev)
if (tmp_ap->b.has_essid && tmp_ap->b.essid_on && (strlen (tmp_ap->b.essid) > 0))
{
NMAccessPoint *nm_ap = nm_ap_new ();
NMAccessPoint *list_ap;
/* Copy over info from scan to local structure */
nm_ap_set_essid (nm_ap, tmp_ap->b.essid);
@@ -1574,6 +1576,16 @@ static void nm_device_do_normal_scan (NMDevice *dev)
if (tmp_ap->b.has_freq)
nm_ap_set_freq (nm_ap, tmp_ap->b.freq);
/* Merge settings from Preferred/Allowed networks, mainly Keys */
list_ap = nm_ap_list_get_ap_by_essid (data->trusted_ap_list, nm_ap_get_essid (nm_ap));
if (!list_ap)
list_ap = nm_ap_list_get_ap_by_essid (data->preferred_ap_list, nm_ap_get_essid (nm_ap));
if (list_ap)
{
nm_ap_set_priority (nm_ap, nm_ap_get_priority (list_ap));
nm_ap_set_wep_key (nm_ap, nm_ap_get_wep_key (list_ap));
}
/* Add the AP to the device's AP list */
nm_device_ap_list_add (dev, nm_ap);
}