Author: megabajt Date: Mon Feb 4 17:12:15 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated
---- Files affected:
SOURCES:
NetworkManager-branch.diff (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/NetworkManager-branch.diff
diff -u SOURCES/NetworkManager-branch.diff:1.1
SOURCES/NetworkManager-branch.diff:1.2
--- SOURCES/NetworkManager-branch.diff:1.1 Sat Sep 8 00:42:48 2007
+++ SOURCES/NetworkManager-branch.diff Mon Feb 4 18:12:09 2008
@@ -1,7 +1,240 @@
-diff -urN NetworkManager/ChangeLog NetworkManager-SVN/ChangeLog
---- NetworkManager/ChangeLog 2007-09-08 00:09:05.000000000 +0200
-+++ NetworkManager-SVN/ChangeLog 2007-09-08 00:07:08.000000000 +0200
-@@ -1,3 +1,104 @@
+diff -urN NetworkManager-0.6.5/ChangeLog NetworkManager-SVNr3284/ChangeLog
+--- NetworkManager-0.6.5/ChangeLog 2007-04-18 20:13:10.000000000 +0200
++++ NetworkManager-SVNr3284/ChangeLog 2008-02-04 16:01:02.000000000 +0100
+@@ -1,3 +1,337 @@
++2008-01-30 Tambet Ingo <[EMAIL PROTECTED]>
++
++ * src/named-manager/nm-named-manager.c (rewrite_resolv_conf): Add some
++ information on what produced the content (process name and pid).
++
++2008-01-30 Dan Williams <[EMAIL PROTECTED]>
++
++ * src/nm-device-802-3-ethernet.c
++ - (real_update_link): factor common link checking code out into
++ poll_link_state()
++ - (real_deactivate_quickly): schedule link state change in an
idle
++ handler rather than doing it immediately to prevent
deadlocks
++
++2008-01-30 Tambet Ingo <[EMAIL PROTECTED]>
++
++ Implement 802.1x wired authentication.
++
++2008-01-30 Dan Williams <[EMAIL PROTECTED]>
++
++ * src/nm-device-802-11-wireless.c
++ - (set_inactive_scan_timeout): be sure to clear the source
since the
++ timeout doesn't always get rescheduled
++
++2008-01-29 Tambet Ingo <[EMAIL PROTECTED]>
++
++ * src/vpn-manager/nm-dbus-vpn.c (nm_dbus_vpn_connections_update_cb):
Don't
++ try to merge the VPN connections, just add everything.
++ (nm_dbus_vpn_connections_update_from_nmi): Remove the existing VPN
connections
++ when a new instance of NMI service appears.
++
++ * src/vpn-manager/nm-vpn-manager.c
(nm_vpn_manager_vpn_connection_list_copy):
++ Remove.
++ (nm_vpn_manager_clear_connections): Implement.
++
++2008-01-29 Tambet Ingo <[EMAIL PROTECTED]>
++
++ * src/backends/NetworkManagerSuSE.c
(nm_system_device_get_system_config):
++ Fix the issue where NM doesn't honor YaST static IP settings.
++ (bugzilla.novell.com #271757).
++
++2008-01-23 Dan Williams <[EMAIL PROTECTED]>
++
++ * libnm-glib/libnm_glib.c
++ - (libnm_glib_init): make thread joinable
++ - (libnm_glib_ctx_free): join thread on exit to clean up memory
++
++2008-01-23 Dan Williams <[EMAIL PROTECTED]>
++
++ * test/libnm_glib_test.c
++ - (signal_handler, setup_signals): trap SIGINT and SIGTERM
++ - (main): set up signal handlers; call libnm_glib_shutdown
++
++2008-01-23 Dan Williams <[EMAIL PROTECTED]>
++
++ Fix gnome.org #511323
++
++ * src/NetworkManagerAPList.c
++ - (nm_ap_list_merge_scanned_ap): if the AP being merged is
hiding its
++ SSID, but there's an AP in the device's list with the
same BSSID
++ that is not hidden, only update the strength and
last-seen
++ attributes of the devlist AP and keep the existing SSID.
++
++2008-01-23 Dan Williams <[EMAIL PROTECTED]>
++
++ Fix up the scan algorithm to help gnome.org #498887.
++
++ * src/nm-device-802-11-wireless.c
++ src/nm-device-802-11-wireless.h
++ - (nm_device_802_11_wireless_set_scan_interval): make static,
and
++ only change a specific device's scan interval. If the
scan interval
++ is now ACTIVE, schedule a scan at the earliest possible
opportunity
++ as long as the last scan was at least 20 seconds ago
++ - (real_init, real_deactivate,
++ - (real_start): use schedule_scan() instead of rolling the scan
++ scheduling code manually
++ - (set_scan_interval_cb -> set_inactive_scan_interval_cb): call
++ nm_device_802_11_wireless_ui_activated() instead of
++ nm_device_802_11_wireless_set_scan_interval() because
the change is
++ really global to all wireless devices
++ - (set_inactive_scan_timeout): new function; reset the
INVACTIVE scan
++ interval timeout
++ - (nm_device_802_11_wireless_ui_activated): reset the scan
interval
++ for all wireless devices
++ - (request_and_convert_scan_results): don't set last_scan here
++ - (scan_results_timeout): set last_scan here instead, and after
the
++ first successful scan, set the scan interval from INIT
-> ACTIVE
++ - (nm_device_802_11_wireless_scan): cleanups
++ - (schedule_scan): take a new argument so that callers can
specify the
++ scan interval if they desire
++
++ * src/NetworkManagerDbus.c
++ - (nm_dbus_signal_filter): call
nm_device_802_11_wireless_ui_activated()
++ instead of nm_device_802_11_wireless_set_scan_interval()
++
++2008-01-16 Dan Williams <[EMAIL PROTECTED]>
++
++ * src/nm-device-802-11-wireless.c
++ - (real_act_stage4_ip_config_timeout): clean up the supplicant
to ensure
++ that the connection attempt starts fresh. Otherwise,
when the key
++ comes back, NM pukes and fails the new attempt because
the
++ supplicant can't terminate and start up again quickly
enough
++
++2008-01-16 Tambet Ingo <[EMAIL PROTECTED]>
++
++ Shuffle the code a bit in preparation for wired 802.1X authentication.
++
++ * src/nm-device-802-11-wireless.c: Remove the supplicant driving code
and use
++ NMSuppicant instead.
++
++ * src/nm-supplicant.[ch]: New files. The wpa_supplicant driving code is
moved
++ here from nm-device-802-11-wireless.c and refactored a bit so it can be
shared
++ by wired cards as well.
++
++2008-01-10 Dan Williams <[EMAIL PROTECTED]>
++
++ Fix gnome.org #464215. Requires the kernel patch titled
++ "Introduce WEXT scan capabilities" but will handle the patch not being
++ present, you'll just continue to have problems with hidden SSIDs when
++ using mac80211-based drivers.
++
++ * src/nm-device-802-11-wireless.c
++ - (real_init): check whether or not the driver supports SSID
scans
++ - (supplicant_send_network_config): if the driver supports SSID
scans,
++ and the AP is hidden, use ap_scan=1 instead of ap_scan=2
++
++2008-01-10 Dan Williams <[EMAIL PROTECTED]>
++
++ * src/NetworkManager.c
++ - (nm_killswitch_getpower_reply_cb): ensure DBusErrors are
initialized
++ before using them
++
++2008-01-09 Dan Williams <[EMAIL PROTECTED]>
++
++ * src/NetworkManager.c
++ - (nm_killswitch_getpower_reply_cb): handle different HAL
versions
++ better by matching the variable type with the D-Bus
argument type
++
++2008-01-09 Dan Williams <[EMAIL PROTECTED]>
++
++ * src/nm-ap-security-wpa-eap.c
++ - (real_write_supplicant_config): send the 'fragment_size'
option (but
++ don't fail if it's not supported)
++
++2008-01-06 Dan Williams <[EMAIL PROTECTED]>
++
++ * src/dhcp-manager/nm-dhcp-manager.c
++ - (nm_dhcp_manager_get_ip4_config): handle DHCP-provided MTU
++ (gnome.org #332953)
++
++2008-01-06 Dan Williams <[EMAIL PROTECTED]>
++
++ Fixes gnome.org #466954
++
++ * src/nm-device-802-11-wireless.c
++ - (find_supported_frequency): new function; find the first
frequency the
++ card appears to support from a given list
++ - (supplicant_send_network_config): explicitly send a frequency
the
++ Ad-Hoc config should use, some cards require it. If
the version
++ of wpa_supplicant being used does not support the
'frequency' option,
++ NetworkManager will ignore the error and proceed.
++
++2008-01-04 Dan Williams <[EMAIL PROTECTED]>
++
++ * src/named-manager/nm-named-manager.c
++ - (rewrite_resolv_conf, add_ip4_config_to_named): use primary
IP4Config's
++ nameservers if the secondary config doesn't have any
++ (gnome.org #346833)
++
++2008-01-04 Dan Williams <[EMAIL PROTECTED]>
++
++ * configure.in
++ - Bump libnl requirement to 1.0-pre8
++
++ * src/NetworkManagerSystem.c
++ - (new_nl_handle, destroy_nl_handle): port to libnl-1.0-pre8
++ - (iface_to_rtnl_index, iface_to_rtnl_link,
++ nm_system_get_rtnl_index_from_iface,
++ nm_system_get_iface_from_rtnl_index,
++ nm_system_device_set_from_ip4_config,
++ nm_system_vpn_device_set_from_ip4_config,
++ nm_system_device_set_up_down_with_iface,
++ nm_system_set_mtu): update for libnl-1.0-pre8
++
++ * src/nm-netlink-monitor.c
++ - (nm_netlink_monitor_open_connection,
++ nm_netlink_monitor_request_status): don't use netlink pids
that
++ conflict with libnl
++
++2007-12-14 Dan Williams <[EMAIL PROTECTED]>
++
++ * src/vpn-properties/nm-vpn-properties.c
++ - (init_app): hook up a double-click handler; select first item
in the
++ list if there is one (gnome.org #334883)
++
++2007-12-09 Dan Williams <[EMAIL PROTECTED]>
++
++ * src/NetworkManager.c
++ - (nm_killswitch_getpower_reply_cb): don't repeat errors too
often
++ (rh #246106)
++
++2007-12-07 Dan Williams <[EMAIL PROTECTED]>
++
++ * src/NetworkManagerSystem.c
++ - (new_nl_handle): ensure that the same netlink pid is never
chosen
++ twice (gnome.org #491047)
++
++2007-12-07 Dan Williams <[EMAIL PROTECTED]>
++
++ * src/nm-device-802-11-wireless.c
++ - (nm_device_802_11_wireless_set_essid): don't lock the SSID in
the
++ driver when setting a NULL ESSID (gnome.org #499565)
++
++2007-12-07 Dan Williams <[EMAIL PROTECTED]>
++
++ * src/nm-device-802-11-wireless.c
++ - Wrap #include of linux/mii.h to fix redefined structures due
to
++ incorrect kernel headers (gnome.org #350061)
++
++2007-12-02 Dan Williams <[EMAIL PROTECTED]>
++
++ * src/NetworkManager.c
++ - (nm_data_free): clean up dbus connection on exit
++
++2007-12-02 Dan Williams <[EMAIL PROTECTED]>
++
++ * src/nm-device-802-11-wireless.c
++ - (nm_device_802_11_wireless_get_mode): backport fix from
trunk/r3015
++ for getting mode
++
++2007-10-28 Priit Laes <[EMAIL PROTECTED]>
++
++ * configure.in: Added "et" (Estonian) to ALL_LINGUAS.
++
+2007-08-30 Dan Williams <[EMAIL PROTECTED]>
+
+ * libnm-util/sha1.c
@@ -106,812 +339,13203 @@
2007-04-18 Tambet Ingo <[EMAIL PROTECTED]>
* src/nm-dbus-nmi.c (nm_dbus_get_user_key_for_network_cb): Update the
security
-diff -urN NetworkManager/libnm-util/sha1.c NetworkManager-SVN/libnm-util/sha1.c
---- NetworkManager/libnm-util/sha1.c 2007-09-08 00:09:05.000000000 +0200
-+++ NetworkManager-SVN/libnm-util/sha1.c 2007-09-08 00:07:00.000000000
+0200
-@@ -12,6 +12,10 @@
- * See README and COPYING for more details.
- */
-
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
- #include <stdlib.h>
- #include <string.h>
+diff -urN NetworkManager-0.6.5/configure.in
NetworkManager-SVNr3284/configure.in
+--- NetworkManager-0.6.5/configure.in 2007-04-18 20:13:10.000000000 +0200
++++ NetworkManager-SVNr3284/configure.in 2008-02-04 16:01:02.000000000
+0100
+@@ -46,7 +46,7 @@
+ GETTEXT_PACKAGE=NetworkManager
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
+-ALL_LINGUAS="ar [EMAIL PROTECTED] bg bs ca cs da de dz el en_CA en_GB es fi
fr gl gu hr hu it ja ka ko lt pl mk nb ne nl pa pt_BR rw sk sq [EMAIL
PROTECTED] sr sv uk vi wa zh_CN zh_TW"
++ALL_LINGUAS="ar [EMAIL PROTECTED] bg bs ca cs da de dz el en_CA en_GB es et
fi fr gl gu hr hu it ja ka ko lt pl mk nb ne nl pa pt_BR rw sk sq [EMAIL
PROTECTED] sr sv uk vi wa zh_CN zh_TW"
+ AC_PROG_INTLTOOL([0.27.2])
+ AM_GLIB_GNU_GETTEXT
+
+@@ -154,7 +154,7 @@
+ PKG_CHECK_MODULES(GNOME_KEYRING, gnome-keyring-1)
+ fi
+
+-PKG_CHECK_MODULES(LIBNL, libnl-1)
++PKG_CHECK_MODULES(LIBNL, libnl-1 >= 1.0-pre8)
+
+ AC_ARG_WITH(gcrypt, AC_HELP_STRING([--with-gcrypt], [Use gcrypt library]),
ac_gcrypt=$withval, ac_gcrypt=auto)
+ if test x"$ac_gcrypt" != xno; then
+@@ -341,8 +341,8 @@
+ initscript/Arch/networkmanager
+ initscript/Arch/networkmanager-dispatcher
+ man/Makefile
+-man/NetworkManager.1
+-man/NetworkManagerDispatcher.1
++man/NetworkManager.8
++man/NetworkManagerDispatcher.8
+ man/nm-tool.1
+ po/Makefile.in
+ NetworkManager.pc
+diff -urN NetworkManager-0.6.5/gnome/libnm_glib/libnm_glib.c
NetworkManager-SVNr3284/gnome/libnm_glib/libnm_glib.c
+--- NetworkManager-0.6.5/gnome/libnm_glib/libnm_glib.c 2007-04-18
20:13:08.000000000 +0200
++++ NetworkManager-SVNr3284/gnome/libnm_glib/libnm_glib.c 2008-02-04
16:00:46.000000000 +0100
+@@ -40,8 +40,10 @@
+ DBusConnection * dbus_con;
+ guint dbus_watcher;
+ guint dbus_watch_interval;
++
+ gboolean thread_done;
+ gboolean thread_inited;
++ GThread * thread;
+
+ GSList * callbacks;
+ GMutex * callbacks_lock;
+@@ -458,6 +460,9 @@
+ g_slist_foreach (ctx->callbacks, (GFunc)g_free, NULL);
+ g_slist_free (ctx->callbacks);
+
++ if (ctx->thread)
++ g_thread_join (ctx->thread);
++
+ memset (ctx, 0, sizeof (libnm_glib_ctx));
+ memset (&(ctx->check), 0xDD, sizeof (ctx->check));
+ g_free (ctx);
+@@ -488,7 +493,6 @@
+ libnm_glib_ctx *
+ libnm_glib_init (void)
+ {
+- GError *error = NULL;
+ libnm_glib_ctx *ctx = NULL;
-diff -urN NetworkManager/src/NetworkManager.c
NetworkManager-SVN/src/NetworkManager.c
---- NetworkManager/src/NetworkManager.c 2007-09-08 00:09:05.000000000
+0200
-+++ NetworkManager-SVN/src/NetworkManager.c 2007-09-08 00:06:44.000000000
+0200
-@@ -67,6 +67,7 @@
+ g_type_init ();
+@@ -496,15 +500,12 @@
+ g_thread_init (NULL);
+ dbus_g_thread_init ();
+
+- if (!(ctx = libnm_glib_ctx_new()))
++ if (!(ctx = libnm_glib_ctx_new ()))
+ return NULL;
- static gboolean sigterm_pipe_handler (GIOChannel *src, GIOCondition
condition, gpointer data);
- static void nm_data_free (NMData *data);
-+static gboolean nm_poll_killswitches(gpointer user_data);
+- if (!g_thread_create (libnm_glib_dbus_worker, ctx, FALSE, &error))
+- {
+- if (error)
+- g_error_free (error);
++ ctx->thread = g_thread_create (libnm_glib_dbus_worker, ctx, TRUE, NULL);
++ if (!ctx->thread)
+ goto error;
+- }
- /*
- * nm_get_device_interface_from_hal
-@@ -274,6 +275,183 @@
+ /* Wait until initialization of the thread */
+ while (!ctx->thread_inited)
+diff -urN NetworkManager-0.6.5/gnome/vpn-properties/Makefile.am
NetworkManager-SVNr3284/gnome/vpn-properties/Makefile.am
+--- NetworkManager-0.6.5/gnome/vpn-properties/Makefile.am 2007-04-18
20:13:08.000000000 +0200
++++ NetworkManager-SVNr3284/gnome/vpn-properties/Makefile.am 2008-02-04
16:00:45.000000000 +0100
+@@ -26,8 +26,7 @@
+ -DGLADEDIR=\""$(gladedir)"\" \
+ -DG_DISABLE_DEPRECATED \
+ -DGDK_DISABLE_DEPRECATED \
+- -DGNOME_DISABLE_DEPRECATED \
+- -DGNOMELOCALEDIR=\"$(datadir)/locale\" \
++ -DGNOMELOCALEDIR=\"$(datadir)/locale\" \
+ -DVERSION=\"$(VERSION)\" \
+ $(NULL)
+
+diff -urN NetworkManager-0.6.5/gnome/vpn-properties/nm-vpn-properties.c
NetworkManager-SVNr3284/gnome/vpn-properties/nm-vpn-properties.c
+--- NetworkManager-0.6.5/gnome/vpn-properties/nm-vpn-properties.c
2007-04-18 20:13:08.000000000 +0200
++++ NetworkManager-SVNr3284/gnome/vpn-properties/nm-vpn-properties.c
2008-02-04 16:00:45.000000000 +0100
+@@ -1,5 +1,5 @@
+ /***************************************************************************
+- * CVSID: $Id$
++ * CVSID: $Id$
+ *
+ * nm-vpn-properties.c : GNOME UI dialogs for manipulating VPN connections
+ *
+@@ -868,6 +868,15 @@
+ update_edit_del_sensitivity ();
}
-
-+static void handle_killswitch_pcall_done (NMData *data, DBusPendingCall *
pcall)
-+{
-+ GSource * source;
-+ gboolean now_enabled = FALSE;
-+ gboolean now_disabled = FALSE;
-+
-+ data->ks_pcall_list = g_slist_remove (data->ks_pcall_list, pcall);
-+ if (g_slist_length (data->ks_pcall_list) > 0)
-+ return; /* not done with all killswitches yet */
-+
-+ if (data->hw_rf_enabled != data->tmp_hw_rf_enabled) {
-+ nm_info ("Wireless now %s by radio killswitch",
-+ data->tmp_hw_rf_enabled ? "enabled" : "disabled");
-+ if (data->tmp_hw_rf_enabled)
-+ now_enabled = TRUE;
-+ else
-+ now_disabled = TRUE;
-+
-+ data->hw_rf_enabled = data->tmp_hw_rf_enabled;
-+ }
-+
-+ if (data->hw_rf_enabled == data->wireless_enabled)
-+ goto out;
-+
-+ /* Only re-enabled wireless if killswitch just changed, otherwise
-+ * ignore hardware rf enabled state.
-+ */
-+ if (now_enabled && !data->wireless_enabled) {
-+ data->wireless_enabled = TRUE;
-+ nm_policy_schedule_device_change_check (data);
-+ nm_dbus_signal_wireless_enabled (data);
-+ } else if (!data->hw_rf_enabled && data->wireless_enabled) {
-+ GSList * elt;
-+
-+ /* Deactivate all wireless devices and force them down so they
-+ * turn off their radios.
-+ */
-+ nm_lock_mutex (data->dev_list_mutex, __FUNCTION__);
-+ for (elt = data->dev_list; elt; elt = g_slist_next (elt)) {
-+ NMDevice * dev = (NMDevice *) elt->data;
-+ if (nm_device_is_802_11_wireless (dev)) {
-+ nm_device_deactivate (dev);
-+ nm_device_bring_down (dev);
-+ }
-+ }
-+ nm_unlock_mutex (data->dev_list_mutex, __FUNCTION__);
-+
-+ data->wireless_enabled = FALSE;
-+ nm_policy_schedule_device_change_check (data);
-+ nm_dbus_signal_wireless_enabled (data);
-+ }
-+
-+out:
-+ /* Schedule another killswitch poll */
-+ source = g_timeout_source_new (6000);
-+ g_source_set_callback (source, nm_poll_killswitches, data, NULL);
-+ g_source_attach (source, data->main_context);
-+ g_source_unref (source);
-+}
-+
-+static void nm_killswitch_getpower_reply_cb (DBusPendingCall *pcall, NMData *
data)
++static void
++vpn_list_row_activated_cb (GtkTreeView *treeview,
++ GtkTreePath *path,
++ GtkTreeViewColumn *column,
++ gpointer user_data)
+{
-+ DBusError err;
-+ DBusMessage * reply = NULL;
-+ guint32 status;
-+
-+ g_return_if_fail (pcall != NULL);
-+ g_return_if_fail (data != NULL);
-+
-+ if (!dbus_pending_call_get_completed (pcall))
-+ goto out;
-+
-+ if (!(reply = dbus_pending_call_steal_reply (pcall)))
-+ goto out;
-+
-+ if (message_is_error (reply)) {
-+ dbus_error_init (&err);
-+ dbus_set_error_from_message (&err, reply);
-+ nm_info ("Error getting killswitch power: %s - %s", err.name,
err.message);
-+ dbus_error_free (&err);
-+ goto out;
-+ }
-+
-+ if (!dbus_message_get_args (reply, &err, DBUS_TYPE_UINT32, &status,
DBUS_TYPE_INVALID)) {
-+ nm_info ("Error getting killswitch power arguments: %s - %s",
err.name, err.message);
-+ dbus_error_free (&err);
-+ goto out;
-+ }
-+
-+ if (status == 0)
-+ data->tmp_hw_rf_enabled = FALSE;
-+
-+out:
-+ if (reply)
-+ dbus_message_unref (reply);
-+
-+ handle_killswitch_pcall_done (data, pcall);
-+ dbus_pending_call_unref (pcall);
++ edit_cb (NULL, NULL);
+}
+
+ /* TODO: remove these once we get the GModule thing going */
+ //extern NetworkManagerVpnUI* vpn_ui_factory_vpnc (void);
+ extern NetworkManagerVpnUI* vpn_ui_factory_dummy (void);
+@@ -942,6 +951,7 @@
+ GtkHBox *vpn_type_hbox1;
+ GtkWidget *toplevel;
+ GDir *dir;
++ GtkTreeIter tree_iter;
+
+ if (!vpn_get_clipboard ())
+ return FALSE;
+@@ -1005,13 +1015,13 @@
+ vpn_type_details = GTK_VBOX (glade_xml_get_widget (xml,
"vpn-connection-druid-details-box"));
+
+ w = glade_xml_get_widget (xml, "add");
+- gtk_signal_connect (GTK_OBJECT (w), "clicked", GTK_SIGNAL_FUNC
(add_cb), NULL);
++ g_signal_connect (G_OBJECT (w), "clicked", GTK_SIGNAL_FUNC (add_cb),
NULL);
+ vpn_edit = glade_xml_get_widget (xml, "edit");
+- gtk_signal_connect (GTK_OBJECT (vpn_edit), "clicked", GTK_SIGNAL_FUNC
(edit_cb), NULL);
++ g_signal_connect (G_OBJECT (vpn_edit), "clicked", GTK_SIGNAL_FUNC
(edit_cb), NULL);
+ vpn_export = glade_xml_get_widget (xml, "export");
+- gtk_signal_connect (GTK_OBJECT (vpn_export), "clicked", GTK_SIGNAL_FUNC
(export_cb), NULL);
++ g_signal_connect (G_OBJECT (vpn_export), "clicked", GTK_SIGNAL_FUNC
(export_cb), NULL);
+ vpn_delete = glade_xml_get_widget (xml, "delete");
+- gtk_signal_connect (GTK_OBJECT (vpn_delete), "clicked", GTK_SIGNAL_FUNC
(delete_cb), NULL);
++ g_signal_connect (G_OBJECT (vpn_delete), "clicked", GTK_SIGNAL_FUNC
(delete_cb), NULL);
+ g_signal_connect (dialog, "response",
+ G_CALLBACK (response_cb), NULL);
+ g_signal_connect (dialog, "delete_event",
+@@ -1029,9 +1039,12 @@
+ VPNCONN_NAME_COLUMN,
+ GTK_SORT_ASCENDING);
+
+- gtk_signal_connect_after (GTK_OBJECT (vpn_conn_view), "cursor-changed",
++ g_signal_connect_after (G_OBJECT (vpn_conn_view), "cursor-changed",
+ GTK_SIGNAL_FUNC (vpn_list_cursor_changed_cb),
NULL);
+
++ g_signal_connect (G_OBJECT (vpn_conn_view), "row-activated",
++ GTK_SIGNAL_FUNC (vpn_list_row_activated_cb),
NULL);
++
+ get_all_vpn_connections ();
+
+ column = gtk_tree_view_column_new ();
+@@ -1045,6 +1058,12 @@
+ gtk_tree_view_set_model (vpn_conn_view, GTK_TREE_MODEL (vpn_conn_list));
+ gtk_tree_view_expand_all (vpn_conn_view);
+
++ if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (vpn_conn_list),
&tree_iter)) {
++ GtkTreeSelection *selection = gtk_tree_view_get_selection
(vpn_conn_view);
+
-+static gboolean nm_poll_killswitches (gpointer user_data)
-+{
-+ NMData * data = (NMData *) user_data;
-+ DBusConnection * connection = data->dbus_connection;
-+ GSList * elt;
-+
-+ g_return_val_if_fail (data != NULL, FALSE);
-+
-+ data->tmp_hw_rf_enabled = TRUE;
-+
-+ for (elt = data->killswitch_list; elt; elt = g_slist_next (elt))
-+ {
-+ DBusPendingCall * pcall;
-+ DBusMessage * message;
-+
-+ message = dbus_message_new_method_call ("org.freedesktop.Hal",
-+ elt->data,
-+
"org.freedesktop.Hal.Device.KillSwitch",
-+ "GetPower");
-+ if (!dbus_connection_send_with_reply (connection, message,
&pcall, 5000)) {
-+ nm_warning ("%s(): could not send dbus message",
__func__);
-+ } else if (!pcall) {
-+ nm_warning ("%s(): could not send dbus message; pcall
was NULL", __func__);
-+ } else {
-+ dbus_pending_call_set_notify (pcall,
-+
(DBusPendingCallNotifyFunction) nm_killswitch_getpower_reply_cb,
-+ data,
-+ NULL);
-+ data->ks_pcall_list = g_slist_append
(data->ks_pcall_list, pcall);
-+ }
-+ dbus_message_unref (message);
++ gtk_tree_selection_select_iter (selection, &tree_iter);
+ }
-+ return FALSE;
-+}
+
+ gtk_widget_show_all (dialog);
+
+ /* fill in possibly choices in the druid when adding a connection */
+@@ -1059,20 +1078,20 @@
+
+ /* Druid */
+ druid = GNOME_DRUID (glade_xml_get_widget (xml,
"vpn-create-connection-druid"));
+- gtk_signal_connect (GTK_OBJECT (druid), "cancel", GTK_SIGNAL_FUNC
(vpn_druid_cancel), NULL);
++ g_signal_connect (GTK_OBJECT (druid), "cancel", GTK_SIGNAL_FUNC
(vpn_druid_cancel), NULL);
+ druid_confirm_page = GNOME_DRUID_PAGE_EDGE (glade_xml_get_widget (xml,
"vpn-druid-vpn-confirm-page"));
+ /* use connect_after, otherwise gnome_druid_set_buttons_sensitive()
won't work in prepare handlers */
+ w = glade_xml_get_widget (xml, "vpn-druid-vpn-type-page");
+- gtk_signal_connect_after (GTK_OBJECT (w), "next", GTK_SIGNAL_FUNC
(vpn_druid_vpn_type_page_next), NULL);
++ g_signal_connect_after (G_OBJECT (w), "next", GTK_SIGNAL_FUNC
(vpn_druid_vpn_type_page_next), NULL);
+ w = glade_xml_get_widget (xml, "vpn-druid-vpn-details-page");
+- gtk_signal_connect_after (GTK_OBJECT (w), "prepare", GTK_SIGNAL_FUNC
(vpn_druid_vpn_details_page_prepare), NULL);
+- gtk_signal_connect_after (GTK_OBJECT (w), "next", GTK_SIGNAL_FUNC
(vpn_druid_vpn_details_page_next), NULL);
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/NetworkManager-branch.diff?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
