summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2005-10-27 16:35:43 +0000
committerRoss Burton <ross@openedhand.com>2005-10-27 16:35:43 +0000
commit8c9701d6c53621f933d57bfcdc4a1a62217ff266 (patch)
tree25d84e5dfe86c0b6f823ac14891b8e1982cb6535
parent52c7e25e50028684dc4577f2c54d176ca91f18b4 (diff)
Cleanups
-rw-r--r--ChangeLog8
-rw-r--r--dbus/dbus-marshal-header.c4
-rw-r--r--glib/dbus-gobject.c1
3 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index d0d8e530..f30b3455 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-10-27 Ross Burton <ross@openedhand.com>
+
+ * dbus/dbus-marshal-header.c:
+ Remove dead code.
+
+ * glib/dbus-gobject.c:
+ Stop compiler warning.
+
2005-10-25 Ross Burton <ross@openedhand.com>
* dbus/dbus-auth.c:
diff --git a/dbus/dbus-marshal-header.c b/dbus/dbus-marshal-header.c
index 3297278a..6df8605b 100644
--- a/dbus/dbus-marshal-header.c
+++ b/dbus/dbus-marshal-header.c
@@ -153,10 +153,6 @@ _dbus_header_cache_one (DBusHeader *header,
int field_code,
DBusTypeReader *variant_reader)
{
- int variant_type;
-
- variant_type = _dbus_type_reader_get_current_type (variant_reader);
-
header->fields[field_code].value_pos =
_dbus_type_reader_get_value_pos (variant_reader);
diff --git a/glib/dbus-gobject.c b/glib/dbus-gobject.c
index 1463ae26..66bd60d9 100644
--- a/glib/dbus-gobject.c
+++ b/glib/dbus-gobject.c
@@ -447,6 +447,7 @@ write_interface (gpointer key, gpointer val, gpointer user_data)
char *s;
propname = properties->data;
+ spec = NULL;
s = _dbus_gutils_wincaps_to_uscore (spec->name);