Hello community, here is the log from the commit of package NetworkManager checked in at Tue May 23 00:59:29 CEST 2006. -------- --- NetworkManager/NetworkManager.changes 2006-05-19 12:20:51.000000000 +0200 +++ NetworkManager/NetworkManager.changes 2006-05-22 17:32:50.000000000 +0200 @@ -1,0 +2,9 @@ +Mon May 22 17:28:52 CEST 2006 - rml@suse.de + +- Fix ypbind/autofs behavior to never automatically start either, + but only reload as needed (Novell bug #175935) +- nm-applet: Fix crash on icon-theme change if icons no longer + exist (Novell bug #177426) +- Fix bug with weirdly-named network interfaces (GNOME bug #330832) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager.spec ++++++ --- /var/tmp/diff_new_pack.oBKmnf/_old 2006-05-23 00:59:20.000000000 +0200 +++ /var/tmp/diff_new_pack.oBKmnf/_new 2006-05-23 00:59:20.000000000 +0200 @@ -31,7 +31,7 @@ URL: http://www.gnome.org/projects/NetworkManager/ Autoreqprov: on Version: 0.6.2 -Release: 36 +Release: 37 Summary: Network Link Manager and User Applications Source0: NetworkManager-%{version}.tar.gz Source1: nm-icons.tar.gz @@ -261,6 +261,12 @@ %{_libdir}/libnm_glib.so.0.0.0 %changelog -n NetworkManager +* Mon May 22 2006 - rml@suse.de +- Fix ypbind/autofs behavior to never automatically start either, + but only reload as needed (Novell bug #175935) +- nm-applet: Fix crash on icon-theme change if icons no longer + exist (Novell bug #177426) +- Fix bug with weirdly-named network interfaces (GNOME bug #330832) * Fri May 19 2006 - ro@suse.de - fix requirement. sysconfig in sles10 has release 13.3 currently (the version in sysconfig should have been fixed instead of ++++++ nm-0.6-branch.patch ++++++ --- /var/tmp/diff_new_pack.oBKmnf/_old 2006-05-23 00:59:20.000000000 +0200 +++ /var/tmp/diff_new_pack.oBKmnf/_new 2006-05-23 00:59:20.000000000 +0200 @@ -1,14 +1,15 @@ NETWORKMANAGER_0_6_2_RELEASE to NETWORKMANAGER_0_6_0_RELEASE - ChangeLog | 245 +++++++++++++++ + ChangeLog | 278 ++++++++++++++++++ NEWS | 5 configure.in | 11 gnome/applet/applet-compat.c | 2 gnome/applet/applet-dbus-devices.c | 9 gnome/applet/applet-dbus-info.c | 14 - gnome/applet/applet.c | 99 ------ + gnome/applet/applet.c | 153 +++------ gnome/applet/applet.glade | 60 +-- gnome/applet/applet.h | 4 + gnome/applet/main.c | 22 - gnome/applet/menu-items.c | 59 ++- gnome/applet/menu-items.h | 2 gnome/applet/nm-gconf-wso-wpa-eap.c | 105 +++--- @@ -19,7 +20,7 @@ gnome/vpn-properties/Makefile.am | 6 gnome/vpn-properties/clipboard.c | 74 ++++ gnome/vpn-properties/clipboard.h | 6 - gnome/vpn-properties/nm-vpn-properties.c | 42 ++ + gnome/vpn-properties/nm-vpn-properties.c | 44 ++ initscript/Arch/Makefile.am | 4 initscript/Arch/networkmanager-dispatcher.in | 54 +++ initscript/Arch/networkmanager.in | 55 +++ @@ -34,7 +35,8 @@ src/NetworkManager.c | 7 src/NetworkManagerAPList.c | 15 src/NetworkManagerAPList.h | 4 - src/NetworkManagerDbus.c | 8 + src/NetworkManagerDbus.c | 74 ++-- + src/NetworkManagerDbus.h | 2 src/NetworkManagerMain.h | 1 src/NetworkManagerPolicy.c | 4 src/NetworkManagerSystem.c | 291 +++++++++---------- @@ -42,12 +44,12 @@ src/NetworkManagerUtils.c | 15 src/NetworkManagerUtils.h | 1 src/backends/Makefile.am | 4 - src/backends/NetworkManagerSuSE.c | 66 ++-- + src/backends/NetworkManagerSuSE.c | 72 +++- src/backends/interface_parser.c | 29 + src/dhcp-manager/nm-dhcp-manager.c | 7 src/nm-ap-security-wep.c | 15 src/nm-dbus-net.c | 1 - src/nm-dbus-nm.c | 5 + src/nm-dbus-nm.c | 21 - src/nm-dbus-nmi.c | 1 src/nm-device-802-11-wireless.c | 217 +++++++++----- src/nm-device-802-11-wireless.h | 2 @@ -60,12 +62,45 @@ test/Makefile.am | 5 test/nm-online.c | 141 +++++++++ test/nm-tool.c | 4 - 60 files changed, 1575 insertions(+), 730 deletions(-) + 62 files changed, 1705 insertions(+), 801 deletions(-) diff -urN NetworkManager-0.6.2/ChangeLog NetworkManager/ChangeLog --- NetworkManager-0.6.2/ChangeLog 2006-03-27 11:05:17.000000000 -0500 -+++ NetworkManager/ChangeLog 2006-05-17 16:04:11.000000000 -0400 -@@ -1,3 +1,248 @@ ++++ NetworkManager/ChangeLog 2006-05-22 11:24:12.000000000 -0400 +@@ -1,3 +1,281 @@ ++2006-05-22 Robert Love <rml@novell.com> ++ ++ * src/backends/NetworkManagerSuSE.c: Reload, do not restart, ypbind and ++ autofs on interface up if NIS is configured. On interface down, do ++ nothing. ++ ++2006-05-22 Robert Love <rml@novell.com> ++ ++ * gnome/applet/applet.c: Zero out the icon pointers before we set them, ++ to avoid calling g_object_unref() on stale pointers on error in ++ nma_icons_free(). This happens because we short-circuit loaded the ++ icons on the first failure but then free all icons. Normally we have ++ no issue because the icons were zero'ed out malloc, but we have stale ++ pointer data after nma_icon_theme_changed(). ++ * gnome/applet/main.c: Return error code if nma_new() failed. ++ ++2006-05-21 Dan Williams <dcbw@redhat.com> ++ ++ Patch from Adam Schreiber <sadam@clemson.edu> ++ * gnome/vpn-properties/nm-vpn-properties.c ++ - (main): correct Gnome program name (gnome.org #342498) ++ ++2006-05-21 Dan Williams <dcbw@redhat.com> ++ ++ Fix gnome.org #330832 based on patch from Crispin Flowerday <crispin@gnome.org> ++ ++ * src/NetworkManagerDbus.[ch] ++ - nm_dbus_get_device_from_object_path -> nm_dbus_get_device_from_escaped_object_path: ++ clarify that function's argument should be an escaped dbus object ++ path, and look for path segment end before returning a match ++ * src/nm-dbus-nm.c: ++ - Fix up users of nm_dbus_get_device_from_escaped_object_path() ++ +2006-05-17 Robert Love <rml@novell.com> + + Functionality to differentiate Ad-Hoc networks from infrastructure @@ -367,7 +402,7 @@ man/NetworkManagerDispatcher.1 diff -urN NetworkManager-0.6.2/gnome/applet/applet.c NetworkManager/gnome/applet/applet.c --- NetworkManager-0.6.2/gnome/applet/applet.c 2006-03-24 10:54:01.000000000 -0500 -+++ NetworkManager/gnome/applet/applet.c 2006-05-17 16:04:11.000000000 -0400 ++++ NetworkManager/gnome/applet/applet.c 2006-05-22 11:14:37.000000000 -0400 @@ -374,86 +374,6 @@ } @@ -506,6 +541,108 @@ gtk_widget_show_all (menu); return menu; +@@ -2633,7 +2548,7 @@ + + static void nma_icons_free (NMApplet *applet) + { +- gint i,j; ++ int i; + + g_object_unref (applet->no_connection_icon); + g_object_unref (applet->wired_icon); +@@ -2647,17 +2562,49 @@ + g_object_unref (applet->wireless_100_icon); + + for (i = 0; i < NUM_CONNECTING_STAGES; i++) ++ { ++ int j; ++ + for (j = 0; j < NUM_CONNECTING_FRAMES; j++) + g_object_unref (applet->network_connecting_icons[i][j]); ++ } + + for (i = 0; i < NUM_VPN_CONNECTING_FRAMES; i++) + g_object_unref (applet->vpn_connecting_icons[i]); + } + ++static void nma_icons_zero (NMApplet *applet) ++{ ++ int i; ++ ++ applet->no_connection_icon = NULL; ++ applet->wired_icon = NULL; ++ applet->adhoc_icon = NULL; ++ applet->vpn_lock_icon = NULL; ++ ++ applet->wireless_00_icon = NULL; ++ applet->wireless_25_icon = NULL; ++ applet->wireless_50_icon = NULL; ++ applet->wireless_75_icon = NULL; ++ applet->wireless_100_icon = NULL; ++ ++ for (i = 0; i < NUM_CONNECTING_STAGES; i++) ++ { ++ int j; ++ ++ for (j = 0; j < NUM_CONNECTING_FRAMES; j++) ++ applet->network_connecting_icons[i][j] = NULL; ++ } ++ ++ for (i = 0; i < NUM_VPN_CONNECTING_FRAMES; i++) ++ applet->vpn_connecting_icons[i] = NULL; ++ ++} ++ + #define ICON_LOAD(x, y) \ + { \ + GError *err = NULL; \ +- x = gtk_icon_theme_load_icon (icon_theme, y, icon_size, 0, &err); \ ++ x = gtk_icon_theme_load_icon (icon_theme, y, 22, 0, &err); \ + if (x == NULL) { \ + success = FALSE; \ + g_warning ("Icon %s missing: %s", y, err->message); \ +@@ -2669,12 +2616,14 @@ + static gboolean + nma_icons_load_from_disk (NMApplet *applet, GtkIconTheme *icon_theme) + { +- char * name; +- int i, j; +- gboolean success = FALSE; ++ int i; ++ gboolean success; + +- /* Assume icons are square */ +- gint icon_size = 22; ++ /* ++ * NULL out the icons, so if we error and call nma_icons_free(), we don't hit stale ++ * data on the not-yet-reached icons. This can happen off nma_icon_theme_changed(). ++ */ ++ nma_icons_zero (applet); + + ICON_LOAD(applet->no_connection_icon, "nm-no-connection"); + ICON_LOAD(applet->wired_icon, "nm-device-wired"); +@@ -2689,8 +2638,12 @@ + + for (i = 0; i < NUM_CONNECTING_STAGES; i++) + { ++ int j; ++ + for (j = 0; j < NUM_CONNECTING_FRAMES; j++) + { ++ char *name; ++ + name = g_strdup_printf ("nm-stage%02d-connecting%02d", i+1, j+1); + ICON_LOAD(applet->network_connecting_icons[i][j], name); + g_free (name); +@@ -2699,6 +2652,8 @@ + + for (i = 0; i < NUM_VPN_CONNECTING_FRAMES; i++) + { ++ char *name; ++ + name = g_strdup_printf ("nm-vpn-connecting%02d", i+1); + ICON_LOAD(applet->vpn_connecting_icons[i], name); + g_free (name); diff -urN NetworkManager-0.6.2/gnome/applet/applet-compat.c NetworkManager/gnome/applet/applet-compat.c --- NetworkManager-0.6.2/gnome/applet/applet-compat.c 2006-02-21 02:02:55.000000000 -0500 +++ NetworkManager/gnome/applet/applet-compat.c 2006-05-01 14:58:36.000000000 -0400 @@ -869,6 +1006,61 @@ void nma_schedule_warning_dialog (NMApplet *applet, const char *msg); gboolean nma_driver_notify (gpointer user_data); void nma_show_vpn_failure_alert (NMApplet *applet, const char *member, const char *vpn_name, const char *error_msg); +diff -urN NetworkManager-0.6.2/gnome/applet/main.c NetworkManager/gnome/applet/main.c +--- NetworkManager-0.6.2/gnome/applet/main.c 2006-02-27 01:26:31.000000000 -0500 ++++ NetworkManager/gnome/applet/main.c 2006-05-22 11:14:37.000000000 -0400 +@@ -22,7 +22,7 @@ + */ + + #ifdef HAVE_CONFIG_H +-#include <config.h> ++# include <config.h> + #endif + + #include <string.h> +@@ -37,15 +37,10 @@ + gtk_main_quit (); + } + +-static gboolean session_save (GnomeClient *client, gpointer client_data) +-{ +- return TRUE; +-} +- + int main (int argc, char *argv[]) + { + NMApplet * nma; +- GnomeClient * client = NULL; ++ GnomeClient * client; + + gnome_program_init ("nm-applet", VERSION, LIBGNOMEUI_MODULE, + argc, argv, +@@ -54,18 +49,19 @@ + client = gnome_master_client (); + gnome_client_set_restart_style (client, GNOME_RESTART_ANYWAY); + +- g_signal_connect (client, "save_yourself", G_CALLBACK (session_save), NULL); ++ g_signal_connect (client, "save_yourself", G_CALLBACK (gtk_true), NULL); + g_signal_connect (client, "die", G_CALLBACK (session_die), NULL); + + bindtextdomain (GETTEXT_PACKAGE, NULL); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + textdomain (GETTEXT_PACKAGE); + +- if ((nma = nma_new ())) +- { +- gtk_widget_show_all (GTK_WIDGET (nma)); +- gtk_main (); +- } ++ nma = nma_new (); ++ if (!nma) ++ exit (EXIT_FAILURE); ++ ++ gtk_widget_show_all (GTK_WIDGET (nma)); ++ gtk_main (); + + return 0; + } diff -urN NetworkManager-0.6.2/gnome/applet/menu-items.c NetworkManager/gnome/applet/menu-items.c --- NetworkManager-0.6.2/gnome/applet/menu-items.c 2005-12-29 11:54:34.000000000 -0500 +++ NetworkManager/gnome/applet/menu-items.c 2006-05-17 16:04:12.000000000 -0400 @@ -1457,11 +1649,11 @@ glade_DATA = nm-vpn-properties.glade diff -urN NetworkManager-0.6.2/gnome/vpn-properties/nm-vpn-properties.c NetworkManager/gnome/vpn-properties/nm-vpn-properties.c --- NetworkManager-0.6.2/gnome/vpn-properties/nm-vpn-properties.c 2006-03-13 14:41:38.000000000 -0500 -+++ NetworkManager/gnome/vpn-properties/nm-vpn-properties.c 2006-04-20 11:12:41.000000000 -0400 ++++ NetworkManager/gnome/vpn-properties/nm-vpn-properties.c 2006-05-22 11:14:21.000000000 -0400 @@ -1,5 +1,5 @@ /*************************************************************************** - * CVSID: $Id: nm-vpn-properties.c,v 1.13.2.1 2006/03/13 19:41:38 rml Exp $ -+ * CVSID: $Id: nm-vpn-properties.c,v 1.13.2.4 2006/04/20 15:12:41 rml Exp $ ++ * CVSID: $Id: nm-vpn-properties.c,v 1.13.2.5 2006/05/21 17:50:25 dcbw Exp $ * * nm-vpn-properties.c : GNOME UI dialogs for manipulating VPN connections * @@ -1570,6 +1762,15 @@ druid_window = GTK_WINDOW (glade_xml_get_widget (xml, "vpn-create-connection")); /* make the druid window modal wrt. our main window */ +@@ -1091,7 +1111,7 @@ + goto out; + } + +- gnome_program_init (GETTEXT_PACKAGE, VERSION, LIBGNOMEUI_MODULE, argc, argv, ++ gnome_program_init ("nm-vpn-properties", VERSION, LIBGNOMEUI_MODULE, argc, argv, + GNOME_PARAM_NONE, GNOME_PARAM_NONE); + + glade_gnome_init (); diff -urN NetworkManager-0.6.2/initscript/Arch/Makefile.am NetworkManager/initscript/Arch/Makefile.am --- NetworkManager-0.6.2/initscript/Arch/Makefile.am 1969-12-31 19:00:00.000000000 -0500 +++ NetworkManager/initscript/Arch/Makefile.am 2006-03-27 13:30:57.000000000 -0500 @@ -2519,7 +2720,7 @@ $(GTHREAD_CFLAGS) \ diff -urN NetworkManager-0.6.2/src/backends/NetworkManagerSuSE.c NetworkManager/src/backends/NetworkManagerSuSE.c --- NetworkManager-0.6.2/src/backends/NetworkManagerSuSE.c 2006-03-27 10:03:51.000000000 -0500 -+++ NetworkManager/src/backends/NetworkManagerSuSE.c 2006-05-16 13:26:25.000000000 -0400 ++++ NetworkManager/src/backends/NetworkManagerSuSE.c 2006-05-22 11:23:20.000000000 -0400 @@ -354,7 +354,7 @@ NMIP4Config * config; gboolean use_dhcp; @@ -2596,11 +2797,27 @@ ypconf = fopen ("/etc/yp.conf", "w"); if (ypconf) -@@ -1166,20 +1168,42 @@ +@@ -1140,12 +1142,12 @@ + if (stat ("/usr/sbin/rcypbind", &sb) != -1) + { + nm_info ("Restarting ypbind."); +- nm_spawn_process ("/usr/sbin/rcypbind restart"); ++ nm_spawn_process ("/usr/sbin/rcypbind reload"); + } + if (stat ("/usr/sbin/rcautofs", &sb) != -1) + { + nm_info ("Restarting autofs."); +- nm_spawn_process ("/usr/sbin/rcautofs restart"); ++ nm_spawn_process ("/usr/sbin/rcautofs reload"); + } + } + } +@@ -1166,20 +1168,44 @@ */ void nm_system_shutdown_nis (void) { - struct stat sb; ++#if 0 /* XXX: let's not touch NIS, for now; probably need to make this a configurable option */ + char *name, *buf = NULL; + shvarFile *file; @@ -2643,13 +2860,14 @@ + svCloseFile (file); +out_gfree: + g_free (name); ++#endif } + /* * nm_system_set_hostname * -@@ -1251,12 +1275,12 @@ +@@ -1251,12 +1277,12 @@ shvarFile *file; gboolean ret = TRUE; @@ -2664,7 +2882,7 @@ if (!buf) goto out_close; -@@ -1279,7 +1303,7 @@ +@@ -1279,7 +1305,7 @@ * Return a user-provided or system-mandated MTU for this device or zero if * no such MTU is provided. */ @@ -2777,22 +2995,106 @@ g_thread_init (NULL); diff -urN NetworkManager-0.6.2/src/NetworkManagerDbus.c NetworkManager/src/NetworkManagerDbus.c --- NetworkManager-0.6.2/src/NetworkManagerDbus.c 2006-02-24 13:59:03.000000000 -0500 -+++ NetworkManager/src/NetworkManagerDbus.c 2006-04-06 10:13:19.000000000 -0400 -@@ -287,11 +287,9 @@ ++++ NetworkManager/src/NetworkManagerDbus.c 2006-05-22 11:14:21.000000000 -0400 +@@ -119,52 +119,50 @@ + + + /* +- * nm_dbus_get_device_from_object_path ++ * nm_dbus_get_device_from_escaped_object_path + * +- * Returns the device associated with a dbus object path ++ * Returns the device associated with an _escaped_ dbus object path + * + */ +-NMDevice *nm_dbus_get_device_from_object_path (NMData *data, const char *path) ++NMDevice *nm_dbus_get_device_from_escaped_object_path (NMData *data, const char *path) + { +- NMDevice *dev = NULL; ++ NMDevice *dev = NULL; ++ GSList * elt; + + g_return_val_if_fail (path != NULL, NULL); + g_return_val_if_fail (data != NULL, NULL); + +- /* FIXME +- * This function could be much more efficient, for example we could +- * actually _parse_ the object path, but that's a lot more code and +- * stupid stuff. The approach below is slower, less efficient, but +- * less code and less error-prone. +- */ +- +- /* Iterate over device list */ +- if (nm_try_acquire_mutex (data->dev_list_mutex, __FUNCTION__)) +- { +- GSList *elt; +- char compare_path[100]; +- char *escaped_compare_path; ++ if (!nm_try_acquire_mutex (data->dev_list_mutex, __FUNCTION__)) ++ return NULL; + +- for (elt = data->dev_list; elt; elt = g_slist_next (elt)) ++ /* Iterate over the device list looking for the device with the matching object path. */ ++ for (elt = data->dev_list; elt; elt = g_slist_next (elt)) ++ { ++ char *compare_path; ++ char *escaped_compare_path; ++ int len; ++ ++ if (!(dev = (NMDevice *)(elt->data))) ++ continue; ++ ++ compare_path = g_strdup_printf ("%s/%s", NM_DBUS_PATH_DEVICES, nm_device_get_iface (dev)); ++ escaped_compare_path = nm_dbus_escape_object_path (compare_path); ++ g_free (compare_path); ++ len = strlen (escaped_compare_path); ++ ++ /* Compare against our constructed path, but ignore any trailing elements */ ++ if ( (strncmp (path, escaped_compare_path, len) == 0) ++ && ((path[len] == '\0' || path[len] == '/'))) + { +- if ((dev = (NMDevice *)(elt->data))) +- { +- snprintf (compare_path, 100, "%s/%s", NM_DBUS_PATH_DEVICES, nm_device_get_iface (dev)); +- escaped_compare_path = nm_dbus_escape_object_path (compare_path); +- /* Compare against our constructed path, but ignore any trailing elements */ +- if (strncmp (path, compare_path, strlen (escaped_compare_path)) == 0) +- { +- g_free (escaped_compare_path); +- break; +- } +- g_free (escaped_compare_path); +- dev = NULL; +- } ++ g_free (escaped_compare_path); ++ break; + } +- nm_unlock_mutex (data->dev_list_mutex, __FUNCTION__); ++ g_free (escaped_compare_path); ++ dev = NULL; + } ++ nm_unlock_mutex (data->dev_list_mutex, __FUNCTION__); + +- return (dev); ++ return dev; + } + + +@@ -287,11 +285,9 @@ /* - * nm_dbus_network_status_from_data +- * +- * Return a network status string based on our network data + * nm_get_app_state_from_data * -- * Return a network status string based on our network data -- * - * Caller MUST free returned value + * Return the state of the network connection * */ NMState nm_get_app_state_from_data (NMData *data) -@@ -304,7 +302,7 @@ +@@ -304,7 +300,7 @@ return NM_STATE_ASLEEP; act_dev = nm_get_active_device (data); @@ -2801,6 +3103,27 @@ return NM_STATE_DISCONNECTED; if (nm_device_is_activating (act_dev)) +@@ -619,7 +615,7 @@ + + path = dbus_message_get_path (message); + +- if (!(dev = nm_dbus_get_device_from_object_path (data, path))) ++ if (!(dev = nm_dbus_get_device_from_escaped_object_path (data, path))) + reply = nm_dbus_create_error_message (message, NM_DBUS_INTERFACE, "DeviceNotFound", "The requested network device does not exist."); + else + { +diff -urN NetworkManager-0.6.2/src/NetworkManagerDbus.h NetworkManager/src/NetworkManagerDbus.h +--- NetworkManager-0.6.2/src/NetworkManagerDbus.h 2005-12-31 03:21:22.000000000 -0500 ++++ NetworkManager/src/NetworkManagerDbus.h 2006-05-22 11:14:21.000000000 -0400 +@@ -69,7 +69,7 @@ + void nm_dbus_signal_wireless_network_change (DBusConnection *connection, NMDevice80211Wireless *dev, NMAccessPoint *ap, NMNetworkStatus status, gint strength); + void nm_dbus_signal_device_strength_change (DBusConnection *connection, NMDevice80211Wireless *dev, gint strength); + +-NMDevice * nm_dbus_get_device_from_object_path (NMData *data, const char *path); ++NMDevice * nm_dbus_get_device_from_escaped_object_path (NMData *data, const char *path); + + NMState nm_get_app_state_from_data (NMData *data); + diff -urN NetworkManager-0.6.2/src/NetworkManagerMain.h NetworkManager/src/NetworkManagerMain.h --- NetworkManager-0.6.2/src/NetworkManagerMain.h 2006-02-26 23:31:52.000000000 -0500 +++ NetworkManager/src/NetworkManagerMain.h 2006-04-06 10:13:19.000000000 -0400 @@ -3276,7 +3599,7 @@ nm_dbus_method_list_add_method (list, "getStrength", nm_dbus_net_get_strength); diff -urN NetworkManager-0.6.2/src/nm-dbus-nm.c NetworkManager/src/nm-dbus-nm.c --- NetworkManager-0.6.2/src/nm-dbus-nm.c 2006-02-25 21:16:53.000000000 -0500 -+++ NetworkManager/src/nm-dbus-nm.c 2006-04-06 10:13:19.000000000 -0400 ++++ NetworkManager/src/nm-dbus-nm.c 2006-05-22 11:14:21.000000000 -0400 @@ -170,6 +170,8 @@ if (!nm_system_activate_dialup (nm_data->dialup_list, dialup)) reply = nm_dbus_create_error_message (message, NM_DBUS_INTERFACE, "ActivationFailed", @@ -3295,7 +3618,65 @@ nm_unlock_mutex (nm_data->dialup_list_mutex, __FUNCTION__); out: -@@ -560,6 +564,7 @@ +@@ -224,7 +228,6 @@ + NMDevice * dev = NULL; + DBusMessage * reply = NULL; + char * dev_path; +- char * unescaped_dev_path = NULL; + NMAccessPoint * ap = NULL; + DBusMessageIter iter; + +@@ -243,9 +246,7 @@ + } + + dbus_message_iter_get_basic (&iter, &dev_path); +- unescaped_dev_path = nm_dbus_unescape_object_path (dev_path); +- dev = nm_dbus_get_device_from_object_path (data->data, unescaped_dev_path); +- g_free (unescaped_dev_path); ++ dev = nm_dbus_get_device_from_escaped_object_path (data->data, dev_path); + + /* Ensure the device exists in our list and is supported */ + if (!dev || !(nm_device_get_capabilities (dev) & NM_DEVICE_CAP_NM_SUPPORTED)) +@@ -328,7 +329,6 @@ + NMDevice * dev = NULL; + DBusMessage * reply = NULL; + char * dev_path = NULL; +- char * unescaped_dev_path = NULL; + NMAccessPoint * new_ap = NULL; + NMAPSecurity * security = NULL; + char * essid = NULL; +@@ -348,9 +348,7 @@ + } + + dbus_message_iter_get_basic (&iter, &dev_path); +- unescaped_dev_path = nm_dbus_unescape_object_path (dev_path); +- dev = nm_dbus_get_device_from_object_path (data->data, unescaped_dev_path); +- g_free (unescaped_dev_path); ++ dev = nm_dbus_get_device_from_escaped_object_path (data->data, dev_path); + + /* Ensure the device exists in our list and is supported */ + if (!dev || !(nm_device_get_capabilities (dev) & NM_DEVICE_CAP_NM_SUPPORTED)) +@@ -448,9 +446,7 @@ + { + NMDevice *dev; + +- dev_path = nm_dbus_unescape_object_path (dev_path); +- +- if ((dev = nm_dbus_get_device_from_object_path (data->data, dev_path))) ++ if ((dev = nm_dbus_get_device_from_escaped_object_path (data->data, dev_path))) + { + if (nm_device_is_test_device (dev)) + nm_remove_device (data->data, dev); +@@ -463,8 +459,6 @@ + reply = nm_dbus_create_error_message (message, NM_DBUS_INTERFACE, "DeviceNotFound", + "The requested network device does not exist."); + } +- +- g_free (dev_path); + } + else + { +@@ -560,6 +554,7 @@ nm_lock_mutex (app_data->dialup_list_mutex, __FUNCTION__); nm_system_deactivate_all_dialup (app_data->dialup_list); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...
participants (1)
-
root＠suse.de