fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-02 21:18:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

2005-09-04 Dan Williams <dcbw@redhat.com>

Browse source 
Patch from John Palmieri <johnp@redhat.com>
	* gnome/applet/applet-dbus-devices.c
		- Fix up unreffing of DBusMessage objects


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@933 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2005-09-04 16:41:50 +00:00
parent 2367f1e800
commit 837c65d445
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2005-09-04 Dan Williams <dcbw@redhat.com>
Patch from John Palmieri <johnp@redhat.com>
* gnome/applet/applet-dbus-devices.c
- Fix up unreffing of DBusMessage objects
2005-09-04 Dan Williams <dcbw@redhat.com>
Patch from John Palmieri <johnp@redhat.com>

18
gnome/applet/applet-dbus-devices.c
View file

@ -352,7 +352,6 @@ static void nmwa_dbus_update_device_info_from_hal (NetworkDevice *dev, NMWireles
dbus_message_append_args (message, DBUS_TYPE_STRING, &prop, DBUS_TYPE_INVALID);
dbus_connection_send_with_reply (applet->connection, message, &pcall, -1);
dbus_message_unref (message);
if (pcall)
{
HalInfoCBData * cb_data = g_malloc0 (sizeof (HalInfoCBData));
@ -362,6 +361,7 @@ static void nmwa_dbus_update_device_info_from_hal (NetworkDevice *dev, NMWireles
cb_data->dev = dev;
dbus_pending_call_set_notify (pcall, hal_info_parent_cb, cb_data, (DBusFreeFunction) free_hal_info_cb_data);
}
dbus_message_unref (message);
}
}
@ -531,7 +531,7 @@ static void nmwa_dbus_net_properties_cb (DBusPendingCall *pcall, void *user_data
g_free (act_net);
network_device_add_wireless_network (dev, net);
network_device_sort_wireless_networks (dev);
network_device_sort_wireless_networks (dev);
}
}
dbus_message_unref (reply);
@ -559,7 +559,6 @@ void nmwa_dbus_device_update_one_network (NMWirelessApplet *applet, const char *
if ((message = dbus_message_new_method_call (NM_DBUS_SERVICE, net_path, NM_DBUS_INTERFACE_DEVICES, "getProperties")))
{
dbus_connection_send_with_reply (applet->connection, message, &pcall, -1);
dbus_message_unref (message);
if (pcall)
{
NetPropCBData * cb_data = g_malloc0 (sizeof (NetPropCBData));
@ -569,6 +568,7 @@ void nmwa_dbus_device_update_one_network (NMWirelessApplet *applet, const char *
cb_data->applet = applet;
dbus_pending_call_set_notify (pcall, nmwa_dbus_net_properties_cb, cb_data, (DBusFreeFunction) free_net_prop_cb_data);
}
dbus_message_unref (message);
}
}
@ -760,9 +760,9 @@ void nmwa_dbus_device_update_one_device (NMWirelessApplet *applet, const char *d
if ((message = dbus_message_new_method_call (NM_DBUS_SERVICE, dev_path, NM_DBUS_INTERFACE_DEVICES, "getProperties")))
{
dbus_connection_send_with_reply (applet->connection, message, &pcall, -1);
dbus_message_unref (message);
if (pcall)
dbus_pending_call_set_notify (pcall, nmwa_dbus_device_properties_cb, applet, NULL);
dbus_message_unref (message);
}
}
@ -889,6 +889,7 @@ void nmwa_dbus_dialup_activate_connection (NMWirelessApplet *applet, const char
dbus_message_append_args (message, DBUS_TYPE_STRING, &name, DBUS_TYPE_INVALID);
if (!dbus_connection_send (applet->connection, message, NULL))
nm_warning ("nmwa_dbus_activate_dialup_connection(): Could not send activateDialup message!");
dbus_message_unref (message);
}
else
nm_warning ("nmwa_dbus_activate_dialup_connection(): Couldn't allocate the dbus message!");
@ -911,9 +912,9 @@ void nmwa_dbus_update_devices (NMWirelessApplet *applet)
if ((message = dbus_message_new_method_call (NM_DBUS_SERVICE, NM_DBUS_PATH, NM_DBUS_INTERFACE, "getDevices")))
{
dbus_connection_send_with_reply (applet->connection, message, &pcall, -1);
dbus_message_unref (message);
if (pcall)
dbus_pending_call_set_notify (pcall, nmwa_dbus_update_devices_cb, applet, NULL);
dbus_message_unref (message);
}
nmwa_dbus_update_wireless_enabled (applet);
}
@ -935,9 +936,9 @@ void nmwa_dbus_update_dialup (NMWirelessApplet *applet)
if ((message = dbus_message_new_method_call (NM_DBUS_SERVICE, NM_DBUS_PATH, NM_DBUS_INTERFACE, "getDialup")))
{
dbus_connection_send_with_reply (applet->connection, message, &pcall, -1);
dbus_message_unref (message);
if (pcall)
dbus_pending_call_set_notify (pcall, nmwa_dbus_update_dialup_cb, applet, NULL);
dbus_message_unref (message);
}
}
@ -1000,6 +1001,7 @@ void nmwa_dbus_set_device (DBusConnection *connection, NetworkDevice *dev, const
dbus_message_append_args (message, DBUS_TYPE_OBJECT_PATH, &dev_path, DBUS_TYPE_INVALID);
}
dbus_connection_send (connection, message, NULL);
dbus_message_unref (message);
}
else
nm_warning ("nmwa_dbus_set_device(): Couldn't allocate the dbus message\n");
@ -1038,6 +1040,7 @@ void nmwa_dbus_create_network (DBusConnection *connection, NetworkDevice *dev, c
DBUS_TYPE_INVALID);
dbus_connection_send (connection, message, NULL);
}
dbus_message_unref (message);
}
else
nm_warning ("nmwa_dbus_set_device(): Couldn't allocate the dbus message\n");
@ -1062,6 +1065,7 @@ void nmwa_dbus_enable_wireless (NMWirelessApplet *applet, gboolean enabled)
dbus_message_append_args (message, DBUS_TYPE_BOOLEAN, &enabled, DBUS_TYPE_INVALID);
dbus_connection_send (applet->connection, message, NULL);
nmwa_dbus_update_wireless_enabled (applet);
dbus_message_unref (message);
}
}
@ -1140,7 +1144,6 @@ static void get_each_device_strength (NetworkDevice *dev, NMWirelessApplet *appl
if ((message = dbus_message_new_method_call (NM_DBUS_SERVICE, network_device_get_nm_path (dev), NM_DBUS_INTERFACE_DEVICES, "getStrength")))
{
dbus_connection_send_with_reply (applet->connection, message, &pcall, -1);
dbus_message_unref (message);
if (pcall)
{
StrengthCBData * cb_data = g_malloc0 (sizeof (StrengthCBData));
@ -1149,6 +1152,7 @@ static void get_each_device_strength (NetworkDevice *dev, NMWirelessApplet *appl
cb_data->dev_path = g_strdup (network_device_get_nm_path (dev));
dbus_pending_call_set_notify (pcall, nmwa_dbus_update_device_strength_cb, cb_data, (DBusFreeFunction) free_strength_cb_data);
}
dbus_message_unref (message);
}
}
}