comparison src/dbus-server.c @ 13134:b2d838b7eb00

[gaim-migrate @ 15496] Part of SF Patch #1417219 from Sadrul "Without knowing much (anything) about DBus, it looks like we should tell DBus to use 64-bits for pointer/box/subtype values in 64-bit platform." Hey, I don't know anything about DBus either, but that makes sense to me. committer: Tailor Script <[e-mail]>

13133:541486fde12b

	    str = null_to_empty(my_arg(char*));
	    dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &str);
	    break;
	case GAIM_TYPE_SUBTYPE: /* registered pointers only! */
	case GAIM_TYPE_POINTER:
	case GAIM_TYPE_OBJECT: 
	case GAIM_TYPE_BOXED:		
	    id = gaim_dbus_pointer_to_id(my_arg(gpointer));
	    dbus_message_iter_append_basic(iter, DBUS_TYPE_INT32, &id);
	    break;
	default:		/* no conversion implemented */
	    g_return_if_reached();
	}
    }

13134:b2d838b7eb00

	    str = null_to_empty(my_arg(char*));
	    dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &str);
	    break;
	case GAIM_TYPE_SUBTYPE: /* registered pointers only! */
	case GAIM_TYPE_POINTER:
	case GAIM_TYPE_OBJECT:
	case GAIM_TYPE_BOXED:
	    id = gaim_dbus_pointer_to_id(my_arg(gpointer));
	    dbus_message_iter_append_basic(iter, (sizeof(void *) == 4) ? DBUS_TYPE_UINT32 : DBUS_TYPE_UINT64, &id);
	    break;
	default:		/* no conversion implemented */
	    g_return_if_reached();
	}
    }