From 3e34da5beba93fd088d0dbded0c2399b2e3af35f Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Tue, 15 Mar 2005 15:32:50 +0000 Subject: [PATCH] 2005-03-15 Ray Strode * src/NetworkManagerDbus.c: Fix some sign weirdness that gcc4 doesn't like, and add a header file so PPC can hopefully find SIGTRAP git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@499 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 18 ++++-------------- src/NetworkManagerDbus.c | 9 ++++----- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6e7f25fa86..d762415627 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,19 +1,9 @@ 2005-03-15 Ray Strode - Fix a few -Wall -Werror warnings - - * info-daemon/NetworkManagerInfo.c: - (main): remove unused loop variable. - - * info-daemon/NetworkManagerInfoDbus.c: - (nmi_dbus_nm_is_running): comment out - unused static function - - * src/nm-netlink-monitor.c: - (receive_pending_bytes): - initialize output variables to NULL/0, - on function failure (Problem pointed out - by Bryan Clark). + * src/NetworkManagerDbus.c: + Fix some sign weirdness that gcc4 doesn't like, + and add a header file so PPC can hopefully find + SIGTRAP 2005-03-14 Ray Strode diff --git a/src/NetworkManagerDbus.c b/src/NetworkManagerDbus.c index 15d374457f..0bd45a061b 100644 --- a/src/NetworkManagerDbus.c +++ b/src/NetworkManagerDbus.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include @@ -74,7 +75,7 @@ DBusMessage *nm_dbus_create_error_message (DBusMessage *message, const char *exc * Copies the object path for a device object. Caller must free returned string. * */ -static unsigned char * nm_dbus_get_object_path_from_device (NMDevice *dev) +static gchar * nm_dbus_get_object_path_from_device (NMDevice *dev) { char *object_path, *escaped_object_path; @@ -263,7 +264,7 @@ void nm_dbus_schedule_device_status_change (NMDevice *dev, DeviceStatus status) void nm_dbus_signal_device_status_change (DBusConnection *connection, NMDevice *dev, DeviceStatus status) { DBusMessage *message; - unsigned char *dev_path; + gchar *dev_path; const char *signal = NULL; NMAccessPoint *ap = NULL; @@ -402,7 +403,7 @@ void nm_dbus_signal_network_status_change (DBusConnection *connection, NMData *d void nm_dbus_signal_device_ip4_address_change (DBusConnection *connection, NMDevice *dev) { DBusMessage *message; - unsigned char *dev_path; + gchar *dev_path; g_return_if_fail (connection != NULL); g_return_if_fail (dev != NULL); @@ -439,7 +440,6 @@ void nm_dbus_signal_wireless_network_change (DBusConnection *connection, NMDevic DBusMessage *message; char *dev_path; char *ap_path; - const char *signal; g_return_if_fail (connection != NULL); g_return_if_fail (dev != NULL); @@ -1168,7 +1168,6 @@ gboolean nm_dbus_is_info_daemon_running (DBusConnection *connection) DBusConnection *nm_dbus_init (NMData *data) { DBusError error; - dbus_bool_t success; DBusConnection *connection; DBusObjectPathVTable nm_vtable = {NULL, &nm_dbus_nm_message_handler, NULL, NULL, NULL, NULL}; DBusObjectPathVTable devices_vtable = {NULL, &nm_dbus_devices_message_handler, NULL, NULL, NULL, NULL};