--- nautilus-share-0.6.2/src/smbparser-dbus-server.c	2005/06/06 15:17:49	1.1
+++ nautilus-share-0.6.2/src/smbparser-dbus-server.c	2005/06/06 15:17:54
@@ -178,7 +178,11 @@ void
 add_sharepath_to_iter(Share *share, gpointer user_data)
 {
   DBusMessageIter *iter = (DBusMessageIter *)user_data;
+#ifndef DBUS_USE_NEW_API
   dbus_message_iter_append_string(iter, share->sharepath);
+#else /* DBUS_USE_NEW_API */
+  dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &share->sharepath);
+#endif /* DBUS_USE_NEW_API */
 }
 /******************************************************************************/
 DBusHandlerResult
@@ -586,12 +590,17 @@ path_message_func (DBusConnection  *conn
   else if (dbus_message_is_method_call (message, SMBPARSER_DBUS_INTERFACE, "GetSharepaths")) {
     DBusMessage	*reply_message = NULL;
     DBusMessageIter iter;
+    char *empty_string = "";
 
     reply_message = dbus_message_new_method_return (message);
 
     dbus_message_iter_init(reply_message, &iter);
     g_slist_foreach(shares,(GFunc)add_sharepath_to_iter,&iter);
-    dbus_message_iter_append_string(&iter, "");
+#ifndef DBUS_USE_NEW_API
+    dbus_message_iter_append_string(&iter, empty_string);
+#else /* DBUS_USE_NEW_API */
+    dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &empty_string);
+#endif /* DBUS_USE_NEW_API */
 
     if (reply_message)
       {
--- nautilus-share-0.6.2/src/smbparser-dbus-client.c	2005/06/06 15:17:51	1.1
+++ nautilus-share-0.6.2/src/smbparser-dbus-client.c	2005/06/06 15:19:33
@@ -294,7 +294,11 @@ smbparser_dbus_get_sharepaths(DBusConnec
 
       dbus_message_iter_init( reply, &iter );
       
+#ifndef DBUS_USE_NEW_API
       while((tmp = dbus_message_iter_get_string(&iter)) && strlen(tmp))
+#else /* DBUS_USE_NEW_API */
+      while((dbus_message_iter_get_basic(&iter, &tmp), strlen(tmp)))
+#endif /* DBUS_USE_NEW_API */
 	{
 	  sharepaths = g_slist_append(sharepaths,tmp);
 	  dbus_message_iter_next(&iter);