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

2005-10-03 Robert Love <rml@novell.com>

Browse Source 
* src/backends/NetworkManagerSuSE.c: Fix Glib error, GError must be
          NULL.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@986 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Robert Love
2005-10-03 21:15:24 +00:00
committed by Robert Love
parent 23b0619e4f
commit fe197a06de
8 changed files with 112 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/backends/NetworkManagerSuSE.c
View File

@@ -765,7 +765,7 @@ GSList * nm_system_get_dialup_config (void)
{
GSList *list = NULL;
const char *dentry;
GError *err;
GError *err = NULL;
GDir *dir;
dir = g_dir_open (SYSCONFDIR "/sysconfig/network", 0, &err);

10
src/nm-dbus-device.c
View File

@@ -329,6 +329,7 @@ static DBusMessage *nm_dbus_device_get_properties (DBusConnection *connection, D
gchar * ip4_address;
gchar * broadcast;
gchar * subnetmask;
gchar * route;
struct ether_addr hw_addr;
char hw_addr_buf[20];
char * hw_addr_buf_ptr = &hw_addr_buf[0];
@@ -358,6 +359,7 @@ static DBusMessage *nm_dbus_device_get_properties (DBusConnection *connection, D
ip4_address = nm_utils_inet_ip4_address_as_string (nm_device_get_ip4_address (dev));
broadcast = nm_utils_inet_ip4_address_as_string (broadcast_addr);
subnetmask = nm_utils_inet_ip4_address_as_string (subnetmask_addr);
route = g_strdup ("123.456.789.101");
if (nm_device_is_wireless (dev))
{
@@ -369,13 +371,13 @@ static DBusMessage *nm_dbus_device_get_properties (DBusConnection *connection, D
strength = (dbus_int32_t) nm_device_get_signal_strength (dev);
mode = (dbus_uint32_t) nm_device_get_mode (dev);
if (req && (ap = nm_act_request_get_ap (req)))
{
if (req && (ap = nm_act_request_get_ap (req)))
{
NMAccessPoint *tmp_ap;
if ((tmp_ap = nm_device_ap_list_get_ap_by_essid (dev, nm_ap_get_essid (ap))))
active_network_path = nm_dbus_get_object_path_for_network (dev, tmp_ap);
}
}
ap_list = nm_device_ap_list_get (dev);
if (ap_list && (num_networks = nm_ap_list_size (ap_list)))
@@ -411,6 +413,7 @@ static DBusMessage *nm_dbus_device_get_properties (DBusConnection *connection, D
DBUS_TYPE_STRING, &subnetmask,
DBUS_TYPE_STRING, &broadcast,
DBUS_TYPE_STRING, &hw_addr_buf_ptr,
DBUS_TYPE_STRING, &route,
DBUS_TYPE_UINT32, &mode,
DBUS_TYPE_INT32, &strength,
DBUS_TYPE_BOOLEAN,&link_active,
@@ -421,6 +424,7 @@ static DBusMessage *nm_dbus_device_get_properties (DBusConnection *connection, D
g_free (op);
g_free (active_network_path);
g_strfreev (networks);
g_free (route);
g_free (ip4_address);
g_free (broadcast);
g_free (subnetmask);