Attachment #60724 for bug #93400

Lines 178-184 void Link Here

(-)nautilus-share-0.6.2/src/smbparser-dbus-server.c (-1 / +10 lines)
178	add_sharepath_to_iter(Share *share, gpointer user_data)	178	add_sharepath_to_iter(Share *share, gpointer user_data)
179	{	179	{
180	DBusMessageIter iter = (DBusMessageIter )user_data;	180	DBusMessageIter iter = (DBusMessageIter )user_data;
		181	#ifndef DBUS_USE_NEW_API
181	dbus_message_iter_append_string(iter, share->sharepath);	182	dbus_message_iter_append_string(iter, share->sharepath);
		183	#else /* DBUS_USE_NEW_API */
		184	dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &share->sharepath);
		185	#endif /* DBUS_USE_NEW_API */
182	}	186	}
183	/******************************************************************************/	187	/******************************************************************************/
184	DBusHandlerResult	188	DBusHandlerResult
Lines 586-597 path_message_func (DBusConnection *conn Link Here
586	else if (dbus_message_is_method_call (message, SMBPARSER_DBUS_INTERFACE, "GetSharepaths")) {	590	else if (dbus_message_is_method_call (message, SMBPARSER_DBUS_INTERFACE, "GetSharepaths")) {
587	DBusMessage *reply_message = NULL;	591	DBusMessage *reply_message = NULL;
588	DBusMessageIter iter;	592	DBusMessageIter iter;
		593	char *empty_string = "";
589		594
590	reply_message = dbus_message_new_method_return (message);	595	reply_message = dbus_message_new_method_return (message);
591		596
592	dbus_message_iter_init(reply_message, &iter);	597	dbus_message_iter_init(reply_message, &iter);
593	g_slist_foreach(shares,(GFunc)add_sharepath_to_iter,&iter);	598	g_slist_foreach(shares,(GFunc)add_sharepath_to_iter,&iter);
594	dbus_message_iter_append_string(&iter, "");	599	#ifndef DBUS_USE_NEW_API
		600	dbus_message_iter_append_string(&iter, empty_string);
		601	#else /* DBUS_USE_NEW_API */
		602	dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &empty_string);
		603	#endif /* DBUS_USE_NEW_API */
595		604
596	if (reply_message)	605	if (reply_message)
597	{	606	{

Lines 294-300 smbparser_dbus_get_sharepaths(DBusConnec Link Here

(-)nautilus-share-0.6.2/src/smbparser-dbus-client.c (+4 lines)
294		294
295	dbus_message_iter_init( reply, &iter );	295	dbus_message_iter_init( reply, &iter );
296		296
		297	#ifndef DBUS_USE_NEW_API
297	while((tmp = dbus_message_iter_get_string(&iter)) && strlen(tmp))	298	while((tmp = dbus_message_iter_get_string(&iter)) && strlen(tmp))
		299	#else /* DBUS_USE_NEW_API */
		300	while((dbus_message_iter_get_basic(&iter, &tmp), strlen(tmp)))
		301	#endif /* DBUS_USE_NEW_API */
298	{	302	{
299	sharepaths = g_slist_append(sharepaths,tmp);	303	sharepaths = g_slist_append(sharepaths,tmp);
300	dbus_message_iter_next(&iter);	304	dbus_message_iter_next(&iter);

Return to bug 93400