mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-01-01 21:10:12 +01:00
aab500146f
* Makefile.am - Add info-daemon directory * configure.in - Check for glade libs and headers - Add info-daemon directory * src/NetworkManagerAP.c - nm_ap_new_from_ap(): Fix bug that resulted in an APs encryption status not getting copied over to the new AP. * src/NetworkManagerDbus.c src/NetworkManagerDbus.h - Deal with nm_device_ap_list_get_ap()->nm_device_ap_list_get_ap_by_index() change - Remove nm_dbus_signal_need_key_for_network() - Add disabled code for asynchronous user wep key callbacks - Add functions for getting, setting, and cancelling user key operations - Remove "setKeyForNetwork" device dbus method call, its on NetworkManager object instead - Add "setKeyForNetwork" dbus method call on NetworkManager object * src/NetworkManagerDevice.c src/NetworkManagerDevice.h - nm_device_update_link_active(): revert changes for wireless link detection, the WEP-key-is-wrong logic is in device activation now - nm_device_activate(): for wireless devices, if we can't associate with access point (perhaps key is wrong) trigger get-user-key pending action - Implement get-user-key pending action stuff, tie to dbus messages - Rename nm_device_ap_list_get_ap() -> nm_device_ap_list_get_ap_by_index() - Add nm_device_ap_list_get_ap_by_essid() - Instead of copying "best" access points, ref them instead so that the key we set sticks around * src/NetworkManagerPolicy.c - Deal with wrong WEP key, but right access point (and if so, return link_active = TRUE) - Don't cancel pending actions on a device if its the same device as last iteration - Only promote pending_device->active_device if activation was successfull * src/Makefile.am - Rename nmclienttest->nmtest * info-daemon/Makefile.am info-daemon/NetworkManagerInfo.c info-daemon/NetworkManagerInfo.h info-daemon/NetworkManagerInfoDbus.c info-daemon/NetworkManagerInfoDbus.h info-daemon/passphrase.glade info-daemon/NetworkManagerInfo.conf info-daemon/keyring.png - Import sources for info-daemon, which pops up dialog for passphrase/key when NetworkManager asks for it, and also will (soon) provide "allowed" access point lists to NetworkManager by proxying user's GConf git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@16 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
189 lines
6.8 KiB
XML
189 lines
6.8 KiB
XML
<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
|
|
<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
|
|
|
|
<glade-interface>
|
|
|
|
<widget class="GtkDialog" id="passphrase_dialog">
|
|
<property name="border_width">6</property>
|
|
<property name="visible">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>
|
|
<property name="modal">False</property>
|
|
<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="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
|
|
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
|
|
<property name="has_separator">False</property>
|
|
|
|
<child internal-child="vbox">
|
|
<widget class="GtkVBox" id="dialog-vbox1">
|
|
<property name="visible">True</property>
|
|
<property name="homogeneous">False</property>
|
|
<property name="spacing">12</property>
|
|
|
|
<child internal-child="action_area">
|
|
<widget class="GtkHButtonBox" id="dialog-action_area1">
|
|
<property name="visible">True</property>
|
|
<property name="layout_style">GTK_BUTTONBOX_END</property>
|
|
|
|
<child>
|
|
<widget class="GtkButton" id="cancel_button">
|
|
<property name="visible">True</property>
|
|
<property name="can_default">True</property>
|
|
<property name="can_focus">True</property>
|
|
<property name="label">gtk-cancel</property>
|
|
<property name="use_stock">True</property>
|
|
<property name="relief">GTK_RELIEF_NORMAL</property>
|
|
<property name="focus_on_click">True</property>
|
|
<property name="response_id">-6</property>
|
|
</widget>
|
|
</child>
|
|
|
|
<child>
|
|
<widget class="GtkButton" id="login_button">
|
|
<property name="visible">True</property>
|
|
<property name="can_default">True</property>
|
|
<property name="can_focus">True</property>
|
|
<property name="label" translatable="yes">_Login to AP</property>
|
|
<property name="use_underline">True</property>
|
|
<property name="relief">GTK_RELIEF_NORMAL</property>
|
|
<property name="focus_on_click">True</property>
|
|
<property name="response_id">0</property>
|
|
</widget>
|
|
</child>
|
|
</widget>
|
|
<packing>
|
|
<property name="padding">0</property>
|
|
<property name="expand">False</property>
|
|
<property name="fill">True</property>
|
|
<property name="pack_type">GTK_PACK_END</property>
|
|
</packing>
|
|
</child>
|
|
|
|
<child>
|
|
<widget class="GtkHBox" id="hbox1">
|
|
<property name="border_width">6</property>
|
|
<property name="visible">True</property>
|
|
<property name="homogeneous">False</property>
|
|
<property name="spacing">12</property>
|
|
|
|
<child>
|
|
<widget class="GtkImage" id="image1">
|
|
<property name="visible">True</property>
|
|
<property name="pixbuf">keyring.png</property>
|
|
<property name="xalign">0.5</property>
|
|
<property name="yalign">0</property>
|
|
<property name="xpad">0</property>
|
|
<property name="ypad">0</property>
|
|
</widget>
|
|
<packing>
|
|
<property name="padding">0</property>
|
|
<property name="expand">False</property>
|
|
<property name="fill">True</property>
|
|
</packing>
|
|
</child>
|
|
|
|
<child>
|
|
<widget class="GtkVBox" id="vbox1">
|
|
<property name="visible">True</property>
|
|
<property name="homogeneous">False</property>
|
|
<property name="spacing">12</property>
|
|
|
|
<child>
|
|
<widget class="GtkLabel" id="label1">
|
|
<property name="visible">True</property>
|
|
<property name="label" translatable="yes"><span weight="bold" size="larger">Passphrase Required by Wireless Network</span>
|
|
|
|
A passphrase or WEP key is required to access the wireless network '%s'.</property>
|
|
<property name="use_underline">False</property>
|
|
<property name="use_markup">True</property>
|
|
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
|
<property name="wrap">True</property>
|
|
<property name="selectable">False</property>
|
|
<property name="xalign">0</property>
|
|
<property name="yalign">0.5</property>
|
|
<property name="xpad">0</property>
|
|
<property name="ypad">0</property>
|
|
</widget>
|
|
<packing>
|
|
<property name="padding">0</property>
|
|
<property name="expand">False</property>
|
|
<property name="fill">False</property>
|
|
</packing>
|
|
</child>
|
|
|
|
<child>
|
|
<widget class="GtkHBox" id="hbox2">
|
|
<property name="visible">True</property>
|
|
<property name="homogeneous">False</property>
|
|
<property name="spacing">6</property>
|
|
|
|
<child>
|
|
<widget class="GtkLabel" id="label2">
|
|
<property name="visible">True</property>
|
|
<property name="label" translatable="yes">Passphrase:</property>
|
|
<property name="use_underline">False</property>
|
|
<property name="use_markup">False</property>
|
|
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
|
<property name="wrap">False</property>
|
|
<property name="selectable">False</property>
|
|
<property name="xalign">0.5</property>
|
|
<property name="yalign">0.5</property>
|
|
<property name="xpad">0</property>
|
|
<property name="ypad">0</property>
|
|
</widget>
|
|
<packing>
|
|
<property name="padding">0</property>
|
|
<property name="expand">False</property>
|
|
<property name="fill">False</property>
|
|
</packing>
|
|
</child>
|
|
|
|
<child>
|
|
<widget class="GtkEntry" id="passphrase_entry">
|
|
<property name="visible">True</property>
|
|
<property name="can_focus">True</property>
|
|
<property name="editable">True</property>
|
|
<property name="visibility">True</property>
|
|
<property name="max_length">0</property>
|
|
<property name="text" translatable="yes"></property>
|
|
<property name="has_frame">True</property>
|
|
<property name="invisible_char" translatable="yes">*</property>
|
|
<property name="activates_default">False</property>
|
|
</widget>
|
|
<packing>
|
|
<property name="padding">0</property>
|
|
<property name="expand">True</property>
|
|
<property name="fill">True</property>
|
|
</packing>
|
|
</child>
|
|
</widget>
|
|
<packing>
|
|
<property name="padding">0</property>
|
|
<property name="expand">True</property>
|
|
<property name="fill">True</property>
|
|
</packing>
|
|
</child>
|
|
</widget>
|
|
<packing>
|
|
<property name="padding">0</property>
|
|
<property name="expand">True</property>
|
|
<property name="fill">True</property>
|
|
</packing>
|
|
</child>
|
|
</widget>
|
|
<packing>
|
|
<property name="padding">0</property>
|
|
<property name="expand">True</property>
|
|
<property name="fill">True</property>
|
|
</packing>
|
|
</child>
|
|
</widget>
|
|
</child>
|
|
</widget>
|
|
|
|
</glade-interface>
|