Cleanups

diff --git a/ChangeLog b/ChangeLog
index d0d8e5304be5c353d2055d9654f7554493d273ca..f30b345537219e2d1855781c20ec420ab29f83f3 100644 (file)
--- 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 3297278a5055b7823d346233ac631c8d29139dcf..6df8605baee92e3dd1ea0cde229eeb5ca5b99e36 100644 (file)
--- 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 1463ae26b3f055fb8df3e886e43abbf6d31d1760..66bd60d9b171c575c613e27e8aafcd899299c71a 100644 (file)
--- 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);